fix(mobile): set correct base path after clone

close #282
Vinzent03 · Aug 21, 2022 · 3a69b79 · 3a69b79
1 parent ad74e0b
commit 3a69b79
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -36,7 +36,6 @@
         "isomorphic-git": "^1.19.1",
         "supports-color": "^7.2.0",
         "buffer": "^6.0.3",
-        "path-normalize": "^6.0.6",
         "simple-git": "^3.12.0"
     },
     "moduleFileExtensions": [

diff --git a/src/main.ts b/src/main.ts
@@ -1,4 +1,4 @@
-import { debounce, Debouncer, EventRef, Menu, Notice, Plugin, TAbstractFile, TFile } from "obsidian";
+import { debounce, Debouncer, EventRef, Menu, normalizePath, Notice, Plugin, TAbstractFile, TFile } from "obsidian";
 import { PromiseQueue } from "src/promiseQueue";
 import { ObsidianGitSettingsTab } from "src/settings";
 import { StatusBar } from "src/statusBar";
@@ -14,7 +14,6 @@ import DiffView from "./ui/diff/diffView";
 import { GeneralModal } from "./ui/modals/generalModal";
 import { IgnoreModal } from "./ui/modals/ignoreModal";
 import GitView from "./ui/sidebar/sidebarView";
-const normalize = require("path-normalize");
 
 export default class ObsidianGit extends Plugin {
     gitManager: GitManager;
@@ -496,13 +495,26 @@ export default class ObsidianGit extends Plugin {
     }
 
     async cloneNewRepo() {
+        console.log(normalizePath(""));
+        console.log(normalizePath("."));
+        console.log(normalizePath("/"));
+        console.log(normalizePath("./"));
+
         const modal = new GeneralModal(this.app, [], "Enter remote URL");
         const url = await modal.open();
         if (url) {
-            let dir = await new GeneralModal(this.app, [], "Enter directory for clone. It needs to be empty or not existent.", this.gitManager instanceof IsomorphicGit).open();
+            let dir = await new GeneralModal(this.app, ["Vault root"], "Enter directory for clone. It needs to be empty or not existent.", this.gitManager instanceof IsomorphicGit).open();
             if (dir !== undefined) {
-                dir = normalize(dir);
-                if (dir === "" || dir === ".") {
+                if (dir === "Vault root") {
+                    dir = ".";
+                }
+
+                dir = normalizePath(dir);
+                if (dir === "/") {
+                    dir = ".";
+                }
+
+                if (dir === ".") {
                     const modal = new GeneralModal(this.app, ["NO", "YES"], `Does your remote repo contain a ${app.vault.configDir} directory at the root?`, false, true);
                     const containsConflictDir = await modal.open();
                     if (containsConflictDir === undefined) {
@@ -524,7 +536,7 @@ export default class ObsidianGit extends Plugin {
                 new Notice("Cloned new repo.");
                 new Notice("Please restart Obsidian");
 
-                if (dir) {
+                if (dir && dir !== ".") {
                     this.settings.basePath = dir;
                     this.saveSettings();
                 }

diff --git a/src/ui/modals/generalModal.ts b/src/ui/modals/generalModal.ts
@@ -17,7 +17,13 @@ export class GeneralModal extends SuggestModal<string> {
     }
 
     selectSuggestion(value: string, evt: MouseEvent | KeyboardEvent): void {
-        if (this.resolve) this.resolve((this.allowEmpty && value === " ") ? "" : value);
+        if (this.resolve) {
+            let res;
+            if (this.allowEmpty && value === " ") res = "";
+            else if (value === "...") res = undefined;
+            else res = value;
+            this.resolve(res);
+        }
         super.selectSuggestion(value, evt);
     }