1
0
mirror of https://github.com/S2-/gitlit synced 2025-08-02 20:30:05 +02:00

40 Commits

Author SHA1 Message Date
s2
48b5f33eb9 2.0.1 2020-06-07 20:04:45 +02:00
s2
64b500f414 update node modules 2020-06-07 20:04:45 +02:00
s2
caeaab14b8 remove console.log 2020-06-07 19:50:00 +02:00
s2
94e7c5ce71 don't publish by default in electron builder 2020-06-07 19:48:06 +02:00
s2
cdafb7a006 2.0.0 2020-06-07 19:38:18 +02:00
s2
6c2bc3397e auto update app 2020-06-07 19:37:56 +02:00
s2
a6666452d7 remove update-electron-app 2020-06-07 17:48:58 +02:00
s2
e9feebce51 1.5.2 2020-05-09 15:48:10 +02:00
s2
510e4786b7 create installer package 2020-05-09 15:45:01 +02:00
s2
b540eae1b9 1.5.1 2020-05-09 12:22:28 +02:00
s2
8f3705ba74 show gitlit version in window title 2020-05-09 12:22:21 +02:00
s2
e032eb2ab0 1.5.0 2020-05-09 12:10:34 +02:00
s2
519d719545 auto updater 2020-05-09 12:10:25 +02:00
s2
f8076499ba build windows portable binary 2020-05-09 12:09:23 +02:00
s2
edeadfd7fc 1.4.4 2020-05-06 20:23:03 +02:00
s2
9c26b8fb10 bump exec maxBuffer size to 10MB 2020-05-06 20:22:47 +02:00
s2
b0f3ba27b5 1.4.3 2020-05-06 20:08:09 +02:00
s2
99c858e5a7 update npm modules 2020-05-06 20:08:04 +02:00
s2
9f02f5f27c 1.4.2 2020-03-16 21:46:57 +01:00
s2
48ecb505d7 update node modules 2020-03-16 21:46:15 +01:00
s2
a04c84abb4 1.4.1 2019-06-21 14:15:57 +02:00
s2
31c19d5534 make jumbotron nicer 2019-06-21 09:31:36 +02:00
s2
171b79e355 1.4.0 2019-06-20 15:52:56 +02:00
s2
4178caa94a show splash screen on startup if passed path is not a git repo 2019-06-20 15:51:56 +02:00
s2
7cae3f33ec 1.3.1 2019-06-20 15:15:46 +02:00
s2
3952948a15 fix sortable 2019-06-20 15:14:33 +02:00
s2
011a78a75f style fixes 2019-06-20 15:14:33 +02:00
s2
e0ad69a5b1 remove old templates 2019-06-20 15:14:33 +02:00
s2
e994b98dcc show open an other folder button if there are no tracked files 2019-06-20 10:59:46 +02:00
s2
6431183092 1.3.0 2019-06-20 10:32:04 +02:00
s2
28acea0c74 ejs.rr & open folder button 2019-06-20 10:17:28 +02:00
s2
f69e80e306 add d&d instructions to readme 2019-06-19 15:44:20 +02:00
s2
81fd51656e 1.2.0 2019-06-19 10:07:49 +02:00
s2
b54fb104be add folder drag&drop functionality 2019-06-19 10:07:39 +02:00
s2
1072c27e6d remove ide files from repo 2019-06-17 21:02:02 +02:00
s2
ead56bac77 readme fix 2019-06-17 20:54:45 +02:00
s2
4eef037145 1.1.1 2019-06-17 20:37:09 +02:00
s2
2be62645d9 change icon colors 2019-06-17 20:36:47 +02:00
s2
5abd0d6f27 logo size 2019-06-17 20:26:31 +02:00
s2
8fb44bc439 make image nicer in readme 2019-06-17 20:20:37 +02:00
19 changed files with 669 additions and 574 deletions

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
dist
node_modules
.vscode

16
.vscode/launch.json vendored
View File

@@ -1,16 +0,0 @@
{
// 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"]
}
]
}

View File

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

View File

