From e4a416ec2f4af21729368476f451a47770635eb2 Mon Sep 17 00:00:00 2001
From: Evan Fiordeliso <evan.fiordeliso@gmail.com>
Date: Mon, 30 Jun 2025 14:26:55 -0400
Subject: [PATCH] Reorganize utils dir

---
 src/main.ts                                   |  7 +--
 src/types.ts                                  |  8 ----
 .../ReadingLogCodeBlockView.svelte            |  2 +-
 src/ui/modals/ReadingLogEntryEditModal.ts     |  2 +-
 .../ReadingLogEntryEditModalView.svelte       |  2 +-
 src/utils/{storage.ts => ReadingLog.ts}       | 46 ++++---------------
 src/utils/Storage.ts                          | 34 ++++++++++++++
 src/utils/{templater.ts => Templater.ts}      |  0
 8 files changed, 51 insertions(+), 50 deletions(-)
 rename src/utils/{storage.ts => ReadingLog.ts} (65%)
 create mode 100644 src/utils/Storage.ts
 rename src/utils/{templater.ts => Templater.ts} (100%)

diff --git a/src/main.ts b/src/main.ts
index a443f35..eac44d1 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -5,7 +5,7 @@ import {
 	BookTrackerSettingTab,
 } from "@ui/settings";
 import { getBookByLegacyId, type SearchResult } from "@data-sources/goodreads";
