From 3d3e62e1ba7c4c9b4497d4c3d732bfc790c248d6 Mon Sep 17 00:00:00 2001
From: Evan Fiordeliso <evan.fiordeliso@gmail.com>
Date: Mon, 30 Jun 2025 20:13:17 -0400
Subject: [PATCH] Reorganize settings and add read books organizing

---
 src/commands/LogReadingFinishedCommand.ts     |  8 ++++++
 .../settings/BookTrackerSettingTabView.svelte | 25 ++++++++++++-------
 src/ui/settings/types.ts                      |  6 +++--
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/commands/LogReadingFinishedCommand.ts b/src/commands/LogReadingFinishedCommand.ts
index e9a9663..b590a09 100644
--- a/src/commands/LogReadingFinishedCommand.ts
+++ b/src/commands/LogReadingFinishedCommand.ts
@@ -70,6 +70,14 @@ export class LogReadingFinishedCommand extends EditorCheckCommand {
 			}
 		});
 
+		if (this.settings.organizeReadBooks) {
+			// @ts-expect-error Moment is provided by Obsidian
+			const datePath = moment().format("YYYY/MMMM");
+			const newPath = `${this.settings.readBooksFolder}/${datePath}/${file.name}`;
+
+			await this.app.vault.rename(file, newPath);
+		}
+
 		new Notice("Reading finished for " + fileName);
 	}
 }
diff --git a/src/ui/settings/BookTrackerSettingTabView.svelte b/src/ui/settings/BookTrackerSettingTabView.svelte
index bafa44f..654e049 100644
--- a/src/ui/settings/BookTrackerSettingTabView.svelte
+++ b/src/ui/settings/BookTrackerSettingTabView.svelte
@@ -25,7 +25,7 @@
 </script>
 
 <div class="obt-settings">
-	<Header title="General Settings" />
+	<Header title="Folder Settings" />
 	<FolderSuggestItem
 		{app}
 		id="book-folder"
@@ -33,6 +33,20 @@
 		description="Select the folder where book entries are stored."
 		bind:value={$settings.bookFolder}
 	/>
+	<FolderSuggestItem
+		{app}
+		id="tbr-folder"
+		name="To Be Read Folder"
+		description="Select the folder to use for To Be Read entries"
+		bind:value={$settings.tbrFolder}
+	/>
+	<FolderSuggestItem
+		{app}
+		id="read-folder"
+		name="Read Books Folder"
+		description="Select the folder to use for Read entries."
+		bind:value={$settings.tbrFolder}
+	/>
 	<ToggleItem
 		id="organize-read-books"
 		name="Organize Read Books"
@@ -47,13 +61,6 @@
 		description="Select the template file to use for new book entries."
 		bind:value={$settings.templateFile}
 	/>
-	<FolderSuggestItem
-		{app}
-		id="tbr-folder"
-		name="To Be Read Folder"
-		description="Select the folder to use for To Be Read entries"
-		bind:value={$settings.tbrFolder}
-	/>
 	<TextInputItem
 		id="file-name-format"
 		name="File name Format"
@@ -94,7 +101,7 @@
 		{app}
 		id="status-field"
 		name="Status Field"
-		description="Select the folder to use for To Be Read entries."
+		description="Select the field to use for reading status."
 		bind:value={$settings.statusProperty}
 		accepts={["text"]}
 	/>
diff --git a/src/ui/settings/types.ts b/src/ui/settings/types.ts
index 982a930..07d2597 100644
--- a/src/ui/settings/types.ts
+++ b/src/ui/settings/types.ts
@@ -1,8 +1,9 @@
 export interface BookTrackerSettings {
 	bookFolder: string;
+	tbrFolder: string;
+	readBooksFolder: string;
 	organizeReadBooks: boolean;
 	templateFile: string;
-	tbrFolder: string;
 	fileNameFormat: string;
 	downloadCovers: boolean;
 	coverFolder: string;
@@ -18,9 +19,10 @@ export interface BookTrackerSettings {
 
 export const DEFAULT_SETTINGS: BookTrackerSettings = {
 	bookFolder: "books",
+	tbrFolder: "books/tbr",
+	readBooksFolder: "books/read",
 	organizeReadBooks: true,
 	templateFile: "",
-	tbrFolder: "books/tbr",
 	fileNameFormat: "{{title}} - {{authors}}",
 	downloadCovers: false,
 	coverFolder: "images/covers",