Add import export of missing settings

Model/Import Export Settings/Exporters/AdvancedSettingsGroupExporter.swift

@@ -9,7 +9,11 @@ final class AdvancedSettingsGroupExporter: SettingsGroupExporter {
             "mpvEnableLogging": Defaults[.mpvEnableLogging],
             "mpvCacheSecs": Defaults[.mpvCacheSecs],
             "mpvCachePauseWait": Defaults[.mpvCachePauseWait],
+            "mpvCachePauseInital": Defaults[.mpvCachePauseInital],
             "mpvDeinterlace": Defaults[.mpvDeinterlace],
+            "mpvHWdec": Defaults[.mpvHWdec],
+            "mpvDemuxerLavfProbeInfo": Defaults[.mpvDemuxerLavfProbeInfo],
+            "mpvInitialAudioSync": Defaults[.mpvInitialAudioSync],
             "showCacheStatus": Defaults[.showCacheStatus],
             "feedCacheSize": Defaults[.feedCacheSize]
         ]

Model/Import Export Settings/Exporters/HistorySettingsGroupExporter.swift

@@ -6,6 +6,9 @@ final class HistorySettingsGroupExporter: SettingsGroupExporter {
         [
             "saveRecents": Defaults[.saveRecents],
             "saveHistory": Defaults[.saveHistory],
+            "showRecents": Defaults[.showRecents],
+            "limitRecents": Defaults[.limitRecents],
+            "limitRecentsAmount": Defaults[.limitRecentsAmount],
             "showWatchingProgress": Defaults[.showWatchingProgress],
             "saveLastPlayed": Defaults[.saveLastPlayed],
 
@@ -15,11 +18,7 @@ final class HistorySettingsGroupExporter: SettingsGroupExporter {
 
             "watchedVideoStyle": Defaults[.watchedVideoStyle].rawValue,
             "watchedVideoBadgeColor": Defaults[.watchedVideoBadgeColor].rawValue,
-            "showToggleWatchedStatusButton": Defaults[.showToggleWatchedStatusButton],
+            "showToggleWatchedStatusButton": Defaults[.showToggleWatchedStatusButton]
-
-            "showRecents": Defaults[.showRecents],
-            "limitRecents": Defaults[.limitRecents],
-            "limitRecentsAmount": Defaults[.limitRecentsAmount]
         ]
     }
 }

Model/Import Export Settings/Exporters/PlayerSettingsGroupExporter.swift

@@ -10,6 +10,8 @@ final class PlayerSettingsGroupExporter: SettingsGroupExporter {
             "expandVideoDescription": Defaults[.expandVideoDescription],
             "collapsedLinesDescription": Defaults[.collapsedLinesDescription],
             "showChapters": Defaults[.showChapters],
+            "showChapterThumbnails": Defaults[.showChapterThumbnails],
+            "showChapterThumbnailsOnlyWhenDifferent": Defaults[.showChapterThumbnailsOnlyWhenDifferent],
             "expandChapters": Defaults[.expandChapters],
             "showRelated": Defaults[.showRelated],
             "showInspector": Defaults[.showInspector].rawValue,
@@ -18,7 +20,12 @@ final class PlayerSettingsGroupExporter: SettingsGroupExporter {
             "enableReturnYouTubeDislike": Defaults[.enableReturnYouTubeDislike],
             "closePiPOnNavigation": Defaults[.closePiPOnNavigation],
             "closePiPOnOpeningPlayer": Defaults[.closePiPOnOpeningPlayer],
-            "closePlayerOnOpeningPiP": Defaults[.closePlayerOnOpeningPiP]
+            "closePlayerOnOpeningPiP": Defaults[.closePlayerOnOpeningPiP],
+            "captionsAutoShow": Defaults[.captionsAutoShow],
+            "captionsDefaultLanguageCode": Defaults[.captionsDefaultLanguageCode],
+            "captionsFallbackLanguageCode": Defaults[.captionsFallbackLanguageCode],
+            "captionsFontScaleSize": Defaults[.captionsFontScaleSize],
+            "captionsFontColor": Defaults[.captionsFontColor]
         ]
     }
 

Model/Import Export Settings/Exporters/SponsorBlockSettingsGroupExporter.swift