@@ -1,4 +1,4 @@
# ![gitlit](build/icon.png)
# <img src="logo/logo.png" alt="gitlit">
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).
@@ -19,6 +19,8 @@ gitlit /home/s2/myApp
If no folder is specified, gitlit looks at the current path.
You can also drag&drop a folder inside the main window.
## contribute
The code is very easy. Just clone the repo and have look!
@@ -33,7 +35,6 @@ There are just some js libraries:
### run the app
```
cd app
npm install
npm start
```

View File

@@ -1,3 +1,12 @@
html {
margin-bottom: 10px;
}
.jumbotron {
height: 640px;
margin-bottom: 0px;
}
.js-container {
margin: 5px;
}
@@ -40,3 +49,13 @@ table.sortable thead {
table.sortable .sorttable_nosort {
cursor: default;
}
/*
* updater
*/
.updatenotice {
position: fixed;
bottom: 5px;
right: 5px;
}

View File

@@ -3,7 +3,6 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>gitlit</title>
<script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
@@ -14,15 +13,16 @@
<script type="text/javascript" src="../node_modules/pnotify/dist/iife/PNotifyButtons.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="../node_modules/ejs-render-remote/ejs-render-remote.js"></script>
<script type="text/javascript" src="js/sorttable.js"></script>
<link href="../node_modules/bootstrap/dist/css/bootstrap.css" rel="stylesheet">
<link href="css/app.css" rel="stylesheet">
</head>
<body>
<div class="js-container">
</div>
<div class="js-container"></div>
<script src="js/index.js"></script>
<div class="js-updatenotice btn btn-warning btn-sm updatenotice" style="display:none" disabled>Update ready to install</div>
</body>
</html>

View File

@@ -4,24 +4,68 @@
const electronFind = require('electron-find');
let findInPage = new electronFind.FindInPage(remote.getCurrentWebContents());
let firstRun = true;
//events
//update stuff
ipcRenderer.on('update', (event, state) => {
if (state.event === 'updateAvailable') {
$('.js-updatenotice').text(`New version ${state.version} available. Downloading...`);
$('.js-updatenotice').prop('disabled', true);
$('.js-updatenotice').show();
}
if (state.event === 'updateReadyToInstall') {
$('.js-updatenotice').text(`New version ready to install. Click here to start installer.`);
$('.js-updatenotice').show();
$('.js-updatenotice').prop('disabled', false);
$('.js-updatenotice').data('file', state.file);
}
});
$(document).on('click', '.js-updatenotice', (ev) => {
ev.preventDefault();
if ($('.js-updatenotice').prop('disabled')) {
return;
}
$('.js-updatenotice').prop('disabled', true);
$('.js-updatenotice').text(`Launching installer...`);
ipcRenderer.send('installUpdate', $('.js-updatenotice').data('file'));
});
//end update stuff
ipcRenderer.on('fileList', (event, files) => {
firstRun = false;
if (files && files.length > 0) {
$('.files-table-container').html(gitlit.templates.files({files: files}));
sorttable.makeSortable($('.js-filestable')[0]);
var myTH = document.getElementsByTagName("th")[0];
sorttable.innerSortFunction.apply(myTH, []);
ejs.preloadTemplate('templates/files.ejs')
.then(t => {
$('.files-table-container').html(ejs.rr(t, {files: files}));
sorttable.makeSortable($('.js-filestable')[0]);
var myTH = document.getElementsByTagName('th')[0];
sorttable.innerSortFunction.apply(myTH, []);
});
} else {
$('.files-table-container').html(gitlit.templates.noGitLfsFiles());
$('.files-table-container').html(ejs.rr('templates/noGitLfsFiles.ejs'));
}
});
ipcRenderer.on('repoDir', (event, repoDir) => {
$('.js-repo-dir').text('current repo dir: ' + repoDir).show();
ejs.preloadTemplate('templates/main.ejs')
.then(t => {
$('.js-container').html(ejs.rr(t));
$('.js-repo-dir').text('current repo dir: ' + repoDir).show();
});
});
ipcRenderer.on('isNoGitLfsRepo', (event, repoDir) => {
$('.js-container').html(gitlit.templates.isNoGitLfsRepo({repoDir: repoDir}));
if (firstRun) {
firstRun = false;
$('.js-container').html(ejs.rr('templates/firstRun.ejs', {repoDir: repoDir}));
} else {
$('.js-container').html(ejs.rr('templates/isNoGitLfsRepo.ejs', {repoDir: repoDir}));
}
});
ipcRenderer.on('notification', (event, notification) => {
@@ -75,6 +119,16 @@
window.location.reload(false);
});
$(document).on('click', '.js-open-folder', (ev) => {
ev.preventDefault();
$('.js-open-folder-input').trigger('click');
});
$(document).on('change', '.js-open-folder-input', (ev) => {
ev.preventDefault();
ipcRenderer.send('restart', $('.js-open-folder-input')[0].files[0].path);
});
$(document).on('keypress', (ev) => {
//ctrl + f
if (ev.ctrlKey && ev.charCode == 6) {
@@ -87,8 +141,21 @@
}
});
$(document).on('drop', (ev) => {
ev.preventDefault();
ev.stopPropagation();
if (ev.originalEvent.dataTransfer.files && ev.originalEvent.dataTransfer.files.length > 0) {
ipcRenderer.send('restart', ev.originalEvent.dataTransfer.files[0].path);
}
});
$(document).on('dragover', (ev) => {
ev.preventDefault();
ev.stopPropagation();
});
//startup
PNotify.defaults.styling = 'bootstrap4'; // Bootstrap version 4
$('.js-container').html(gitlit.templates.main());
})(jQuery);

