Skip to content

refactor(config): drop the unused color_scheme setting #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gnacho merged 1 commit into from
Oct 29, 2026
Merged

refactor(config): drop the unused color_scheme setting #253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 7 additions & 33 deletions src/storage/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,6 @@ pub struct GeneralConfig {
/// runtime plumbing and older config files keep working.
#[serde(default)]
pub pause_on_battery: bool,
/// Color scheme preference: `"system"`, `"light"` or `"dark"`.
#[serde(default = "default_color_scheme")]
pub color_scheme: String,
/// Whether desktop notifications are sent for sync/auth failures.
#[serde(default = "yes")]
pub show_notifications: bool,
Expand All @@ -250,11 +247,6 @@ pub struct GeneralConfig {
pub quiet_hours: Option<(String, String)>,
}

/// Default color scheme (follow the desktop).
fn default_color_scheme() -> String {
"system".to_string()
}

/// Parse the `quiet_hours` pair from its serialized `[start, end]` form,
/// keeping `None` for anything malformed or empty (issue #45).
fn parse_quiet_hours(obj: &Map<String, Value>) -> Option<(String, String)> {
Expand Down Expand Up @@ -326,7 +318,6 @@ impl Default for GeneralConfig {
Self {
autostart: true,
pause_on_battery: false,
color_scheme: default_color_scheme(),
show_notifications: yes(),
show_server_notifications: false,
size_confirm_threshold_mb: default_size_confirm_threshold_mb(),
Expand Down Expand Up @@ -1174,10 +1165,6 @@ fn validate_general(raw: Option<&Value>) -> GeneralConfig {
GeneralConfig {
autostart: get_bool(obj, "autostart", true),
pause_on_battery: get_bool(obj, "pause_on_battery", false),
// The theme switch only understands system/light/dark; anything else
// falls back to the system default instead of reaching the UI
// (issue #138).
color_scheme: get_valid_color_scheme(obj),
show_notifications: get_bool(obj, "show_notifications", true),
show_server_notifications: get_bool(obj, "show_server_notifications", false),
size_confirm_threshold_mb: get_i64_tolerant(
Expand All @@ -1191,18 +1178,6 @@ fn validate_general(raw: Option<&Value>) -> GeneralConfig {
}
}

/// Read `color_scheme` restricted to the three values the theme switch
/// understands (`system` / `light` / `dark`); anything else is treated as
/// missing and falls back to the default (issue #138).
fn get_valid_color_scheme(obj: &serde_json::Map<String, Value>) -> String {
match obj.get("color_scheme") {
Some(Value::String(value)) if matches!(value.as_str(), "system" | "light" | "dark") => {
value.clone()
}
_ => default_color_scheme(),
}
}

fn validate_logging(raw: Option<&Value>) -> Result<LoggingConfig, ConfigError> {
let mut merged = json!({ "save_logs": true, "retention_days": 30 });
if let Some(incoming) = raw {
Expand Down Expand Up @@ -1683,15 +1658,14 @@ mod tests {
}

#[test]
fn invalid_color_scheme_falls_back_to_the_default() {
// Issue #138: only system/light/dark reach the theme switch; any
// other value is treated as missing.
fn legacy_color_scheme_key_is_ignored_and_dropped() {
// Issue #246: the theme switch was removed in v0.70.0 (#53) and the
// field became dead. Old configs still carry it, so loading must work
// and the key must be gone from the next save.
let config = validate_config(json!({ "general": { "color_scheme": "banana" } })).unwrap();
assert_eq!(config.general.color_scheme, "system");
let config = validate_config(json!({ "general": { "color_scheme": "dark" } })).unwrap();
assert_eq!(config.general.color_scheme, "dark");
let config = validate_config(json!({ "general": { "color_scheme": 7 } })).unwrap();
assert_eq!(config.general.color_scheme, "system");
assert!(config.general.autostart);
let saved = serde_json::to_value(&config).unwrap();
assert!(saved["general"].get("color_scheme").is_none());
}

// ---- migrations -----------------------------------------------------------
Expand Down
Loading