@@ -5,7 +5,11 @@ final class SponsorBlockSettingsGroupExporter: SettingsGroupExporter {
     override var globalJSON: JSON {
         [
             "sponsorBlockInstance": Defaults[.sponsorBlockInstance],
-            "sponsorBlockCategories": Array(Defaults[.sponsorBlockCategories])
+            "sponsorBlockCategories": Array(Defaults[.sponsorBlockCategories]),
+            "sponsorBlockColors": Defaults[.sponsorBlockColors],
+            "sponsorBlockShowTimeWithSkipsRemoved": Defaults[.sponsorBlockShowTimeWithSkipsRemoved],
+            "sponsorBlockShowCategoriesInTimeline": Defaults[.sponsorBlockShowCategoriesInTimeline],
+            "sponsorBlockShowNoticeAfterSkip": Defaults[.sponsorBlockShowNoticeAfterSkip]
         ]
     }
 }

Model/Import Export Settings/Importers/AdvancedSettingsGroupImporter.swift

@@ -25,10 +25,26 @@ struct AdvancedSettingsGroupImporter {
             Defaults[.mpvCachePauseWait] = mpvCachePauseWait
         }
 
+        if let mpvCachePauseInital = json["mpvCachePauseInital"].bool {
+            Defaults[.mpvCachePauseInital] = mpvCachePauseInital
+        }
+
         if let mpvDeinterlace = json["mpvDeinterlace"].bool {
             Defaults[.mpvDeinterlace] = mpvDeinterlace
         }
 
+        if let mpvHWdec = json["mpvHWdec"].string {
+            Defaults[.mpvHWdec] = mpvHWdec
+        }
+
+        if let mpvDemuxerLavfProbeInfo = json["mpvDemuxerLavfProbeInfo"].string {
+            Defaults[.mpvDemuxerLavfProbeInfo] = mpvDemuxerLavfProbeInfo
+        }
+
+        if let mpvInitialAudioSync = json["mpvInitialAudioSync"].bool {
+            Defaults[.mpvInitialAudioSync] = mpvInitialAudioSync
+        }
+
         if let showCacheStatus = json["showCacheStatus"].bool {
             Defaults[.showCacheStatus] = showCacheStatus
         }

Model/Import Export Settings/Importers/HistorySettingsGroupImporter.swift

@@ -13,6 +13,18 @@ struct HistorySettingsGroupImporter {
             Defaults[.saveHistory] = saveHistory
         }
 
+        if let showRecents = json["showRecents"].bool {
+            Defaults[.showRecents] = showRecents
+        }
+
+        if let limitRecents = json["limitRecents"].bool {
+            Defaults[.limitRecents] = limitRecents
+        }
+
+        if let limitRecentsAmount = json["limitRecentsAmount"].int {
+            Defaults[.limitRecentsAmount] = limitRecentsAmount
+        }
+
         if let showWatchingProgress = json["showWatchingProgress"].bool {
             Defaults[.showWatchingProgress] = showWatchingProgress
         }
@@ -50,17 +62,5 @@ struct HistorySettingsGroupImporter {
         if let showToggleWatchedStatusButton = json["showToggleWatchedStatusButton"].bool {
             Defaults[.showToggleWatchedStatusButton] = showToggleWatchedStatusButton
         }
-
-        if let showRecents = json["showRecents"].bool {
-            Defaults[.showRecents] = showRecents
-        }
-
-        if let limitRecents = json["limitRecents"].bool {
-            Defaults[.limitRecents] = limitRecents
-        }
-
-        if let limitRecentsAmount = json["limitRecentsAmount"].int {
-            Defaults[.limitRecentsAmount] = limitRecentsAmount
-        }
     }
 }

Model/Import Export Settings/Importers/PlayerSettingsGroupImporter.swift

@@ -29,6 +29,14 @@ struct PlayerSettingsGroupImporter {
             Defaults[.showChapters] = showChapters
         }
 
+        if let showChapterThumbnails = json["showChapterThumbnails"].bool {
+            Defaults[.showChapterThumbnails] = showChapterThumbnails
+        }
+
+        if let showChapterThumbnailsOnlyWhenDifferent = json["showChapterThumbnailsOnlyWhenDifferent"].bool {
+            Defaults[.showChapterThumbnailsOnlyWhenDifferent] = showChapterThumbnailsOnlyWhenDifferent
+        }
+
         if let expandChapters = json["expandChapters"].bool {
             Defaults[.expandChapters] = expandChapters
         }
@@ -96,5 +104,25 @@ struct PlayerSettingsGroupImporter {
                 Defaults[.rotateToLandscapeOnEnterFullScreen] = rotateToLandscapeOnEnterFullScreen
             }
         #endif
