bugs fixes

Author: deadlyjack

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "dart.lineLength": 50,
+  "prettier.printWidth": 50,
+}

icon.png

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

plugin.json

@@ -12,4 +12,5 @@ Access your gist/repositories without cloning/downloading it. To access search `
 
 ## Updates
 
-- **1.0.2**: Create file, directory in repository.
+- **1.0.2**: Create/Delete file, directory in repository.
+- **1.0.3**: Bugs fixes.

readme.md

@@ -173,11 +173,14 @@ class Requestable {
       data = undefined;
     }
 
-    const { url: pureUrl, query = '' } = Url.parse(url);
-    const dateTime = `_datetime=${new Date().getTime()}`;
-    const newQuery = query ? `${query}&${dateTime}` : dateTime;
+    let newUrl = url;
 
-    const newUrl = `${pureUrl}?${newQuery}`;
+    if (method === 'GET') {
+      const { url: pureUrl, query = '' } = Url.parse(url);
+      const dateTime = `_datetime=${new Date().getTime()}`;
+      const newQuery = query ? `${query}&${dateTime}` : `?${dateTime}`;
+      newUrl = `${pureUrl}${newQuery}`;
+    }
 
     const config = {
       url: newUrl,

src/GitHubAPI/Requestable.js

@@ -36,7 +36,6 @@ githubFs.constructUrl = (type, user, repo, path, branch) => {
 };
 
 export default function githubFs(token) {
-
   fsOperation.extend(test, (url) => {
     const { user, type, repo, path, gist } = parseUrl(url);
     if (type === 'repo') {
@@ -89,9 +88,9 @@ export default function githubFs(token) {
    * @returns 
    */
   function readRepo(user, repoAtBranch, path) {
-    const gh = new GitHub({ token });
+    let gh;
+    let repo;
     const [repoName, branch] = repoAtBranch.split('@');
-    const repo = gh.getRepo(user, repoName);
     let sha = '';
     const getSha = async () => {
       if (!sha) {
@@ -100,8 +99,23 @@ export default function githubFs(token) {
       }
     };
 
+    const init = async () => {
+      if (gh) return;
+      gh = new GitHub({ token: await token() });
+      repo = gh.getRepo(user, repoName);
+    }
+
+    const move = async (dest) => {
+      const newUrl = githubFs.constructUrl('repo', user, repoName, dest, branch);
+      if (dest === path) return newUrl;
+      if (dest.startsWith('/')) dest = dest.slice(1);
+      await repo.move(branch, path, dest);
+      return newUrl;
+    }
+
     return {
       async lsDir() {
+        await init();
         const res = await repo.getSha(branch, path);
         const { data } = res;
 
@@ -115,6 +129,7 @@ export default function githubFs(token) {
         });
       },
       async readFile(encoding) {
+        await init();
         await getSha();
         let { data } = await repo.getBlob(sha, 'blob');
         data = await data.arrayBuffer();
@@ -129,6 +144,7 @@ export default function githubFs(token) {
         return data;
       },
       async writeFile(data) {
+        await init();
         await repo.writeFile(branch, path, data, `update ${path}`);
       },
       async createFile(name, data = '') {
@@ -149,6 +165,7 @@ export default function githubFs(token) {
         return githubFs.constructUrl('repo', user, repoName, newPath, branch);
       },
       async createDirectory(dirname) {
+        await init();
         let newPath = path === '' ? dirname : Url.join(path, dirname);
         // check if file exists
         let sha;
@@ -170,18 +187,25 @@ export default function githubFs(token) {
         throw new Error('Not implemented');
       },
       async delete() {
+        await init();
         await getSha();
         await repo.deleteFile(branch, path, `delete ${path}`, sha);
       },
       async moveTo(dest) {
-        throw new Error('Not implemented');
+        await init();
+        const { path: destPath } = parseUrl(dest);
+        const newName = Url.join(destPath, Url.basename(path));
+        const res = await move(newName);
+        return res;
       },
       async renameTo(name) {
-        // rename file
-        await getSha();
-        await repo.move(branch, path, name, 'rename file', sha);
+        await init();
+        const newName = Url.join(Url.dirname(path), name);
+        const res = await move(newName);
+        return res;
       },
       async exists() {
+        await init();
         try {
           await repo.getSha(branch, path);
           return true;
@@ -190,6 +214,7 @@ export default function githubFs(token) {
         }
       },
       async stat() {
+        await init();
         await getSha();
         const content = await repo.getBlob(sha);
         return {
@@ -205,20 +230,27 @@ export default function githubFs(token) {
 
   function readGist(gistId, path) {
     let file;
-    const gh = new GitHub({ token });
-    const gist = gh.getGist(gistId);
+    let gh;
+    let gist;
     const getFile = async () => {
       if (!file) {
         const { data } = await gist.read();
         file = data.files[path];
       }
       return file;
     }
+    const init = async () => {
+      if (gh) return;
+      gh = new GitHub({ token: await token() });
+      gist = gh.getGist(gistId);
+    }
+
     return {
       async lsDir() {
         throw new Error('Not implemented');
       },
       async readFile(encoding, progress) {
+        await init();
         let { content: data } = await getFile();
         const textEncoder = new TextEncoder();
         data = textEncoder.encode(file.content);
@@ -230,6 +262,7 @@ export default function githubFs(token) {
         return data;
       },
       async writeFile(data) {
+        await init();
         await gist.update({
           files: {
             [path]: {
@@ -257,9 +290,11 @@ export default function githubFs(token) {
         throw new Error('Not implemented');
       },
       async exists() {
+        await init();
         return !!await getFile();
       },
       async stat() {
+        await init();
         await getFile();
         return {
           length: file.size,

src/githubFs.js

@@ -36,22 +36,22 @@ class AcodePlugin {
     });
 
     this.token = await this.#cacheFile.readFile('utf8');
-    if (this.token) {
-      await this.initFs();
-    }
+    await this.initFs();
   }
 
   async initFs() {
     if (this.#fsInitialized) return;
-    if (!this.token) {
-      await this.updateToken();
-    }
-
     githubFs.remove();
-    githubFs(this.token);
+    githubFs(this.getToken.bind(this));
     this.#fsInitialized = true;
   }
 
+  async getToken() {
+    if (this.token) return this.token;
+    await this.updateToken();
+    return this.token;
+  }
+
   async destroy() {
     githubFs.remove();
     this.commands.forEach(command => {
@@ -61,6 +61,7 @@ class AcodePlugin {
 
   async openRepo() {
     await this.initFs();
+    this.token = await this.getToken();
     pallete(
       this.listRepositories.bind(this),
       this.selectBranch.bind(this),
@@ -72,7 +73,8 @@ class AcodePlugin {
     const [user, repoName] = repo.split('/');
     pallete(
       this.listBranches.bind(this, user, repoName),
-      (branch) => this.openRepoAsFolder(user, repoName, branch),
+      (branch) => this.openRepoAsFolder(user, repoName, branch)
+        .catch(helpers.error),
       'Type to search branch',
     );
   }
@@ -89,7 +91,7 @@ class AcodePlugin {
     const confirmation = await confirm(strings['warning'], 'Delete this gist?');
     if (!confirmation) return;
 
-    const gh = new GitHub({ token: this.token });
+    const gh = await this.#GitHub();
     const gistApi = gh.getGist(gist);
     await gistApi.delete();
     this.#gists = this.#gists.filter(g => g.id !== gist);
@@ -117,7 +119,7 @@ class AcodePlugin {
     const confirmation = await confirm(strings['warning'], 'Delete this file?');
     if (!confirmation) return;
 
-    const gh = new GitHub({ token: this.token });
+    const gh = await this.#GitHub();
     const gistApi = gh.getGist(gist);
     await gistApi.update({
       files: {
@@ -129,8 +131,8 @@ class AcodePlugin {
     window.toast('File deleted');
   }
 
-  async openRepoAsFolder(user, repo, branch) {
-    const cachedRepo = this.#getRepo(user, repo);
+  async openRepoAsFolder(user, repoName, branch) {
+    const cachedRepo = this.#getRepo(user, repoName);
     if (branch === this.NEW) {
       const { from, branch: newBranch } = await multiPrompt(
         strings['create new branch'],
@@ -150,8 +152,8 @@ class AcodePlugin {
         }],
       );
       branch = newBranch;
-      const gh = new GitHub({ token: this.token });
-      const repo = gh.getRepo(user, repo);
+      const gh = await this.#GitHub();
+      const repo = gh.getRepo(user, repoName);
       await repo.createBranch(from, newBranch);
     }
 
@@ -160,14 +162,15 @@ class AcodePlugin {
       return;
     }
 
-    const url = githubFs.constructUrl('repo', user, repo, '/', branch);
+    const url = githubFs.constructUrl('repo', user, repoName, '/', branch);
     openFolder(url, {
-      name: `${user}/${repo}/${branch}`,
+      name: `${user}/${repoName}/${branch}`,
     });
   }
 
   async openGist() {
     await this.initFs();
+    this.token = await this.getToken();
 
     pallete(
       this.listGists.bind(this),
@@ -215,7 +218,7 @@ class AcodePlugin {
       });
 
       helpers.showTitleLoader();
-      const gh = new GitHub({ token: this.token });
+      const gh = await this.#GitHub();
       const gist = gh.getGist();
       const { data } = await gist.create({
         description,
@@ -244,7 +247,7 @@ class AcodePlugin {
                 window.toast(strings['cancelled']);
               }
               helpers.showTitleLoader();
-              const gh = new GitHub({ token: this.token });
+              const gh = await this.#GitHub();
               await gh.getGist(gist).update({
                 files: {
                   [filename]: {
@@ -298,7 +301,7 @@ class AcodePlugin {
     if (this.#repos.length) {
       return [...this.#repos];
     }
-    const gh = new GitHub({ token: this.token });
+    const gh = await this.#GitHub();
     const user = gh.getUser();
     const repos = await user.listRepos();
     const { data } = repos;
@@ -323,7 +326,7 @@ class AcodePlugin {
     if (cachedRepo && cachedRepo.branches) {
       list = [...cachedRepo.branches];
     } else {
-      const gh = new GitHub({ token: this.token });
+      const gh = await this.#GitHub();
       const repo = gh.getRepo(user, repoName);
       const branches = await repo.listBranches();
       const { data } = branches;
@@ -358,7 +361,7 @@ class AcodePlugin {
     if (this.#gists.length) {
       list = [...this.#gists];
     } else {
-      const gh = new GitHub({ token: this.token });
+      const gh = await this.#GitHub();
       const user = gh.getUser();
       const gists = await user.listGists();
       const { data } = gists;
@@ -384,7 +387,7 @@ class AcodePlugin {
     if (cachedGist && cachedGist.files) {
       list = [...cachedGist.files];
     } else {
-      const gh = new GitHub({ token: this.token });
+      const gh = await this.#GitHub();
       const gist = gh.getGist(gistId);
       const { data: { files, owner } } = await gist.read();
 
@@ -433,6 +436,10 @@ class AcodePlugin {
     return this.#gists.find(gist => gist.value === gistId);
   }
 
+  async #GitHub() {
+    return new GitHub({ token: await this.getToken() });
+  }
+
   get commands() {
     return [
       {