fix: 修复当项目不是git 项目的时候运行时的预期之外报错

Author: emjio

src/Scheduler.ts

@@ -2,7 +2,7 @@ import { exec } from 'child_process';
 // your extension is activated the very first time the command is executed
 let timer: NodeJS.Timeout;
 import * as vscode from 'vscode';
-import { getNow } from './utils'
+import { getNow,throwErrorType } from './utils'
 import {ReminderView} from './TextView'
 export default class Scheduler {
     $option: Option
@@ -21,6 +21,21 @@ export default class Scheduler {
                 clearTimeout(timer)
             }, this.$option.commitTimeInterval)
     }
+    private  _getDiff(path:string){
+        let cmd = `cd ${path}`;
+        return new Promise((resolve) => {
+            cmd = cmd + ' && git diff'
+            let res = ''
+            exec(cmd, (err, stdout) => {
+                if (err) {
+                    res = err.message;
+                } else {
+                    res = stdout
+                }
+                resolve(res);
+            })
+        })
+    }
     private _getUnCommitChange(path: string) {
         let cmd = `cd ${path}`;
         return new Promise((resolve) => {
@@ -42,13 +57,14 @@ export default class Scheduler {
     }
     run() {
         if (this.$option.path) {
-                const cmd = `cd ${this.$option.path} && git add . && git commit -n -m "自动提交" `;
+                const cmd = `cd ${this.$option.path} && git add . && git commit -n -m "auto-commit" `;
                 exec(cmd, (err, stdout) => {
                     if (err) {
+                        const errorType = throwErrorType(err.message)
                         ReminderView.show(this.$option.context,err.message)
                     } else {
                         this._getUnCommitChange(this.$option.path as string).then(res => {
-                            ReminderView.show(this.$option.context,`${getNow()} 自动提交成功 ${stdout} ${res}`,)
+                            ReminderView.show(this.$option.context,`${getNow()} auto-commit success ${stdout} ${res}`,)
                         })
                     }
                 })

src/TextView.ts

@@ -28,6 +28,9 @@ export class ReminderView {
             <meta charset="UTF-8">
             <meta name="viewport" content="width=device-width, initial-scale=1.0">
             <style>
+            .block{
+                
+            }
             .code{
                 margin: 0;
                 padding: 0;

src/extension.ts

@@ -3,23 +3,24 @@
 import * as vscode from 'vscode';
 // this method is called when your extension is activated
 import Scheduler from './Scheduler'
-import { getConfig } from './utils'
+import { checkPathSafe, getConfig } from './utils'
 let instance:Scheduler
 
-export function activate(context: vscode.ExtensionContext) {
+export async function activate(context: vscode.ExtensionContext) {
 	let config:Option = {
 		commitTimeInterval:getConfig<number>('commitTimeInterval')|| 0,
 		autoPush:getConfig<boolean>('autoPush') || false,
 		context
 	}
-	if(!vscode.workspace.workspaceFolders){
-		vscode.window.showErrorMessage('当前目录不合法');
+	let checkPathRes = await checkPathSafe(vscode.workspace.workspaceFolders)
+	if(checkPathRes){
+		vscode.window.showErrorMessage(checkPathRes);
 		return
 	}else{
-		config.path = vscode.workspace.workspaceFolders[0].uri.fsPath
+		config.path = vscode.workspace.workspaceFolders?.[0].uri.fsPath
 		instance = new Scheduler({...config,context})
 		vscode.window.showInformationMessage('git-auto-commit成功启用');
-		vscode.workspace.onDidSaveTextDocument((e)=>{instance.changeListener(e)})
+		vscode.workspace.onDidSaveTextDocument((e)=> instance.changeListener(e))
 	}
 	let disposable = vscode.commands.registerCommand('code-auto-commit.runCommit', () => {
 

src/utils.ts

@@ -1,5 +1,8 @@
+import path = require('path');
 import * as vscode from 'vscode';
-
+const fs  = require('fs');
+import { exec } from 'child_process';
+import { rejects } from 'assert';
 export function getNow() {
 	let dateTime
 	let yy = new Date().getFullYear()
@@ -18,3 +21,70 @@ export function getNow() {
 export function getConfig<T = any>(key: string) {
 	return vscode.workspace.getConfiguration().get<T>(`code-auto-commit.${key}`);
 }
+
+const errorType: {
+    [propName: string]: string;
+}
+    = {
+    notRepository: "fatal: not a git repository (or any of the parent directories): .git",
+}
+
+export const checkIsRepository =  async(path:string)=>{
+	const cmd = `cd ${path} && git log`
+	let res:boolean;
+	try{
+const msg	=  await runCommand(cmd)
+	res = true
+	}catch(e){
+		console.log(e)
+		res = false
+	}
+	return res
+}	
+
+export const throwErrorType = function (errMsg: string) {
+    for (let key in errorType) {
+        if (errMsg.includes(errorType[key])) {
+            return key
+        }
+    }
+	return errMsg
+}
+export const checkPathSafe = async (path?:readonly vscode.WorkspaceFolder[])=>{
+	if(!path){
+		return '不是合法目录'
+	}
+	let isRepository = await checkIsRepository(path[0].uri.fsPath)
+	if(!isRepository){
+		return '不是一个git管理项目'
+	}
+	return null
+}
+export const runCommand = (cmd:string)=>{
+	return new Promise((resolve,reject) => {
+		cmd = cmd + ' && git diff'
+	let res = ''
+	exec(cmd, (err, stdout) => {
+		if (err) {
+			reject(err.message);
+		} else {
+			resolve(stdout)
+		}
+	})
+})
+}
+/**
+ * 从某个HTML文件读取能被Webview加载的HTML内容
+ * @param {string} context 上下文
+ * @param {string} templatePath 相对于插件根目录的html文件相对路径
+ */
+ function getWebViewContent(context:vscode.ExtensionContext, templatePath:string) {
+    const resourcePath = path.join(context.extensionPath, templatePath);
+    const dirPath = path.dirname(resourcePath);
+    let html:string = fs.readFileSync(resourcePath, 'utf-8');
+    // vscode不支持直接加载本地资源，需要替换成其专有路径格式，这里只是简单的将样式和JS的路径替换
+    html = html.replace(/(<link.+?href="|<script.+?src="|<img.+?src=")(.+?)"/g, (m:string, $1:string, $2:string) => {
+        return $1 + vscode.Uri.file(path.resolve(dirPath, $2)).with({ scheme: 'vscode-resource' }).toString() + '"';
+    });
+    return html;
+}