0.3.6

Author: code4bones

README.md

@@ -17,6 +17,14 @@ Install from vscode marketplace [SharedLock](https://marketplace.visualstudio.co
 ![Demo](./resources/images/demo.gif)
 
 
+## Screens 
+
+![Release](./resources/images/sharedlock_exp.gif)
+
+![Release](./resources/images/release.gif)
+
+![Release](./resources/images/folderlock.gif)
+
 ## How it works
 
     For preventing merge confilicts while editing same file, developer can lock the file, so other team members

package-lock.json

@@ -2,7 +2,7 @@
 	"name": "sharedlock",
 	"displayName": "SharedLock",
 	"description": "Sharing file locks in workspace files via network",
-	"version": "0.3.2",
+	"version": "0.3.6",
 	"publisher": "code4bones",
 	"icon": "resources/icons/logo.png",
 	"repository": {
@@ -36,12 +36,12 @@
 		"menus": {
 			"editor/title/context": [
 				{
-					"when": "sharedlock.state == 'locked' && sharedlock.isOwner",
+					"when": "sharedlock.state == 'locked' && sharedlock.isOwner && sharedlock.hasGit",
 					"command": "sharedlock.unlock",
 					"group": "sharedlock"
 				},
 				{
-					"when": "sharedlock.state != 'locked'",
+					"when": "sharedlock.state != 'locked' && sharedlock.hasGit",
 					"command": "sharedlock.lock",
 					"group": "sharedlock"
 				}
@@ -50,19 +50,19 @@
 				{
 					"command": "sharedlock.wipeLocked",
 					"group": "navigation@0",
-					"when": "view == sharedlock.locksView"
+					"when": "view == sharedlock.locksView && sharedlock.hasGit"
 				}
 			],
 			"explorer/context": [
 				{
 					"command": "sharedlock.lockFolder",
-					"group": "navigation@0",
-					"when": "explorerResourceIsFolder"
+					"group": "1_modification",
+					"when": "explorerResourceIsFolder && sharedlock.hasGit"
 				}
 			],
 			"view/item/context": [
 				{
-					"when": "viewItem == owned",
+					"when": "viewItem == owned && sharedlock.hasGit",
 					"command": "sharedlock.ctxUnlock",
 					"group": "sharedlock"
 				}
@@ -71,8 +71,7 @@
 		"commands": [
 			{
 				"command": "sharedlock.lockFolder",
-				"title": "Lock Folder Contents",
-				"category": ""
+				"title": "Lock Folder Contents"
 			},
 			{
 				"command": "sharedlock.toggleLock",
@@ -109,7 +108,8 @@
 				{
 					"id": "sharedlock.locksView",
 					"name": "SharedLocks",
-					"type": "tree"
+					"type": "tree",
+					"when": "sharedlock.hasGit"
 				}
 			]
 		},
@@ -194,6 +194,7 @@
 	"devDependencies": {
 		"@eslint/js": "^9.13.0",
 		"@stylistic/eslint-plugin": "^2.9.0",
+		"@types/micromatch": "^4.0.9",
 		"@types/node": "^20",
 		"@types/vscode": "^1.73.0",
 		"esbuild": "^0.24.0",
@@ -209,6 +210,7 @@
 	"dependencies": {
 		"glob": "^11.0.0",
 		"ioredis": "^5.4.1",
+		"micromatch": "^4.0.8",
 		"vscode-ext-codicons": "^1.6.0"
 	}
 }

package.json

@@ -5,12 +5,13 @@ import { LockMessage } from "./types";
 import * as path from "path";
 import * as fs from "fs";
 import {glob} from "glob";
+import * as mm from "micromatch";
 
 export function registerCommands(ctx:vscode.ExtensionContext)  {
     const ctrl = new Controller(ctx);
     ctx.subscriptions.push(ctrl);
 
-    function indicatorAction () {
+    function toggleLock () {
         ctrl.toggleLock();
     }
 
@@ -32,63 +33,62 @@ export function registerCommands(ctx:vscode.ExtensionContext)  {
 
     function ctxOpen(msg:LockMessage) {
       vscode.workspace.workspaceFolders?.forEach((ws)=>{
-        const [,fileName] = msg.file.split(":");
-        const file = path.join(ws.uri.fsPath,fileName);
-        console.log("Try open",file);
-        if ( fs.existsSync(file) ) {
-          vscode.window.showTextDocument(vscode.Uri.parse(file));
-          return;
-        }
+        const [ns,fileName] = msg.file.split(":");
+        const mask = path.join(ws.uri.path,'**',ns,"**",fileName); 
+        glob(mask)
+        .then((files)=>{
+          if ( files?.length ) {
+            const [file] = files;
+            vscode.window.showTextDocument(vscode.Uri.parse(file));
+          } else {
+            vscode.window.showErrorMessage(`Cannot open document,using ${mask}`);
+          }
+        });
       });
     }
 
     function ctxLockFolder (startDir:vscode.Uri) {
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const lockTree = (uri:vscode.Uri,ign?:string[]) => {
-        vscode.workspace.fs.readDirectory(uri)
-        .then((dirs)=>{
-            dirs.forEach(([file,type])=>{
-              const lock = vscode.Uri.parse(path.join(uri.path,file));
-              if ( type === vscode.FileType.Directory ) {
-                  if ( ign ) { 
-                    lockTree(lock,ign);
-                  }
-              } else {
-                console.log("Loking",lock.path);
-              }
-            });
-        });
-      };
 
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       const getFiles = (ignore:string[]) => {
-        glob(path.join(startDir.path,'**/*'),{ignore,dot:true})
+        return glob(path.join(startDir.path,'**/*'),{ignore,dot:true})
         .then((files)=>{
-          console.log("Files",files);
+          return mm(files,"**/*.*",{ignore});
         });
       };
 
+      const getIgnores = async () => {
+          const root = vscode.workspace.getWorkspaceFolder(startDir);
+          const mask = path.join(root!.uri.path,"**",".gitignore");
+          return glob(mask)
+          .then((files)=>{
+            return files.map((gitIgnore)=>{
+              const content = fs.readFileSync(gitIgnore).toString("utf8");
+              return content.split("\n").map((line) => line.trim())
+                     .filter(line => line.length > 0 && !line.startsWith("#"));
+            });
+          }).then((igns)=>{
+              const uniq = new Set();
+              igns.forEach((file) => file.map(f => uniq.add(  `*/**/${f}`)));
+              return Array.from(uniq.keys()) as string[];
+          });
+      };
 
-      const root = vscode.workspace.getWorkspaceFolder(startDir);
-      const gitIgnore = path.join(root!.uri.path,".gitignore");
-      if ( fs.existsSync(gitIgnore) ) {
-        const content = fs.readFileSync(gitIgnore).toString("utf8");
-        const ignores = content.split("\n").map((line) => line.trim()).filter(line => line.length > 0 && !line.startsWith("#"));
-        console.log("IGN",ignores.map((f) => path.join("**",f)));
-        // getFiles(ignores);
-        // lockTree(startDir,ignores);
-      } else {
-          vscode.window.showInformationMessage("Where are no .gitignore file, only upper level will be processed...");
-          // lockTree(startDir);
-      }
-      // console.log("FILE",gitIgnore);
-      // lockTree(startDir);
-      // vscode.Uri.parse(path.join(uri.path,file)
-      //lockTree(startDir);
+      getIgnores()
+      .then((ignores)=>{
+        console.log("IGNO",ignores);
+        getFiles(ignores)
+        .then((locks)=>{
+          ctrl.storage.lockGroup(locks);
+        });
+      });
     }
 
 
-    ctx.subscriptions.push(vscode.commands.registerCommand(C.statusBarAction,indicatorAction));
+    /*
+      Status bar toggler
+    */
+    ctx.subscriptions.push(vscode.commands.registerCommand(C.statusBarAction,toggleLock));
 
     /*
       Reflects other side locks
@@ -102,9 +102,13 @@ export function registerCommands(ctx:vscode.ExtensionContext)  {
     ctx.subscriptions.push(vscode.commands.registerCommand(C.LockCommands.unlock,() => updateLock(C.LockState.Unlocked)));
     ctx.subscriptions.push(vscode.commands.registerCommand(C.LockCommands.wipeLocked,() => wipeLocked()));
     ctx.subscriptions.push(vscode.commands.registerCommand(C.LockCommands.ctxUnlock,(args) => ctxUnlock(args)));
-    ctx.subscriptions.push(vscode.commands.registerCommand(C.LockCommands.ctxOpen,(args) => ctxOpen(args)));
     ctx.subscriptions.push(vscode.commands.registerCommand(C.LockCommands.lockFolder,(args) => ctxLockFolder(args)));
 
+    /*
+       Open doc from expoloer
+    */
+    ctx.subscriptions.push(vscode.commands.registerCommand(C.LockCommands.ctxOpen,(args) => ctxOpen(args)));
+
 
     return ctrl;
 }

resources/images/folderlock.png

@@ -4,6 +4,12 @@ import { LocksView } from './locksView';
 import { createLogger } from './logger';
 
 export function activate(context: vscode.ExtensionContext) {
+
+	const folders:string[] = [];
+	vscode.workspace.workspaceFolders?.forEach((ws)=>{
+		folders.push(ws.uri.path);
+	});
+	context.globalState.update("roots",JSON.stringify(folders));
 	createLogger(context).appendLine("Starting...");
 	const ctrl = registerCommands(context);
 	new LocksView(context,ctrl);