Stop editing file during sync, fixed promise await when downloading f…

…ile from drive
SebTota · Feb 17, 2021 · b016e44 · b016e44
1 parent b2818f9
commit b016e44
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 23 deletions.
diff --git a/lib/editor.js b/lib/editor.js
@@ -435,8 +435,15 @@ $('#btn-cloud-sign-in').on('click', function(e) {
     });
 })
 
-$('#btn-sync').on('click', function(e) {
+$('#btn-sync').on('click', (e) => {
+    this.quill['emitter']['_events']['text-change'] = undefined; // Clear on change file save listener
+    quill.enable(false); // Disable editor
     sync.instance.sync().then(() => {
-        console.log('done sync');
+        logger.info('Finished sync');
+        console.log('Finished sync');
+        // Reopen file if a user was editing a file when sync was initiated
+        if (currentFile['relativePath']) {
+            openFile(currentFile['relativePath']);
+        }
     })
 })
diff --git a/modules/providers/google-auth.js b/modules/providers/google-auth.js
@@ -354,29 +354,32 @@ module.exports = class GoogleAuth {
 
         logger.info(`Sync file from drive: Syncing file to path: ${filePath}`);
 
-        this.drive.files
-            .get({ fileId, alt: "media"}, {responseType: 'stream'})
-            .then((res) => {
-                const dest = fs.createWriteStream(filePath);
-
-                const decoder = new TextDecoder("utf-8");
-                const reader = res.data.getReader()
-                reader.read().then(function processText({ done, value }) {
-                    if (done) {
-                        if (mtime !== undefined) {
-                            console.log(`Setting time: ${mtime}`);
-                            fs.utimesSync(filePath, mtime, mtime)
+        return new Promise((resolve) => {
+            this.drive.files
+                .get({fileId, alt: "media"}, {responseType: 'stream'})
+                .then((res) => {
+                    const dest = fs.createWriteStream(filePath);
+
+                    const decoder = new TextDecoder("utf-8");
+                    const reader = res.data.getReader()
+                    reader.read().then(function processText({done, value}) {
+                        if (done) {
+                            if (mtime !== undefined) {
+                                console.log(`Setting time: ${mtime}`);
+                                fs.utimesSync(filePath, mtime, mtime)
+                            }
+                            console.log("Stream complete");
+                            folderStructure.buildFileMenu()
+                            resolve();
+                            return;
                         }
-                        console.log("Stream complete");
-                        folderStructure.buildFileMenu()
-                        return;
-                    }
-                    dest.write(decoder.decode(value))
+                        dest.write(decoder.decode(value))
 
-                    // Read some more, and call this function again
-                    return reader.read().then(processText);
-                });
-            })
+                        // Read some more, and call this function again
+                        return reader.read().then(processText);
+                    });
+                })
+        });
     }
 
     /*