Define journal settings in journal crate

Cargo.lock

@@ -3336,6 +3336,8 @@ dependencies = [
  "editor",
  "gpui",
  "log",
+ "schemars",
+ "serde",
  "settings",
  "shellexpand",
  "util",

crates/journal/Cargo.toml

@@ -13,9 +13,12 @@ editor = { path = "../editor" }
 gpui = { path = "../gpui" }
 util = { path = "../util" }
 workspace = { path = "../workspace" }
+settings = { path = "../settings" }
+
 anyhow.workspace = true
 chrono = "0.4"
 dirs = "4.0"
+serde.workspace = true
+schemars.workspace = true
 log.workspace = true
-settings = { path = "../settings" }
 shellexpand = "2.1.0"

crates/journal/src/journal.rs

@@ -1,7 +1,8 @@
 use chrono::{Datelike, Local, NaiveTime, Timelike};
 use editor::{scroll::autoscroll::Autoscroll, Editor};
 use gpui::{actions, AppContext};
-use settings::{HourFormat, Settings};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
 use std::{
     fs::OpenOptions,
     path::{Path, PathBuf},
@@ -11,13 +12,61 @@ use workspace::AppState;
 
 actions!(journal, [NewJournalEntry]);
 
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+pub struct JournalSettings {
+    pub path: Option<String>,
+    pub hour_format: Option<HourFormat>,
+}
+
+impl Default for JournalSettings {
+    fn default() -> Self {
+        Self {
+            path: Some("~".into()),
+            hour_format: Some(Default::default()),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum HourFormat {
+    #[default]
+    Hour12,
+    Hour24,
+}
+
+impl settings::Setting for JournalSettings {
+    const KEY: Option<&'static str> = Some("journal");
+
+    type FileContent = Self;
+
+    fn load(default_value: &Self, user_values: &[&Self], _: &AppContext) -> Self {
+        Self {
+            path: Some(
+                user_values
+                    .first()
+                    .and_then(|s| s.path.clone())
+                    .unwrap_or(default_value.path.clone().unwrap()),
+            ),
+            hour_format: Some(
+                user_values
+                    .first()
+                    .and_then(|s| s.hour_format.clone())
+                    .unwrap_or(default_value.hour_format.clone().unwrap()),
+            ),
+        }
+    }
+}
+
 pub fn init(app_state: Arc<AppState>, cx: &mut AppContext) {
+    settings::register_setting::<JournalSettings>(cx);
+
     cx.add_global_action(move |_: &NewJournalEntry, cx| new_journal_entry(app_state.clone(), cx));
 }
 
 pub fn new_journal_entry(app_state: Arc<AppState>, cx: &mut AppContext) {
-    let settings = cx.global::<Settings>();
+    let settings = settings::get_setting::<JournalSettings>(None, cx);
-    let journal_dir = match journal_dir(&settings) {
+    let journal_dir = match journal_dir(settings.path.as_ref().unwrap()) {
         Some(journal_dir) => journal_dir,
         None => {
             log::error!("Can't determine journal directory");
@@ -31,8 +80,7 @@ pub fn new_journal_entry(app_state: Arc<AppState>, cx: &mut AppContext) {
         .join(format!("{:02}", now.month()));
     let entry_path = month_dir.join(format!("{:02}.md", now.day()));
     let now = now.time();
-    let hour_format = &settings.journal_overrides.hour_format;
+    let entry_heading = heading_entry(now, &settings.hour_format);
-    let entry_heading = heading_entry(now, &hour_format);
 
     let create_entry = cx.background().spawn(async move {
         std::fs::create_dir_all(month_dir)?;
@@ -76,14 +124,8 @@ pub fn new_journal_entry(app_state: Arc<AppState>, cx: &mut AppContext) {
     .detach_and_log_err(cx);
 }
 
-fn journal_dir(settings: &Settings) -> Option<PathBuf> {
+fn journal_dir(path: &str) -> Option<PathBuf> {
-    let journal_dir = settings
+    let expanded_journal_dir = shellexpand::full(path) //TODO handle this better
-        .journal_overrides
-        .path
-        .as_ref()
-        .unwrap_or(settings.journal_defaults.path.as_ref()?);
-
-    let expanded_journal_dir = shellexpand::full(&journal_dir) //TODO handle this better
         .ok()
         .map(|dir| Path::new(&dir.to_string()).to_path_buf().join("journal"));
 

crates/settings/src/settings.rs

@@ -50,8 +50,6 @@ pub struct Settings {
     pub git: GitSettings,
     pub git_overrides: GitSettings,
     pub copilot: CopilotSettings,
-    pub journal_defaults: JournalSettings,
-    pub journal_overrides: JournalSettings,
     pub terminal_defaults: TerminalSettings,
     pub terminal_overrides: TerminalSettings,
     pub language_defaults: HashMap<Arc<str>, EditorSettings>,
@@ -123,8 +121,6 @@ impl Setting for Settings {
             },
             git: defaults.git.unwrap(),
             git_overrides: Default::default(),
-            journal_defaults: defaults.journal.clone(),
-            journal_overrides: Default::default(),
             terminal_defaults: defaults.terminal.clone(),
             terminal_overrides: Default::default(),
             language_defaults: defaults.languages.clone(),
@@ -336,34 +332,6 @@ pub enum Autosave {
     OnWindowChange,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct JournalSettings {
-    pub path: Option<String>,
-    pub hour_format: Option<HourFormat>,
-}
-
-impl Default for JournalSettings {
-    fn default() -> Self {
-        Self {
-            path: Some("~".into()),
-            hour_format: Some(Default::default()),
-        }
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum HourFormat {
-    Hour12,
-    Hour24,
-}
-
-impl Default for HourFormat {
-    fn default() -> Self {
-        Self::Hour12
-    }
-}
-
 #[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
 pub struct TerminalSettings {
     pub shell: Option<Shell>,
@@ -528,8 +496,6 @@ pub struct SettingsFileContent {
     #[serde(flatten)]
     pub editor: EditorSettings,
     #[serde(default)]
-    pub journal: JournalSettings,
-    #[serde(default)]
     pub terminal: TerminalSettings,
     #[serde(default)]
     pub git: Option<GitSettings>,
@@ -647,8 +613,6 @@ impl Settings {
             },
             git: defaults.git.unwrap(),
             git_overrides: Default::default(),
-            journal_defaults: defaults.journal,
-            journal_overrides: Default::default(),
             terminal_defaults: defaults.terminal,
             terminal_overrides: Default::default(),
             language_defaults: defaults.languages,
@@ -721,7 +685,6 @@ impl Settings {
         }
         self.editor_overrides = data.editor;
         self.git_overrides = data.git.unwrap_or_default();
-        self.journal_overrides = data.journal;
         self.terminal_defaults.font_size = data.terminal.font_size;
         self.terminal_overrides.copy_on_select = data.terminal.copy_on_select;
         self.terminal_overrides = data.terminal;
@@ -899,8 +862,6 @@ impl Settings {
             },
             editor_overrides: Default::default(),
             copilot: Default::default(),
-            journal_defaults: Default::default(),
-            journal_overrides: Default::default(),
             terminal_defaults: Default::default(),
             terminal_overrides: Default::default(),
             git: Default::default(),