Remove default appearance (dark/light) when is not specified in json.

mczachurski · Jan 10, 2021 · 0a692fc · 0a692fc
1 parent bff4409
commit 0a692fc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Sources/wallpapper/ImageMetadataGenerator.swift b/Sources/wallpapper/ImageMetadataGenerator.swift
@@ -68,12 +68,18 @@ class ImageMetadataGenerator {
 
         for (index, item) in self.pictureInfos.enumerated() {
 
+            if item.isForLight != nil || item.isForDark != nil {
+                if sequenceInfo.apperance == nil {
+                    sequenceInfo.apperance = Apperance()
+                }
+            }
+
             if item.isForLight ?? false {
-                sequenceInfo.apperance.lightIndex = index
+                sequenceInfo.apperance?.lightIndex = index
             }
 
             if item.isForDark ?? false {
-                sequenceInfo.apperance.darkIndex = index
+                sequenceInfo.apperance?.darkIndex = index
             }
 
             if let altitude = item.altitude, let azimuth = item.azimuth {

diff --git a/Sources/wallpapper/PropertyList/SequenceInfo.swift b/Sources/wallpapper/PropertyList/SequenceInfo.swift
@@ -17,5 +17,5 @@ class SequenceInfo : Codable {
 
     var sequenceItems: [SequenceItem]?
     var timeItems: [TimeItem]?
-    var apperance = Apperance()
+    var apperance: Apperance?
 }