1.1.0

.eslintignore

@@ -0,0 +1 @@
+node_modules

.eslintrc.json

@@ -0,0 +1,33 @@
+{"parserOptions":
+	{"ecmaVersion": 6},
+	"rules": {
+		"quotes": [2, "single", {"allowTemplateLiterals": true}],
+		"curly": [2, "all"],
+		"keyword-spacing": [2, {"overrides": {"else": {"before": true}, "catch": {"before": true, "after": false}}}],
+		"space-before-blocks": [2, "always"],
+		"wrap-iife": [2, "inside"],
+		"space-before-function-paren": [2, "never"],
+		"one-var": [2, "never"],
+		"vars-on-top": 0, "no-empty": [2, {"allowEmptyCatch": true}],
+		"array-bracket-spacing": [2, "never"],
+		"space-in-parens": [2, "never"],
+		"no-underscore-dangle": 0,
+		"comma-style": [2, "last"],
+		"comma-spacing": [2, {"before": false, "after": true}],
+		"space-unary-ops": [2, {"words": false, "nonwords": false}],
+		"no-multi-spaces": 2,
+		"space-infix-ops": 2,
+		"no-with": 2,
+		"indent": [2, "tab", {"SwitchCase": 1, "FunctionExpression": {"body": 1, "parameters": 1}, "MemberExpression": 0}],
+		"no-mixed-spaces-and-tabs": 2,
+		"no-trailing-spaces": 2,
+		"comma-dangle": [2, "never"],
+		"semi": [2, "always"],
+		"brace-style": [2, "1tbs", {"allowSingleLine": true}],
+		"eol-last": 2,
+		"dot-notation": 0,
+		"no-multi-str": 2,
+		"key-spacing": [2, {"afterColon": true}],
+		"func-call-spacing": [2, "never"]
+	}
+}

.gitignore

@@ -1,3 +1,2 @@
-node_modules
-app/node_modules
 dist
+node_modules

.jscsrc

@@ -1,78 +0,0 @@
-{
-    "requireCurlyBraces": [
-        "if",
-        "else",
-        "for",
-        "while",
-        "do",
-        "try",
-        "catch"
-    ],
-    "requireSpaceAfterKeywords": [
-        "if",
-        "else",
-        "for",
-        "while",
-        "do",
-        "switch",
-        "case",
-        "return",
-        "try"
-    ],
-    "requireSpaceBeforeKeywords": [
-        "else",
-        "catch"
-    ],
-    "disallowSpaceAfterKeywords": [
-        "catch"
-    ],
-    "requireSpaceBeforeBlockStatements": true,
-    "requireParenthesesAroundIIFE": true,
-    "requireSpacesInConditionalExpression": true,
-    "disallowSpacesInNamedFunctionExpression": {
-        "beforeOpeningRoundBrace": true
-    },
-    "disallowSpacesInFunctionDeclaration": {
-        "beforeOpeningRoundBrace": true
-    },
-    "disallowSpacesInFunctionExpression": {
-        "beforeOpeningRoundBrace": true
-    },
-    "requireSpaceBetweenArguments": true,
-    "disallowMultipleVarDecl": true,
-    "requireVarDeclFirst": false,
-    "requireBlocksOnNewline": false,
-    "disallowEmptyBlocks": true,
-    "disallowSpacesInsideArrayBrackets": true,
-    "disallowSpacesInsideObjectBrackets": true,
-    "disallowSpacesInsideParentheses": true,
-    "disallowDanglingUnderscores": false,
-    "requireCommaBeforeLineBreak": true,
-    "disallowSpaceAfterPrefixUnaryOperators": true,
-    "disallowSpaceBeforePostfixUnaryOperators": true,
-    "disallowSpaceBeforeBinaryOperators": [
-        ","
-    ],
-    "requireSpacesInForStatement": true,
-    "requireSpacesInAnonymousFunctionExpression": {
-        "beforeOpeningCurlyBrace": true
-    },
-    "requireSpaceBeforeBinaryOperators": true,
-    "requireSpaceAfterBinaryOperators": true,
-    "disallowKeywords": [
-        "with"
-    ],
-    "validateIndentation": "\t",
-    "disallowMixedSpacesAndTabs": true,
-    "disallowTrailingWhitespace": true,
-    "disallowTrailingComma": true,
-    "disallowKeywordsOnNewLine": [
-        "else"
-    ],
-    "requireLineFeedAtFileEnd": true,
-    "requireCapitalizedConstructors": true,
-    "requireDotNotation": false,
-    "disallowNewlineBeforeBlockStatements": true,
-    "disallowMultipleLineStrings": true,
-    "requireSpaceBeforeObjectValues": true
-}

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+	// Use IntelliSense to learn about possible attributes.
+	// Hover to view descriptions of existing attributes.
+	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Electron Main",
+			"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
+			//"program": "${workspaceFolder}/app/main.js",
+			"args": ["${workspaceFolder}/app/main.js", "C:\\Temp\\test"]
+		}
+	]
+}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+	"git.ignoreLimitWarning": true
+}

