jvcs 1.1.3 → 1.1.5

package/controllers/revert.js

@@ -39,25 +39,29 @@ function cleanCWD() {
     }
 }
 
-function getCommitsToDelete(commitFolder,currentCommit,targetCommit) {
-
-    let toDelete = []
-
-    while(currentCommit && currentCommit !== targetCommit) {
+function buildCommitMap(commitFolder) {
 
-        const commitPath = path.join(commitFolder,currentCommit)
-        const metaPath = path.join(commitPath,"meta.json")
-
-        if(!fs.existsSync(commitPath)) break
-        toDelete.push(currentCommit)
-
-        let parent = null
+    const map = {}
+    const dirs = fs.readdirSync(commitFolder)
+    for(const dir of dirs) {
+        const metaPath = path.join(commitFolder,dir,"meta.json")
         if(fs.existsSync(metaPath)) {
             const data = JSON.parse(fs.readFileSync(metaPath,"utf-8"))
-            parent = data.parent || null
+            map[dir] = data.parent
         }
+    }
 
-        currentCommit = parent
+    return map
+}
+
+function getCommitsToDelete(commitFolder,currentCommit,targetCommit) {
+
+    const commitMap = buildCommitMap(commitFolder)
+    const toDelete = []
+
+    while(currentCommit && currentCommit !== targetCommit) {
+        toDelete.push(currentCommit)
+        currentCommit = commitMap[currentCommit] || null
     }
 
     return toDelete
@@ -87,7 +91,7 @@ async function deleteCommitsFromDrive(ids) {
             folderName = `commit_${id}`
             
             const res = await drive.files.list({
-                q: `name=${folderName} and trashed=false`,
+                q: `name='${folderName}' and trashed=false`,
                 fields: "files(id,name)"
             })
             

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jvcs",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "bin": {
     "jvcs": "./index.js"
   },