version 1.1.2

Author: deadlyjack

package.json

@@ -1,6 +1,6 @@
 {
   "name": "acode-plugin-github",
-  "version": "1.0.3",
+  "version": "1.1.2",
   "description": "Github plugin for acode editor",
   "main": "dist/main.js",
   "repository": "https://github.com/deadlyjack/acode-plugin-github.git",

plugin.json

@@ -2,7 +2,7 @@
   "id": "acode.plugin.github",
   "name": "Github",
   "main": "dist/main.js",
-  "version": "1.0.3",
+  "version": "1.1.2",
   "readme": "readme.md",
   "icon": "icon.png",
   "files": [],

readme.md

@@ -14,3 +14,4 @@ Access your gist/repositories without cloning/downloading it. To access search `
 
 - **1.0.2**: Create/Delete file, directory in repository.
 - **1.0.3**: Bugs fixes.
+- **1.1.2**: Ask for commit message.

src/githubFs.js

@@ -81,6 +81,18 @@ export default function githubFs(token, settings) {
     };
   }
 
+  /**
+   * Get commit message from user
+   * @param {string} message 
+   * @returns 
+   */
+  async function getCommitMessage(message) {
+    if (settings.askCommitMessage) {
+      return await prompt('Commit message', message, 'text');
+    }
+    return message;
+  }
+
   /**
    * 
    * @param {string} user 
@@ -135,26 +147,19 @@ export default function githubFs(token, settings) {
         let { data } = await repo.getBlob(sha, 'blob');
         data = await data.arrayBuffer();
 
-        // const textEncoder = new TextEncoder();
-        // data = textEncoder.encode(window.atob(data));
-
         if (encoding) {
           return helpers.decodeText(data, encoding);
         }
 
         return data;
       },
       async writeFile(data) {
+        const commitMessage = await getCommitMessage(`update ${path}`);
         await init();
-        let commitMessage = `update ${path}`;
-
-        if (settings.askCommitMessage) {
-          commitMessage = await prompt('Commit message', commitMessage, 'text');
-        }
-
         await repo.writeFile(branch, path, data, commitMessage);
       },
       async createFile(name, data = '') {
+        await init();
         const newPath = path === '' ? name : Url.join(path, name);
         // check if file exists
         let sha;
@@ -168,7 +173,8 @@ export default function githubFs(token, settings) {
           throw new Error('File already exists');
         }
 
-        await repo.writeFile(branch, newPath, data, `create ${newPath}`);
+        const commitMessage = await getCommitMessage(`create ${newPath}`);
+        await repo.writeFile(branch, newPath, data, commitMessage);
         return githubFs.constructUrl('repo', user, repoName, newPath, branch);
       },
       async createDirectory(dirname) {
@@ -187,7 +193,8 @@ export default function githubFs(token, settings) {
         }
 
         const createPath = Url.join(newPath, '.gitkeep');
-        await repo.writeFile(branch, createPath, '', `create ${newPath}`);
+        const commitMessage = await getCommitMessage(`create ${newPath}`);
+        await repo.writeFile(branch, createPath, '', commitMessage);
         return githubFs.constructUrl('repo', user, repoName, newPath, branch);
       },
       async copyTo(dest) {
@@ -196,7 +203,8 @@ export default function githubFs(token, settings) {
       async delete() {
         await init();
         await getSha();
-        await repo.deleteFile(branch, path, `delete ${path}`, sha);
+        const commitMessage = await getCommitMessage(`delete ${path}`);
+        await repo.deleteFile(branch, path, commitMessage, sha);
       },
       async moveTo(dest) {
         await init();

src/main.js

@@ -30,16 +30,6 @@ class AcodePlugin {
   #gists = [];
 
   async init() {
-    this.settings = appSettings.value[plugin.id];
-
-    if (!this.settings) {
-      this.settings = {
-        askCommitMessage: false,
-      };
-      appSettings.value[plugin.id] = this.settings;
-      appSettings.update();
-    }
-
     this.commands.forEach(command => {
       editorManager.editor.commands.addCommand(command);
     });
@@ -487,6 +477,35 @@ class AcodePlugin {
       }
     ]
   }
+
+  get settings() {
+    const settings = appSettings.value[plugin.id];
+    if (!settings) {
+      appSettings.value[plugin.id] = {
+        askCommitMessage: true,
+      };
+      appSettings.update();
+    }
+    return appSettings.value[plugin.id];
+  }
+
+  get settingsJson() {
+    const list = [
+      {
+        key: 'askCommitMessage',
+        text: 'Ask for commit message',
+        checkbox: this.settings.askCommitMessage,
+      }
+    ];
+
+    return {
+      list,
+      cb: (key, value) => {
+        this.settings[key] = value;
+        appSettings.update();
+      }
+    }
+  }
 }
 
 if (window.acode) {
@@ -497,7 +516,7 @@ if (window.acode) {
     }
     acodePlugin.baseUrl = baseUrl;
     await acodePlugin.init($page, cacheFile, cacheFileUrl);
-  });
+  }, acodePlugin.settingsJson);
   acode.setPluginUnmount(plugin.id, () => {
     acodePlugin.destroy();
   });