View File

@@ -1,63 +0,0 @@
window.gitlit = window.gitlit || {};
gitlit.templates = {
main: ejs.compile(`
<div class="alert alert-success js-repo-dir" style="display:none;"></div>
<div class="files-table-container">
<div class="alert alert-primary" role="alert">
Getting file list...
</div>
</div>
`),
files: ejs.compile(`
<table class="table table-striped sortable js-filestable">
<thead class="thead-light">
<tr>
<th>file</th>
<th>status</th>
<th class="sorttable_nosort">action</th>
</tr>
<thead>
<tbody>
<% files.forEach((file) => { %>
<tr>
<td><%= file.file %></td>
<td><%= file.lockedBy ? file.lockedBy + ' (id: ' + file.id + ')' : 'not locked' %></td>
<td>
<a class="btn btn-primary btn-sm js-lock"
href="javascript:///"
data-file="<%= file.file %>"
style="<%= file.lockedBy ? 'display: none;' : '' %>"
>
Lock
</a>
<a class="btn btn-danger btn-sm js-unlock"
href="javascript:///"
data-file="<%= file.file %>"
style="<%= file.lockedBy ? '' : 'display: none;' %>"
>
Unlock
</a>
</td>
</tr>
<% }); %>
</tbody>
</table>
<div class="float-right">
<a class="btn btn-secondary btn-sm js-refresh" href="javascript:///">
Refresh
</a>
</div>
`),
isNoGitLfsRepo: ejs.compile(`
<div class="alert alert-danger">
<%= repoDir %> is not a git lfs repo.
</div>
`),
noGitLfsFiles: ejs.compile(`
<div class="alert alert-info">
no files tracked with lfs here.
</div>
`)
};

View File

