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

21 Commits

Author SHA1 Message Date
s2
ce50a38e35 2.0.7 2020-07-07 11:50:30 +02:00
s2
133f72df2a fix updater 2020-07-07 11:50:21 +02:00
s2
bebaf95f70 2.0.6 2020-07-07 10:42:56 +02:00
s2
e719261427 update to latest electron version 2020-07-07 10:40:27 +02:00
s2
1fe4d0d90c 2.0.5 2020-06-07 22:43:44 +02:00
s2
9873246826 auto update only on windows 2020-06-07 22:43:33 +02:00
s2
b8a94f650f 2.0.4 2020-06-07 22:17:29 +02:00
s2
e97a5c1fc2 just readme 2020-06-07 22:17:26 +02:00
s2
3d020a3ddd 2.0.3 2020-06-07 20:22:57 +02:00
s2
8765f99f19 update node modules 2020-06-07 20:22:50 +02:00
s2
cee594fcd9 2.0.2 2020-06-07 20:16:05 +02:00
s2
3c4d33eb83 just a note 2020-06-07 20:15:56 +02:00
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
8 changed files with 1132 additions and 1603 deletions

View File

@@ -45,6 +45,9 @@ npm install
npm run dist
```
## notes
Since version 2.0.1 the app auto updates itself using the [github-app-updater](https://www.npmjs.com/package/github-app-updater).
## license
ISC

View File

@@ -49,3 +49,13 @@ table.sortable thead {
table.sortable .sorttable_nosort {
cursor: default;
}
/*
* updater
*/
.updatenotice {
position: fixed;
bottom: 5px;
right: 5px;
}

View File

@@ -20,8 +20,9 @@
<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

@@ -2,11 +2,42 @@
const ipcRenderer = require('electron').ipcRenderer;
const remote = require('electron').remote;
const electronFind = require('electron-find');
const dialog = remote.require('electron').dialog;
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) {
@@ -92,12 +123,15 @@
$(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);
dialog.showOpenDialog({
properties: ['openDirectory']
})
.then((path) => {
if (path && path.filePaths.length > 0) {
ipcRenderer.send('restart', path.filePaths[0]);
};
});
});
$(document).on('keypress', (ev) => {

View File

@@ -3,6 +3,7 @@ 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()
@@ -13,7 +14,41 @@ let win;
let repoDir = path.resolve(path.normalize(args._.join(' ')));
let repoRootDir = repoDir;
require('update-electron-app')();
//auto update stuff
if (process.platform === 'win32') {
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'
});
app.quit();
});
}, 5000);
}
//end update stuff
function getLfsFileList(dir, cb) {
exec('git ls-files | git check-attr --stdin lockable', {
@@ -128,7 +163,15 @@ function loadRepoPage() {
function createWindow() {
// Create the browser window.
win = new BrowserWindow({title: 'gitlit v' + app.getVersion(), width: 800, height: 700});
win = new BrowserWindow({
title: 'gitlit v' + app.getVersion(),
width: 800,
height: 700,
webPreferences: {
nodeIntegration: true,
enableRemoteModule: true
}
});
win.setMenu(null);
// and load the index.html of the app.
@@ -225,9 +268,3 @@ ipcMain.on('restart', (event, newRepoDir) => {
app.on('ready', () => {
startup(createWindow);
});
app.on('window-all-closed', function() {
if (process.platform != 'darwin') {
app.quit();
}
});

View File

@@ -1,4 +1,3 @@
<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>

2601
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "gitlit",
"version": "1.5.1",
"version": "2.0.7",
"description": "",
"main": "app/main.js",
"build": {
@@ -28,27 +28,27 @@
},
"dependencies": {
"animate.css": "^3.5.2",
"bootstrap": "^4.4.1",
"ejs": "^2.7.4",
"bootstrap": "^4.5.0",
"ejs": "^3.1.3",
"ejs-render-remote": "^1.0.13",
"electron-find": "^1.0.6",
"electron-localshortcut": "^3.2.1",
"github-app-updater": "^1.0.4",
"jquery": "^3.5.1",
"material-design-icons": "^3.0.1",
"minimist": "^1.2.5",
"nonblockjs": "^1.0.8",
"pnotify": "^4.0.1",
"popper.js": "^1.16.1",
"update-electron-app": "^1.5.0"
"popper.js": "^1.16.1"
},
"devDependencies": {
"electron": "^3.1.13",
"electron-builder": "^20.44.4"
"electron": "^9.1.0",
"electron-builder": "^22.7.0"
},
"scripts": {
"start": "electron .",
"pack": "electron-builder --linux --win portable --dir",
"dist": "electron-builder --linux --win portable"
"pack": "electron-builder --linux --win portable nsis --dir --publish=never",
"dist": "electron-builder --linux --win portable nsis --publish=never"
},
"repository": {
"type": "git",