1.0.9

app/js/index.js

@@ -43,16 +43,18 @@
 		}
 
 		if (notification.event && notification.event === 'unlock') {
-			$('[data-file="' + notification.file + '"].js-unlock').hide();
-			$('[data-file="' + notification.file + '"].js-lock').show();
+			let file = notification.file.replace(/\\/g, '\\\\');
+			$('[data-file="' + file + '"].js-unlock').hide();
+			$('[data-file="' + file + '"].js-lock').show();
 			let text = 'not locked';
-			$('[data-file="' + notification.file + '"]').parent().prev().text(text);
+			$('[data-file="' + file + '"]').parent().prev().text(text);
 		}
 		if (notification.event && notification.event === 'lock') {
-			$('[data-file="' + notification.file + '"].js-lock').hide();
-			$('[data-file="' + notification.file + '"].js-unlock').show();
+			let file = notification.file.replace(/\\/g, '\\\\');
+			$('[data-file="' + file + '"].js-lock').hide();
+			$('[data-file="' + file + '"].js-unlock').show();
 			let text = notification.data.owner.name + ' (id: ' + notification.data.id + ')';
-			$('[data-file="' + notification.file + '"]').parent().prev().text(text);
+			$('[data-file="' + file + '"]').parent().prev().text(text);
 		}
 	});
 

app/main.js

@@ -10,9 +10,10 @@ const args = require('minimist')(process.defaultApp ? process.argv.slice(3) : pr
 });
 
 const repoDir = path.resolve(path.normalize(args._.join(' ')));
+let repoRootDir = repoDir;
 
 function getLfsFileList(dir, cb) {
-	exec('git lfs ls-files', {
+	exec('git ls-files | git check-attr --stdin lockable', {
 		maxBuffer: 1024 * 1024,
 		cwd: dir
 	},
@@ -26,11 +27,12 @@ function getLfsFileList(dir, cb) {
 		if (stdout) {
 			let files = stdout.split('\n');
 			files.forEach((file) => {
-				let pos = file.search(/ \* | \- /);
-				if (pos) {
-					file = file.substring(pos + 3);
-					if (file) {
-						parsedFiles.push(file.trim());
+				let pos = file.split(': lockable: ');
+				if (pos && pos.length === 2) {
+					file = pos[0];
+					status = pos[1];
+					if (file && status === 'set') {
+						parsedFiles.push(path.normalize(file.trim()));
 					}
 				}
 			});
@@ -58,7 +60,7 @@ function getLfsLocks(dir, cb) {
 			let files = stdout.split('\n');
 			files.forEach((file) => {
 				if (file) {
-					let fileName = file.split('\t')[0].trim();
+					let fileName = path.normalize(file.split('\t')[0].trim());
 					let lockedBy = file.split('\t')[1].trim();
 					let id = file.split('ID:')[1].trim();
 					parsedFiles.push({
@@ -120,12 +122,13 @@ function createWindow() {
 					return;
 				}
 				let allFiles = [];
+				let repoDirWithoutRoot = repoDir === repoRootDir ? '' : repoDir.replace(path.normalize(repoRootDir + '/'), '');
 
 				files.forEach((file) => {
 					const t = {
 						file: file,
-						lockedBy: getArrayObjectByKey(lockedFiles, 'file', file, 'lockedBy'),
-						id: getArrayObjectByKey(lockedFiles, 'file', file, 'id')
+						lockedBy: getArrayObjectByKey(lockedFiles, 'file', path.normalize(repoDirWithoutRoot ? repoDirWithoutRoot + '/' + file : file), 'lockedBy'),
+						id: getArrayObjectByKey(lockedFiles, 'file', path.normalize(repoDirWithoutRoot ? repoDirWithoutRoot + '/' + file : file), 'id')
 					};
 
 					allFiles.push(t);
@@ -184,7 +187,23 @@ ipcMain.on('lock', (event, file) => {
 	});
 });
 
-app.on('ready', createWindow);
+app.on('ready', () => {
+	exec('git rev-parse --show-toplevel', {
+		maxBuffer: 1024 * 1024,
+		cwd: repoDir
+	},
+	(error, stdout, stderr) => {
+		if (error) {
+			console.error(error);
+		}
+
+		if (stdout) {
+			repoRootDir = path.normalize(stdout.replace(/\n/g, ''));
+		}
+
+		createWindow();
+	});
+});
 
 app.on('window-all-closed', function() {
 	if (process.platform != 'darwin') {

app/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "gitlit-app",
-  "version": "1.0.5",
+  "version": "1.0.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitlit-app",
-  "version": "1.0.5",
+  "version": "1.0.9",
   "description": "",
   "main": "main.js",
   "dependencies": {
@@ -25,7 +25,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://git.e.tern.al/s2/gitlit"
+    "url": "https://github.com/S2-/gitlit"
   },
   "author": "",
   "license": "ISC"

package.json

@@ -8,11 +8,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "ssh://git@git.e.tern.al:22022/s2/gitlit.git"
+    "url": "https://github.com/S2-/gitlit"
   },
   "author": "",
   "license": "ISC",
   "devDependencies": {
     "electron-packager": "^12.2.0"
-  }
+  },
+  "keywords": ["git", "lfs", "locking", "git-locks"]
 }