Merge pull request #3 from jianboy/gogs1s

Gogs1s 1.52.12
jianboy · Aug 21, 2021 · 3e19b4e · 3e19b4e
2 parents 7aa37d8 + 7ba1c55
commit 3e19b4e
Show file tree

Hide file tree

Showing 56 changed files with 1,571 additions and 183 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 15.x]
+        node-version: [14.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -28,21 +28,27 @@ jobs:
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
       - uses: actions/cache@v2
+        id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-${{ matrix.node-version }}
 
+      - name: Install Dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: yarn --frozen-lockfile
+
       - name: build
         run: |
-          yarn --frozen-lockfile
           yarn build
+      - name: tar dist
+        run: |
+          tar -zcf dist.tar.gz --exclude='*.map' dist
 
       - name: artifact
         uses: actions/upload-artifact@v2
         with:
           name: ${{runner.OS}}-artifact
           path: |
-            dist
-            !*.map
+            dist.tar.gz
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
diff --git a/1.sh b/1.sh
@@ -0,0 +1,19 @@
+cd D:/liuyuqi/github/git/gogs1s/
+
+cp	--path	vscode-web-gogs1s/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts              bak
+cp	--path	vscode-web-gogs1s/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts               bak
+cp	--path	vscode-web-gogs1s/src/vs/workbench/contrib/files/browser/views/explorerView.ts               bak
+cp	--path	vscode-web-gogs1s/src/vs/workbench/browser/workbench.contribution.ts                         bak
+cp	--path	vscode-web-gogs1s/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts           bak
+cp	--path	vscode-web-gogs1s/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts                    bak
+cp	--path	vscode-web-gogs1s/src/vs/workbench/services/themes/common/themeConfiguration.ts              bak
+cp	--path	vscode-web-gogs1s/src/vs/code/browser/workbench/workbench.ts                                 bak
+cp	--path	vscode-web-gogs1s/src/vs/workbench/contrib/url/browser/trustedDomains.ts                     bak
+cp	--path	vscode-web-gogs1s/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css              bak
+cp	--path	vscode-web-gogs1s/src/vs/workbench/contrib/welcome/page/browser/welcomePage.contribution.ts  bak
+cp	--path	vscode-web-gogs1s/src/vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page.ts      bak
+cp	--path	vscode-web-gogs1s/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css       bak
+cp	--path	vscode-web-gogs1s/src/vs/platform/product/common/product.ts                                  bak
+cp	--path	vscode-web-gogs1s/src/vs/gogs1s/notification.ts                                              bak
+cp	--path	vscode-web-gogs1s/src/vs/gogs1s/notification.css                                             bak
+cp	--path	vscode-web-gogs1s/src/vs/gogs1s/util.ts                                                      bak
diff --git a/deploy/gogs/custom/conf/app.ini b/deploy/gogs/custom/conf/app.ini
@@ -0,0 +1,3 @@
+
+[http]
+ACCESS_CONTROL_ALLOW_ORIGIN = *
diff --git a/extensions/gogs1s/package.json b/extensions/gogs1s/package.json
@@ -16,6 +16,7 @@
     "onCommand:gogs1s.get-current-authority",
     "onCommand:gogs1s.switch-branch",
     "onCommand:gogs1s.switch-tag",
+    "onCommand:gogs1s.checkout-ref",
     "onView:gogs1s"
   ],
   "browser": "./dist/extension",
@@ -66,6 +67,74 @@
         "command": "gogs1s.switch-tag",
         "title": "Switch to Another Tag",
         "category": "gogs1s"
+      },
+      {
+        "command": "gogs1s.checkout-ref",
+        "title": "Checkout to...",
+        "category": "gogs1s"
+      }
+    ],
+    "configuration": [
+      {
+        "title": "Gogs1s Configuration",
+        "type": "Object",
+        "properties": {
+          "update.mode": {
+            "type": "string",
+            "default": "none",
+            "description": "是否检测更新"
+          },
+          "update.showReleaseNotes": {
+            "type": "boolean",
+            "default": false,
+            "description": "是否显示更新信息"
+          },
+          "editor.fontSize": {
+            "type": "int",
+            "default": 13,
+            "description": "字体大小"
+          },
+          "editor.fontFamily": {
+            "type": "string",
+            "default": "Monaco, 'Courier New', monospace",
+            "description": "是否显示更新信息"
+          },
+          "workbench.editor.enablePreview": {
+            "type": "boolean",
+            "default": false,
+            "description": "是否显示更新信息"
+          },
+          "workbench.tree.indent": {
+            "type": "int",
+            "default": 15,
+            "description": "目录树间隔大小"
+          },
+          "window.restoreFullscreen": {
+            "type": "boolean",
+            "default": true,
+            "description": "是否恢复全屏"
+          },
+          "window.menuBarVisibility": {
+            "type": "boolean",
+            "default": "compact",
+            "description": "兼容模式"
+          },
+          "zenMode.centerLayout": {
+            "type": "boolean",
+            "default": false,
+            "description": "zenMode是否居中对齐"
+          },
+          "zenMode.hideLineNumbers": {
+            "type": "boolean",
+            "default": true,
+            "description": "是否显示行号"
+          },
+          "zenMode.restore": {
+            "type": "boolean",
+            "default": true,
+            "description": "zenMode恢复全屏"
+          }
+        }
       }
     ]
   },
@@ -77,7 +146,8 @@
   },
   "keywords": [
     "gogs",
-    "gogs1s"],
+    "gogs1s"
+  ],
   "author": "",
   "license": "ISC",
   "dependencies": {
@@ -95,4 +165,4 @@
     "typescript": "^4.1.3",
     "webpack": "^4.46.0"
   }