+
+        if let captionsAutoShow = json["captionsAutoShow"].bool {
+            Defaults[.captionsAutoShow] = captionsAutoShow
+        }
+
+        if let captionsDefaultLanguageCode = json["captionsDefaultLanguageCode"].string {
+            Defaults[.captionsDefaultLanguageCode] = captionsDefaultLanguageCode
+        }
+
+        if let captionsFallbackLanguageCode = json["captionsFallbackLanguageCode"].string {
+            Defaults[.captionsFallbackLanguageCode] = captionsFallbackLanguageCode
+        }
+
+        if let captionsFontScaleSize = json["captionsFontScaleSize"].string {
+            Defaults[.captionsFontScaleSize] = captionsFontScaleSize
+        }
+
+        if let captionsFontColor = json["captionsFontColor"].string {
+            Defaults[.captionsFontColor] = captionsFontColor
+        }
     }
 }

Model/Import Export Settings/Importers/SponsorBlockSettingsGroupImporter.swift

@@ -12,5 +12,22 @@ struct SponsorBlockSettingsGroupImporter {
         if let sponsorBlockCategories = json["sponsorBlockCategories"].array {
             Defaults[.sponsorBlockCategories] = Set(sponsorBlockCategories.compactMap { $0.string })
         }
+
+        if let sponsorBlockColors = json["sponsorBlockColors"].dictionary {
+            let colors = sponsorBlockColors.mapValues { json in json.stringValue }
+            Defaults[.sponsorBlockColors] = colors
+        }
+
+        if let sponsorBlockShowTimeWithSkipsRemoved = json["sponsorBlockShowTimeWithSkipsRemoved"].bool {
+            Defaults[.sponsorBlockShowTimeWithSkipsRemoved] = sponsorBlockShowTimeWithSkipsRemoved
+        }
+
+        if let sponsorBlockShowCategoriesInTimeline = json["sponsorBlockShowCategoriesInTimeline"].bool {
+            Defaults[.sponsorBlockShowCategoriesInTimeline] = sponsorBlockShowCategoriesInTimeline
+        }
+
+        if let sponsorBlockShowNoticeAfterSkip = json["sponsorBlockShowNoticeAfterSkip"].bool {
+            Defaults[.sponsorBlockShowNoticeAfterSkip] = sponsorBlockShowNoticeAfterSkip
+        }
     }
 }

Shared/Defaults.swift

@@ -106,6 +106,12 @@ extension Defaults.Keys {
         static let closePiPAndOpenPlayerOnEnteringForeground = Key<Bool>("closePiPAndOpenPlayerOnEnteringForeground", default: false)
     #endif
 
+    static let captionsAutoShow = Key<Bool>("captionsAutoShow", default: false)
+    static let captionsDefaultLanguageCode = Key<String>("captionsDefaultLanguageCode", default: LanguageCodes.English.rawValue)
+    static let captionsFallbackLanguageCode = Key<String>("captionsDefaultFallbackCode", default: LanguageCodes.English.rawValue)
+    static let captionsFontScaleSize = Key<String>("captionsFontScale", default: "1.0")
+    static let captionsFontColor = Key<String>("captionsFontColor", default: "#FFFFFF")
+
     // MARK: GROUP - Controls
 
     static let avPlayerUsesSystemControls = Key<Bool>("avPlayerUsesSystemControls", default: true)
@@ -304,13 +310,7 @@ extension Defaults.Keys {
     static let lastPlayed = Key<PlayerQueueItem?>("lastPlayed")
 
     static let activeBackend = Key<PlayerBackendType>("activeBackend", default: .mpv)
-    static let captionsAutoShow = Key<Bool>("captionsAutoShow", default: false)
     static let captionsLanguageCode = Key<String?>("captionsLanguageCode")
-    static let captionsDefaultLanguageCode = Key<String>("captionsDefaultLanguageCode", default: LanguageCodes.English.rawValue)
-    static let captionsFallbackLanguageCode = Key<String>("captionsDefaultFallbackCode", default: LanguageCodes.English.rawValue)
-    static let captionsFontScaleSize = Key<String>("captionsFontScale", default: "1.0")
-    static let captionsFontColor = Key<String>("captionsFontColor", default: "#FFFFFF")
-
     static let lastUsedPlaylistID = Key<Playlist.ID?>("lastPlaylistID")
     static let lastAccountIsPublic = Key<Bool>("lastAccountIsPublic", default: false)