@@ -3,18 +3,53 @@ const path = require('path');
const url = require('url');
const electronLocalshortcut = require('electron-localshortcut');
const exec = require('child_process').exec;
const gau = require('github-app-updater');
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 win;
let repoDir = path.resolve(path.normalize(args._.join(' ')));
let repoRootDir = repoDir;
//auto update stuff
setTimeout(() => {
gau.checkForUpdate({
currentVersion: app.getVersion(),
repo: 'https://api.github.com/repos/S2-/gitlit/releases/latest',
assetMatch: /.+setup.+exe/i
});
gau.onUpdateAvailable = (version, asset) => {
win.webContents.send('update', {
event: 'updateAvailable',
version: version
});
gau.downloadNewVersion(asset);
};
gau.onNewVersionReadyToInstall = (file) => {
win.webContents.send('update', {
event: 'updateReadyToInstall',
file: file
});
};
ipcMain.on('installUpdate', (event, file) => {
gau.executeUpdate(file);
win.webContents.send('update', {
event: 'updateInstalling'
});
});
}, 5000);
//end update stuff
function getLfsFileList(dir, cb) {
exec('git ls-files | git check-attr --stdin lockable', {
maxBuffer: 1024 * 1024,
maxBuffer: (1024 * 1024) * 10, //10MB
cwd: dir
},
(error, stdout, stderr) => {
@@ -46,7 +81,7 @@ function getLfsFileList(dir, cb) {
function getLfsLocks(dir, cb) {
exec('git lfs locks', {
maxBuffer: 1024 * 1024,
maxBuffer: (1024 * 1024) * 10, //10MB
cwd: dir
},
(error, stdout, stderr) => {
@@ -86,11 +121,46 @@ function getArrayObjectByKey(array, key, value, defaultKeyValue) {
return defaultKeyValue ? o[0][defaultKeyValue] : o[0];
}
return undefined;
}
};
function loadRepoPage() {
win.webContents.send('repoDir', repoDir);
getLfsFileList(repoDir, (err, files) => {
if (err) {
console.error(err);
win.webContents.send('isNoGitLfsRepo', repoDir);
return;
}
getLfsLocks(repoDir, (err, lockedFiles) => {
if (err) {
console.error(err);
win.webContents.send('isNoGitLfsRepo', repoDir);
return;
}
let allFiles = [];
let repoDirWithoutRoot = repoDir === repoRootDir ? '' : repoDir.replace(path.normalize(repoRootDir + '/'), '');
files.forEach((file) => {
const t = {
file: file,
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);
});
win.webContents.send('fileList', allFiles);
});
});
};
function createWindow() {
// Create the browser window.
win = new BrowserWindow({width: 800, height: 600});
win = new BrowserWindow({title: 'gitlit v' + app.getVersion(), width: 800, height: 700});
win.setMenu(null);
// and load the index.html of the app.
@@ -105,44 +175,36 @@ function createWindow() {
});
win.webContents.on('did-finish-load', () => {
win.webContents.send('repoDir', repoDir);
getLfsFileList(repoDir, (err, files) => {
if (err) {
console.error(err);
win.webContents.send('isNoGitLfsRepo', repoDir);
return;
}
getLfsLocks(repoDir, (err, lockedFiles) => {
if (err) {
console.error(err);
win.webContents.send('isNoGitLfsRepo', repoDir);
return;
}
let allFiles = [];
let repoDirWithoutRoot = repoDir === repoRootDir ? '' : repoDir.replace(path.normalize(repoRootDir + '/'), '');
files.forEach((file) => {
const t = {
file: file,
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);
});
win.webContents.send('fileList', allFiles);
});
});
loadRepoPage();
});
}
};
function startup(cb) {
exec('git rev-parse --show-toplevel', {
maxBuffer: (1024 * 1024) * 10, //10MB
cwd: repoDir
},
(error, stdout, stderr) => {
if (error) {
if (win) {
win.webContents.send('isNoGitLfsRepo', repoDir);
}
console.error(error);
}
if (stdout) {
repoRootDir = path.normalize(stdout.replace(/\n/g, ''));
}
if (cb) {
cb();
}
});
};
ipcMain.on('unlock', (event, file) => {
exec('git lfs unlock "' + file + '"', {
maxBuffer: 1024 * 1024,
maxBuffer: (1024 * 1024) * 10, //10MB
cwd: repoDir
},
(error, stdout, stderr) => {
@@ -165,7 +227,7 @@ ipcMain.on('unlock', (event, file) => {
ipcMain.on('lock', (event, file) => {
exec('git lfs lock --json "' + file + '"', {
maxBuffer: 1024 * 1024,
maxBuffer: (1024 * 1024) * 10, //10MB
cwd: repoDir
},
(error, stdout, stderr) => {
@@ -187,22 +249,13 @@ ipcMain.on('lock', (event, file) => {
});
});
ipcMain.on('restart', (event, newRepoDir) => {
repoDir = newRepoDir;
startup(loadRepoPage);
});
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();
});
startup(createWindow);
});
app.on('window-all-closed', function() {

44
app/templates/files.ejs Normal file
View File

@@ -0,0 +1,44 @@
<table class="table table-striped sortable js-filestable">
<thead class="thead-light">
<tr>
<th>file</th>
<th>status</th>
<th class="sorttable_nosort">action</th>
</tr>
<thead>
<tbody>
<% files.forEach((file) => { %>
<tr>
<td><%= file.file %></td>
<td><%= file.lockedBy ? file.lockedBy + ' (id: ' + file.id + ')' : 'not locked' %></td>
<td>
<a class="btn btn-primary btn-sm js-lock"
href="javascript:///"
data-file="<%= file.file %>"
style="<%= file.lockedBy ? 'display: none;' : '' %>"
>
Lock
</a>
<a class="btn btn-danger btn-sm js-unlock"
href="javascript:///"
data-file="<%= file.file %>"
style="<%= file.lockedBy ? '' : 'display: none;' %>"
>
Unlock
</a>
</td>
</tr>
<% }); %>
</tbody>
</table>
<div class="float-right">
<div style="display: inline;">
<a class="btn btn-primary btn-sm js-open-folder" href="javascript:///">Open another folder</a>
<input type="file" style="display: none" class="js-open-folder-input" webkitdirectory />
</div>
<a class="btn btn-secondary btn-sm js-refresh" href="javascript:///">
Refresh
</a>
</div>

View File

@@ -0,0 +1,9 @@
<div class="jumbotron text-center">
<img src="../logo/logo.png">
<h1>gitlit</h1>
<p class="lead">Handle git lfs locks with ease</p>
<div class="text-center">
<a class="btn btn-primary btn-lg js-open-folder" href="javascript:///">Open git repository folder</a>
<input type="file" style="display: none" class="js-open-folder-input" webkitdirectory />
</div>
</div>

View File

@@ -0,0 +1,4 @@
<div class="alert alert-danger">
<%= repoDir %> is not a git lfs repo.
</div>
<%- ejs.rr('templates/openFolder.ejs') %>

6
app/templates/main.ejs Normal file
View File

@@ -0,0 +1,6 @@
<div class="alert alert-success js-repo-dir" style="display:none;"></div>
<div class="files-table-container">
<div class="alert alert-primary" role="alert">
Getting file list...
</div>
</div>

View File

@@ -0,0 +1,4 @@
<div class="alert alert-info">
no files tracked with lfs here.
</div>
<%- ejs.rr('templates/openFolder.ejs') %>

View File

@@ -0,0 +1,4 @@
<div class="text-center">
<a class="btn btn-primary js-open-folder" href="javascript:///">Open another folder</a>
<input type="file" style="display: none" class="js-open-folder-input" webkitdirectory />
</div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
logo/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

785
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "gitlit",
"version": "1.1.0",
"version": "2.0.1",
"description": "",
"main": "app/main.js",
"build": {
@@ -28,25 +28,27 @@
},
"dependencies": {
"animate.css": "^3.5.2",
"bootstrap": "^4.1.3",
"ejs": "^2.6.1",
"bootstrap": "^4.5.0",
"ejs": "^2.7.4",
"ejs-render-remote": "^1.0.13",
"electron-find": "^1.0.6",
"electron-localshortcut": "^3.1.0",
"jquery": "^3.3.1",
"electron-localshortcut": "^3.2.1",
"github-app-updater": "^1.0.1",
"jquery": "^3.5.1",
"material-design-icons": "^3.0.1",
"minimist": "^1.2.0",
"minimist": "^1.2.5",
"nonblockjs": "^1.0.8",
"pnotify": "^4.0.0-alpha.4",
"popper.js": "^1.14.3"
"pnotify": "^4.0.1",
"popper.js": "^1.16.1"
},
"devDependencies": {
"electron": "^3.0.3",
"electron-builder": "^20.43.0"
"electron": "^3.1.13",
"electron-builder": "^20.44.4"
},
"scripts": {
"start": "electron .",
"pack": "electron-builder --linux --win --dir",
"dist": "electron-builder --linux --win"
"pack": "electron-builder --linux --win portable nsis --dir --publish=never",
"dist": "electron-builder --linux --win portable nsis --publish=never"
},
"repository": {
"type": "git",