wip

Vinzent03 · Oct 9, 2024 · 6dff6d3 · 6dff6d3
1 parent 4ae564b
commit 6dff6d3
Show file tree

Hide file tree

Showing 13 changed files with 166 additions and 132 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -19,7 +19,18 @@ export default tseslint.config(
             },
         },
         rules: {
-            "@typescript-eslint/no-unused-vars": "warn",
+            "@typescript-eslint/no-unused-vars": [
+                "error",
+                {
+                    args: "all",
+                    argsIgnorePattern: "^_",
+                    caughtErrors: "all",
+                    caughtErrorsIgnorePattern: "^_",
+                    destructuredArrayIgnorePattern: "^_",
+                    varsIgnorePattern: "^_",
+                    ignoreRestSiblings: true,
+                },
+            ],
         },
     },
     {

diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
         "dev": "node esbuild.config.mjs dev",
         "build": "node esbuild.config.mjs production",
         "release": "standard-version",
-        "lint": "eslint",
+        "lint": "eslint src",
         "format": "prettier --check src",
         "tsc": "tsc --noEmit",
         "svelte": "svelte-check",

diff --git a/src/automaticsManager.ts b/src/automaticsManager.ts
@@ -29,7 +29,7 @@ export default class AutomaticsManager {
     }
 
     async init() {
-        this.setUpAutoCommitAndSync();
+        await this.setUpAutoCommitAndSync();
         const lastAutos = this.loadLastAuto();
 
         if (
@@ -155,7 +155,6 @@ export default class AutomaticsManager {
             }
         });
         this.saveLastAuto(new Date(), "backup");
-        this.plugin.saveSettings();
         this.startAutoCommitAndSync();
     }
 
@@ -169,7 +168,6 @@ export default class AutomaticsManager {
                 this.plugin.pullChangesFromRemote()
             );
             this.saveLastAuto(new Date(), "pull");
-            this.plugin.saveSettings();
             this.startAutoPull();
         }, time);
     }
@@ -182,7 +180,6 @@ export default class AutomaticsManager {
         this.timeoutIDPush = window.setTimeout(() => {
             this.plugin.promiseQueue.addTask(() => this.plugin.push());
             this.saveLastAuto(new Date(), "push");
-            this.plugin.saveSettings();
             this.startAutoPush();
         }, time);
     }

diff --git a/src/commands.ts b/src/commands.ts
@@ -21,14 +21,14 @@ export function addCommmands(plugin: ObsidianGit) {
         callback: async () => {
             const path = plugin.gitManager.getRelativeVaultPath(".gitignore");
             if (!(await app.vault.adapter.exists(path))) {
-                app.vault.adapter.write(path, "");
+                await app.vault.adapter.write(path, "");
             }
             const content = await app.vault.adapter.read(path);
             const modal = new IgnoreModal(app, content);
             const res = await modal.open();
             if (res !== undefined) {
                 await app.vault.adapter.write(path, res);
-                plugin.refresh();
+                await plugin.refresh();
             }
         },
     });
@@ -50,7 +50,7 @@ export function addCommmands(plugin: ObsidianGit) {
             } else {
                 leaf = leafs.first()!;
             }
-            app.workspace.revealLeaf(leaf);
+            await app.workspace.revealLeaf(leaf);
         },
     });
     plugin.addCommand({
@@ -71,7 +71,7 @@ export function addCommmands(plugin: ObsidianGit) {
             } else {
                 leaf = leafs.first()!;
             }
-            app.workspace.revealLeaf(leaf);
+            await app.workspace.revealLeaf(leaf);
         },
     });
 
@@ -83,7 +83,7 @@ export function addCommmands(plugin: ObsidianGit) {
             if (checking) {
                 return file !== null;
             } else {
-                getNewLeaf(app)?.setViewState({
+                void getNewLeaf(app)?.setViewState({
                     type: DIFF_VIEW_CONFIG.type,
                     active: true,
                     state: {
@@ -142,7 +142,9 @@ export function addCommmands(plugin: ObsidianGit) {
             if (checking) {
                 return file !== null;
             } else {
-                plugin.addFileToGitignore(file!);
+                plugin
+                    .addFileToGitignore(file!)
+                    .catch((e) => plugin.displayError(e));
             }
         },
     });
@@ -310,7 +312,7 @@ export function addCommmands(plugin: ObsidianGit) {
                         "Successfully deleted repository. Reloading plugin..."
                     );
                     plugin.unloadPlugin();
-                    plugin.init();
+                    await plugin.init();
                 }
             } else {
                 new Notice("No repository found");
@@ -352,23 +354,23 @@ export function addCommmands(plugin: ObsidianGit) {
         id: "switch-branch",
         name: "Switch branch",
         callback: () => {
-            plugin.switchBranch();
+            plugin.switchBranch().catch((e) => plugin.displayError(e));
         },
     });
 
     plugin.addCommand({
         id: "create-branch",
         name: "Create new branch",
         callback: () => {
-            plugin.createBranch();
+            plugin.createBranch().catch((e) => plugin.displayError(e));
         },
     });
 
     plugin.addCommand({
         id: "delete-branch",
         name: "Delete branch",
         callback: () => {
-            plugin.deleteBranch();
+            plugin.deleteBranch().catch((e) => plugin.displayError(e));
         },
     });
 

diff --git a/src/gitManager/gitManager.ts b/src/gitManager/gitManager.ts
@@ -75,7 +75,7 @@ export abstract class GitManager {
         value: string | number | boolean | undefined
     ): Promise<void>;
 
-    abstract getConfig(path: string): Promise<any>;
+    abstract getConfig(path: string): Promise<string>;
 
     abstract fetch(remote?: string): Promise<void>;
 

diff --git a/src/gitManager/simpleGit.ts b/src/gitManager/simpleGit.ts
@@ -716,19 +716,27 @@ export class SimpleGit extends GitManager {
         );
     }
 
-    async setConfig(path: string, value: any): Promise<void> {
+    async setConfig(path: string, value: string): Promise<void> {
         if (value == undefined) {
             await this.git.raw(["config", "--local", "--unset", path]);
         } else {
             await this.git.addConfig(path, value, (err) => this.onError(err));
         }
     }
 
-    async getConfig(path: string): Promise<any> {
+    async getConfig(path: string): Promise<string> {
         const config = await this.git.listConfig("local", (err) =>
             this.onError(err)
         );
-        return config.all[path];
+        const res = config.all[path];
+        if (typeof res === "string") {
+            return res;
+        } else {
+            const error = new Error("Config value is not a string");
+
+            this.onError(error);
+            throw error;
+        }
     }
 
     async fetch(remote?: string): Promise<void> {