README.md

@@ -1,4 +1,4 @@
-# gitlit
+# ![gitlit](build/icon.png)
 
 gitlit is a very simple desktop app that allows you to handle [git lfs file locks](https://github.com/git-lfs/git-lfs/wiki/File-Locking).
 
@@ -18,3 +18,32 @@ gitlit /home/s2/myApp
 ```
 
 If no folder is specified, gitlit looks at the current path.
+
+## contribute
+
+The code is very easy. Just clone the repo and have look!
+Use the `.eslintrc.json` for formatting the code and keep it clean and consistent.
+
+There are just some js libraries:
+- [ejs](http://ejs.co/) is used for templating. The templates are in `app/js/templates.js`.
+- [sorttable.js](http://www.kryogenix.org/code/browser/sorttable/) to sort the table containing the files.
+- [jQuery](https://jquery.com/), because it's still cool to have it, even if everyone says it's dead and we should do without.
+- [Bootstrap](https://getbootstrap.com/) for the layout
+- [PNotify](https://github.com/sciactive/pnotify) for generic notifications
+
+### run the app
+```
+cd app
+npm install
+npm start
+```
+
+### make a release
+```
+npm install
+npm run dist
+```
+
+## license
+
+ISC

app/index.html

@@ -7,17 +7,17 @@
 
 	<script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
 
-	<script src="node_modules/jquery/dist/jquery.js"></script>
-	<script src="node_modules/bootstrap/dist/js/bootstrap.js"></script>
+	<script type="text/javascript" src="../node_modules/jquery/dist/jquery.js"></script>
+	<script type="text/javascript" src="../node_modules/bootstrap/dist/js/bootstrap.js"></script>
 
-	<script type="text/javascript" src="node_modules/pnotify/dist/iife/PNotify.js"></script>
-	<script type="text/javascript" src="node_modules/pnotify/dist/iife/PNotifyButtons.js"></script>
+	<script type="text/javascript" src="../node_modules/pnotify/dist/iife/PNotify.js"></script>
+	<script type="text/javascript" src="../node_modules/pnotify/dist/iife/PNotifyButtons.js"></script>
 
-	<script src="node_modules/ejs/ejs.js"></script>
-	<script src="js/templates.js"></script>
-	<script src="js/sorttable.js"></script>
+	<script type="text/javascript" src="../node_modules/ejs/ejs.js"></script>
+	<script type="text/javascript" src="js/templates.js"></script>
+	<script type="text/javascript" src="js/sorttable.js"></script>
 
-	<link href="node_modules/bootstrap/dist/css/bootstrap.css" rel="stylesheet">
+	<link href="../node_modules/bootstrap/dist/css/bootstrap.css" rel="stylesheet">
 	<link href="css/app.css" rel="stylesheet">
 </head>
 <body>

app/js/index.js

@@ -1,10 +1,8 @@
 (function($) {
 	const ipcRenderer = require('electron').ipcRenderer;
-	const searchInPage = require('electron-in-page-search').default;
 	const remote = require('electron').remote;
-
-	const inPageSearch = searchInPage(remote.getCurrentWebContents());
-
+	const electronFind = require('electron-find');
+	let findInPage = new electronFind.FindInPage(remote.getCurrentWebContents());
 
 	//events
 	ipcRenderer.on('fileList', (event, files) => {
@@ -45,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);
 		}
 	});
 
@@ -78,11 +78,12 @@
 	$(document).on('keypress', (ev) => {
 		//ctrl + f
 		if (ev.ctrlKey && ev.charCode == 6) {
-			if (inPageSearch && inPageSearch.opened) {
-				inPageSearch.closeSearchWindow();
-			} else {
-				inPageSearch.openSearchWindow();
-			}
+			findInPage.openFindWindow();
+		}
+
+		//ctrl + r
+		if (ev.ctrlKey && ev.keyCode == 18) {
+			window.location.reload(false);
 		}
 	});
 

app/main.js

@@ -3,16 +3,18 @@ const path = require('path');
 const url = require('url');
 const electronLocalshortcut = require('electron-localshortcut');
 const exec = require('child_process').exec;
-const args = require('minimist')(process.defaultApp ? process.argv.slice(2) : process.argv.slice(1), {
+const args = require('minimist')(process.defaultApp ? process.argv.slice(3) : process.argv.slice(1), {
 	default: {
 		_: process.cwd()
 	}
 });
 
 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
 	},
 	(error, stdout, stderr) => {
@@ -25,9 +27,13 @@ function getLfsFileList(dir, cb) {
 		if (stdout) {
 			let files = stdout.split('\n');
 			files.forEach((file) => {
-				file = file.split(' * ');
-				if (file[1]) {
-					parsedFiles.push(file[1].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()));
+					}
 				}
 			});
 
@@ -40,6 +46,7 @@ function getLfsFileList(dir, cb) {
 
 function getLfsLocks(dir, cb) {
 	exec('git lfs locks', {
+		maxBuffer: 1024 * 1024,
 		cwd: dir
 	},
 	(error, stdout, stderr) => {
@@ -53,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({
@@ -91,7 +98,7 @@ function createWindow() {
 		pathname: path.join(__dirname, 'index.html'),
 		protocol: 'file:',
 		slashes: true
-	}))
+	}));
 
 	electronLocalshortcut.register(win, 'F12', () => {
 		win.webContents.toggleDevTools();
@@ -115,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);
@@ -134,11 +142,12 @@ function createWindow() {
 
 ipcMain.on('unlock', (event, file) => {
 	exec('git lfs unlock "' + file + '"', {
+		maxBuffer: 1024 * 1024,
 		cwd: repoDir
 	},
 	(error, stdout, stderr) => {
 		let notification = {
-			message:  (error && error.message) || stderr,
+			message: (error && error.message) || stderr,
 			type: 'error'
 		};
 
@@ -156,11 +165,12 @@ ipcMain.on('unlock', (event, file) => {
 
 ipcMain.on('lock', (event, file) => {
 	exec('git lfs lock --json "' + file + '"', {
+		maxBuffer: 1024 * 1024,
 		cwd: repoDir
 	},
 	(error, stdout, stderr) => {
 		let notification = {
-			message:  (error && error.message) || stderr,
+			message: (error && error.message) || stderr,
 			type: 'error'
 		};
 
@@ -177,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.json

@@ -1,28 +0,0 @@
-{
-  "name": "gitlit-app",
-  "version": "1.0.0",
-  "description": "",
-  "main": "main.js",
-  "dependencies": {
-    "bootstrap": "^4.1.1",
-    "ejs": "^2.6.1",
-    "electron-in-page-search": "^1.3.2",
-    "electron-localshortcut": "^3.1.0",
-    "jquery": "^3.3.1",
-    "minimist": "^1.2.0",
-    "pnotify": "^4.0.0-alpha.4",
-    "popper.js": "^1.14.3"
-  },
-  "devDependencies": {
-    "electron": "^2.0.1"
-  },
-  "scripts": {
-    "start": "electron ."
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://git.e.tern.al/s2/gitlit"
-  },
-  "author": "",
-  "license": "ISC"
-}

makedist.sh

@@ -1,15 +0,0 @@
-#/bin/bash
-rm -rf dist
-mkdir dist
-node_modules/.bin/electron-packager ./app/ gitlit --all --out dist/
-
-cd dist
-
-for d in *; do
-  if [[ -d "$d" ]]; then
-    tar czf "$d.tgz" "$d"
-    rm -rf "$d"
-  fi
-done
-
-cd ..

package.json

@@ -1,18 +1,57 @@
 {
   "name": "gitlit",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "",
   "main": "app/main.js",
+  "build": {
+    "appId": "s2.gitlit",
+    "linux": {
+      "target": [
+        {
+          "target": "tar.gz",
+          "arch": [
+            "x64"
+          ]
+        }
+      ]
+    },
+    "win": {
+      "target": [
+        {
+          "target": "zip",
+          "arch": [
+            "x64"
+          ]
+        }
+      ]
+    }
+  },
+  "dependencies": {
+    "animate.css": "^3.5.2",
+    "bootstrap": "^4.1.3",
+    "ejs": "^2.6.1",
+    "electron-find": "^1.0.6",
+    "electron-localshortcut": "^3.1.0",
+    "jquery": "^3.3.1",
+    "material-design-icons": "^3.0.1",
+    "minimist": "^1.2.0",
+    "nonblockjs": "^1.0.8",
+    "pnotify": "^4.0.0-alpha.4",
+    "popper.js": "^1.14.3"
+  },
+  "devDependencies": {
+    "electron": "^3.0.3",
+    "electron-builder": "^20.43.0"
+  },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "start": "electron .",
+    "pack": "electron-builder --linux --win --dir",
+    "dist": "electron-builder --linux --win"
   },
   "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.1.0"
-  }
+  "author": "s2",
+  "license": "ISC"
 }