-import { Templater } from "@utils/templater";
+import { Templater } from "@utils/Templater";
 import {
 	GoodreadsSearchModal,
 	GoodreadsSearchSuggestModal,
@@ -18,7 +18,8 @@ import {
 	READ_STATE,
 	TO_BE_READ_STATE,
 } from "./const";
-import { ReadingLog, Storage } from "@utils/storage";
+import { Storage } from "@utils/Storage";
+import { ReadingLog } from "@utils/ReadingLog";
 import { registerReadingLogCodeBlockProcessor } from "@ui/code-blocks";
 
 export default class BookTrackerPlugin extends Plugin {
@@ -32,7 +33,7 @@ export default class BookTrackerPlugin extends Plugin {
 
 		this.templater = new Templater(this.app);
 		this.storage = new Storage(this.app, this);
-		this.readingLog = new ReadingLog(this);
+		this.readingLog = new ReadingLog(this.storage);
 
 		this.addCommand({
 			id: "search-goodreads",
diff --git a/src/types.ts b/src/types.ts
index d05c42e..193297f 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -21,11 +21,3 @@ export interface Book {
 	isbn: string;
 	isbn13: string;
 }
-
-export interface ReadingLogEntry {
-	book: string;
-	pagesRead: number;
-	pagesReadTotal: number;
-	pagesRemaining: number;
-	createdAt: Date;
-}
diff --git a/src/ui/code-blocks/ReadingLogCodeBlockView.svelte b/src/ui/code-blocks/ReadingLogCodeBlockView.svelte
index 09a6765..ae50d10 100644
--- a/src/ui/code-blocks/ReadingLogCodeBlockView.svelte
+++ b/src/ui/code-blocks/ReadingLogCodeBlockView.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { ReadingLogEntry } from "@src/types";
+	import type { ReadingLogEntry } from "@utils/ReadingLog";
 	import { Edit, Trash, Plus } from "lucide-svelte";
 	import { ReadingLogEntryEditModal } from "@ui/modals";
 	import type BookTrackerPlugin from "@src/main";
diff --git a/src/ui/modals/ReadingLogEntryEditModal.ts b/src/ui/modals/ReadingLogEntryEditModal.ts
index 88b40e8..f644215 100644
--- a/src/ui/modals/ReadingLogEntryEditModal.ts
+++ b/src/ui/modals/ReadingLogEntryEditModal.ts
@@ -1,5 +1,5 @@
 import ReadingLogEntryEditModalView from "./ReadingLogEntryEditModalView.svelte";
-import type { ReadingLogEntry } from "@src/types";
+import type { ReadingLogEntry } from "@utils/ReadingLog";
 import { SvelteModal } from "./SvelteModal";
 import type BookTrackerPlugin from "@src/main";
 
diff --git a/src/ui/modals/ReadingLogEntryEditModalView.svelte b/src/ui/modals/ReadingLogEntryEditModalView.svelte
index c699744..a2adb66 100644
--- a/src/ui/modals/ReadingLogEntryEditModalView.svelte
+++ b/src/ui/modals/ReadingLogEntryEditModalView.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type BookTrackerPlugin from "@src/main";
-	import type { ReadingLogEntry } from "@src/types";
+	import type { ReadingLogEntry } from "@utils/ReadingLog";
 	import FileSuggest from "@ui/components/suggesters/FileSuggest.svelte";
 
 	interface Props {
diff --git a/src/utils/storage.ts b/src/utils/ReadingLog.ts
similarity index 65%
rename from src/utils/storage.ts
rename to src/utils/ReadingLog.ts
index 96546ea..40196f1 100644
--- a/src/utils/storage.ts
+++ b/src/utils/ReadingLog.ts
@@ -1,50 +1,24 @@
-import BookTrackerPlugin from "@src/main";
-import type { ReadingLogEntry } from "@src/types";
-import { App } from "obsidian";
+import type { Storage } from "./Storage";
 
-export class Storage {
-	public constructor(
-		private readonly app: App,
-		private readonly plugin: BookTrackerPlugin
-	) {}
-
-	private getFilePath(filename: string): string {
-		return `${this.plugin.manifest.dir!!}/${filename}`;
-	}
-
-	public async readJSON<T>(filename: string): Promise<T | null> {
-		const filePath = this.getFilePath(filename);
-		const content = await this.app.vault.adapter.read(filePath);
-		if (!content) {
-			return null;
-		}
-
-		try {
-			return JSON.parse(content) as T;
-		} catch (error) {
-			console.error(`Error parsing JSON from ${filePath}:`, error);
-			return null;
-		}
-	}
-
-	public async writeJSON<T>(filename: string, data: T): Promise<void> {
-		const filePath = this.getFilePath(filename);
-		const content = JSON.stringify(data, null, 2);
-		await this.app.vault.adapter.write(filePath, content);
-	}
+export interface ReadingLogEntry {
+	book: string;
+	pagesRead: number;
+	pagesReadTotal: number;
+	pagesRemaining: number;
+	createdAt: Date;
 }
 
 export class ReadingLog {
 	private entries: ReadingLogEntry[] = [];
 
-	public constructor(private readonly plugin: BookTrackerPlugin) {
+	public constructor(private readonly storage: Storage) {
 		this.loadEntries().catch((error) => {
 			console.error("Failed to load reading log entries:", error);
 		});
 	}
 
 	private async loadEntries() {
-		const entries = await this.plugin.storage.readJSON<ReadingLogEntry[]>(
+		const entries = await this.storage.readJSON<ReadingLogEntry[]>(
 			"reading-log.json"
 		);
 		if (entries) {
@@ -63,7 +37,7 @@ export class ReadingLog {
 
 	private async storeEntries() {
 		this.sortEntries();
-		await this.plugin.storage.writeJSON("reading-log.json", this.entries);
+		await this.storage.writeJSON("reading-log.json", this.entries);
 	}
 
 	public getEntries(): ReadingLogEntry[] {
diff --git a/src/utils/Storage.ts b/src/utils/Storage.ts
new file mode 100644
index 0000000..2200ec1
--- /dev/null
+++ b/src/utils/Storage.ts
@@ -0,0 +1,34 @@
+import BookTrackerPlugin from "@src/main";
+import { App } from "obsidian";
+
+export class Storage {
+	public constructor(
+		private readonly app: App,
+		private readonly plugin: BookTrackerPlugin
+	) {}
+
+	private getFilePath(filename: string): string {
+		return `${this.plugin.manifest.dir!!}/${filename}`;
+	}
+
+	public async readJSON<T>(filename: string): Promise<T | null> {
+		const filePath = this.getFilePath(filename);
+		const content = await this.app.vault.adapter.read(filePath);
+		if (!content) {
+			return null;
+		}
+
+		try {
+			return JSON.parse(content) as T;
+		} catch (error) {
+			console.error(`Error parsing JSON from ${filePath}:`, error);
+			return null;
+		}
+	}
+
+	public async writeJSON<T>(filename: string, data: T): Promise<void> {
+		const filePath = this.getFilePath(filename);
+		const content = JSON.stringify(data, null, 2);
+		await this.app.vault.adapter.write(filePath, content);
+	}
+}
diff --git a/src/utils/templater.ts b/src/utils/Templater.ts
similarity index 100%
rename from src/utils/templater.ts
rename to src/utils/Templater.ts