s2/gitlit
1
0
Fork 0
mirror of https://github.com/S2-/gitlit synced 2025-08-02 12:20:05 +02:00
Code Issues Releases Wiki Activity

fix show locks when in a subfolder

Browse Source
This commit is contained in:
s2
2019-06-12 11:21:15 +02:00
parent c7dab12990
commit e0f88f12e1
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/main.js
View File

@@ -10,6 +10,7 @@ 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 ls-files | git check-attr --stdin lockable', {
@@ -31,7 +32,7 @@ function getLfsFileList(dir, cb) {
file = pos[0];
status = pos[1];
if (file && status === 'set') {
parsedFiles.push(file.trim());
parsedFiles.push(path.normalize(file.trim()));
}
}
});
@@ -59,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({
@@ -121,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);
@@ -185,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') {