Merge pull request #626 from Stremio/refactor/settings-option-subtitl…

…es-audio-lang refactor: use Option for audio_language and subtitles_language
Stremio · Feb 2, 2024 · 9ba36f6 · 9ba36f6
2 parents fdf10ae + c43a4b4
commit 9ba36f6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/types/profile/settings.rs b/src/types/profile/settings.rs
@@ -15,9 +15,9 @@ pub struct Settings {
     pub frame_rate_matching_strategy: FrameRateMatchingStrategy,
     pub next_video_notification_duration: u32,
     pub audio_passthrough: bool,
-    pub audio_language: String,
+    pub audio_language: Option<String>,
     pub secondary_audio_language: Option<String>,
-    pub subtitles_language: String,
+    pub subtitles_language: Option<String>,
     pub secondary_subtitles_language: Option<String>,
     pub subtitles_size: u8,
     pub subtitles_font: String,
@@ -58,9 +58,9 @@ impl Default for Settings {
             audio_passthrough: false,
             streaming_server_url: STREAMING_SERVER_URL.to_owned(),
             interface_language: "eng".to_owned(),
-            audio_language: "eng".to_owned(),
+            audio_language: Some("eng".to_owned()),
             secondary_audio_language: None,
-            subtitles_language: "eng".to_owned(),
+            subtitles_language: Some("eng".to_owned()),
             secondary_subtitles_language: None,
             subtitles_size: 100,
             subtitles_font: "Roboto".to_owned(),

diff --git a/src/unit_tests/ctx/update_settings.rs b/src/unit_tests/ctx/update_settings.rs
@@ -19,7 +19,7 @@ fn actionctx_updatesettings() {
         ctx: Ctx,
     }
     let settings = Settings {
-        subtitles_language: "bg".to_string(),
+        subtitles_language: Some("bg".to_string()),
         subtitles_size: 150,
         ..Settings::default()
     };
@@ -68,7 +68,7 @@ fn actionctx_updatesettings_not_changed() {
         ctx: Ctx,
     }
     let settings = Settings {
-        subtitles_language: "bg".to_string(),
+        subtitles_language: Some("bg".to_string()),
         subtitles_size: 150,
         ..Settings::default()
     };

diff --git a/src/unit_tests/serde/default_tokens_ext.rs b/src/unit_tests/serde/default_tokens_ext.rs
@@ -395,10 +395,12 @@ impl DefaultTokens for Settings {
             Token::Str("audioPassthrough"),
             Token::Bool(false),
             Token::Str("audioLanguage"),
+            Token::Some,
             Token::Str("eng"),
             Token::Str("secondaryAudioLanguage"),
             Token::None,
             Token::Str("subtitlesLanguage"),
+            Token::Some,
             Token::Str("eng"),
             Token::Str("secondarySubtitlesLanguage"),
             Token::None,

diff --git a/src/unit_tests/serde/settings.rs b/src/unit_tests/serde/settings.rs
@@ -16,9 +16,9 @@ fn settings() {
             frame_rate_matching_strategy: FrameRateMatchingStrategy::FrameRateAndResolution,
             next_video_notification_duration: 30,
             audio_passthrough: true,
-            audio_language: "audio_language".to_owned(),
+            audio_language: Some("audio_language".to_owned()),
             secondary_audio_language: Some("secondary_audio_language".to_owned()),
-            subtitles_language: "subtitles_language".to_owned(),
+            subtitles_language: Some("subtitles_language".to_owned()),
             secondary_subtitles_language: Some("secondary_subtitles_language".to_owned()),
             subtitles_size: 1,
             subtitles_font: "subtitles_font".to_owned(),
@@ -64,11 +64,13 @@ fn settings() {
             Token::Str("audioPassthrough"),
             Token::Bool(true),
             Token::Str("audioLanguage"),
+            Token::Some,
             Token::Str("audio_language"),
             Token::Str("secondaryAudioLanguage"),
             Token::Some,
             Token::Str("secondary_audio_language"),
             Token::Str("subtitlesLanguage"),
+            Token::Some,
             Token::Str("subtitles_language"),
             Token::Str("secondarySubtitlesLanguage"),
             Token::Some,
@@ -136,8 +138,10 @@ fn settings_de() {
             Token::Str("audioPassthrough"),
             Token::Bool(false),
             Token::Str("audioLanguage"),
+            Token::Some,
             Token::Str("eng"),
             Token::Str("subtitlesLanguage"),
+            Token::Some,
             Token::Str("eng"),
             Token::Str("subtitlesSize"),
             Token::U8(100),