-}
+}
diff --git a/extensions/gogs1s/src/api.ts b/extensions/gogs1s/src/api.ts
@@ -43,8 +43,15 @@
 	 throw vscode.FileSystemError.Unavailable(error.message || 'Unknown Error Occurred When Request To GitHub');
  };
  //目录和文件同一个接口，目录返回list，接口返回object
- export const readGitHubDirectory = (owner: string, repo: string, ref: string, path: string) => {
-	 return fetch(`https://git.yoqi.me/api/v1/repos/${owner}/${repo}/git/trees/${ref}`).catch(handleRequestError);
+export const readGitHubDirectory = (owner: string, repo: string, ref: string, path: string) => {
+	let url = "";
+	if (path == null || path == "/") {
+		url = `https://git.yoqi.me/api/v1/repos/${owner}/${repo}/contents?ref=${ref}`;
+	} else {
+		url = `https://git.yoqi.me/api/v1/repos/${owner}/${repo}/contents/${path}?ref=${ref}`;
+	}
+	return fetch(url).catch(handleRequestError);
+	//  return fetch(`https://git.yoqi.me/api/v1/repos/${owner}/${repo}/git/trees/${ref}`).catch(handleRequestError);
  };
 
  export const readGitHubFile = (owner: string, repo: string, ref: string, path: string) => {
@@ -80,9 +87,9 @@
  };
  // 暂时没有tags接口
  export const getGithubTags = (owner: string, repo: string) => {
-	 return fetch(`https://git.yoqi.me/api/v1/repos/${owner}/${repo}/tags`)
-		 .then(tags => {
-			 return tags;
+	 return fetch(`https://git.yoqi.me/api/v1/repos/${owner}/${repo}/releases`)
+		 .then(releases => {
+			 return releases;
 		 })
 		 .catch(handleRequestError);
  };
@@ -92,10 +99,4 @@
 		 .catch(handleRequestError);
  };
 
- // export const getGitHubBranches = (owner: string, repo: string) => {
- // 	if (isGraphQLEnabled()) {
- // 		return getBranches(owner, repo);
- // 	}
- // 	return getGithubBranches(owner, repo);
- // };
 
diff --git a/extensions/gogs1s/src/commands.ts b/extensions/gogs1s/src/commands.ts
@@ -6,6 +6,7 @@
 import * as vscode from 'vscode';
 import { getExtensionContext, getRepositoryBranches, getRepositoryTags, getCurrentRef, getCurrentAuthority, changeCurrentRef } from './util';
 import { validateToken } from './api';
+import { updateCheckoutRefOnStatusBar } from './source-control/status-bar';
 
 export const commandValidateToken = (silent: boolean = false) => {
 	const context = getExtensionContext();
@@ -77,3 +78,37 @@ export const commandSwitchTag = () => {
 		})
 	));
 };
+// 切换 ref 命令，代替切换 branch 和 tags
+export const commandCheckoutRef = async () => {
+	const [branchRefs, tagRefs] = await Promise.all([
+		getRepositoryBranches(),
+		getRepositoryTags(),
+	]);
+	const branchPickerItems: vscode.QuickPickItem[] = branchRefs.map(
+		(branchRef) => ({
+			label: branchRef.name,
+			description: (branchRef.commit?.id || '').slice(0, 8),
+		})
+	);
+	const tagPickerItems: vscode.QuickPickItem[] = tagRefs.map((tagRef) => ({
+		label: tagRef.tag_name,
+		description: `Tag at ${(tagRef.body)}`,
+	}));
+
+	const quickPick = vscode.window.createQuickPick();
+	const ref = await getCurrentRef();
+	quickPick.placeholder = ref;
+	quickPick.items = [...branchPickerItems, ...tagPickerItems];
+
+	quickPick.show();
+	const choice = await new Promise<vscode.QuickPickItem | undefined>(
+		(resolve) => quickPick.onDidAccept(() => resolve(quickPick.activeItems[0]))
+	);
+	quickPick.hide();
+
+	let newRef = choice?.label || quickPick.value;
+	return newRef && changeCurrentRef(newRef).then((newRef) => {
+		vscode.window.showInformationMessage(`Checkout to: ${newRef}`);
+		updateCheckoutRefOnStatusBar();
+	});
+};
diff --git a/extensions/gogs1s/src/extension.ts b/extensions/gogs1s/src/extension.ts
@@ -7,7 +7,8 @@ import * as vscode from 'vscode';
 import { Gogs1sFS } from './gogs1sfs';
 import { SettingsView } from './settings-view';
 import { setExtensionContext } from './util';
-import { commandUpdateToken, commandValidateToken, commandClearToken, commandSwitchBranch, commandSwitchTag, commandGetCurrentAuthority } from './commands';
+import { commandUpdateToken, commandValidateToken, commandClearToken, commandSwitchBranch, commandSwitchTag, commandCheckoutRef, commandGetCurrentAuthority } from './commands';
+import { activateSourceControl } from './source-control';
 
 export function activate(context: vscode.ExtensionContext) {
 	setExtensionContext(context);
@@ -21,4 +22,7 @@ export function activate(context: vscode.ExtensionContext) {
 	context.subscriptions.push(vscode.commands.registerCommand('gogs1s.get-current-authority', commandGetCurrentAuthority));
 	context.subscriptions.push(vscode.commands.registerCommand('gogs1s.switch-branch', commandSwitchBranch));
 	context.subscriptions.push(vscode.commands.registerCommand('gogs1s.switch-tag', commandSwitchTag));
+	context.subscriptions.push(vscode.commands.registerCommand('gogs1s.checkout-ref', commandCheckoutRef));
+	// activate SourceControl features,
+	activateSourceControl();
 }