mirror of
https://github.com/JustusPlays78/SectorFileUpdater.git
synced 2025-04-29 10:10:57 +00:00
Merge branch 'pabr-git' into 'main'
Simple Git Operations See merge request julscha/sectorfileupdater!3
This commit is contained in:
commit
2a8f20c2d5
2516
updater/package-lock.json
generated
2516
updater/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -47,9 +47,11 @@
|
||||
"dependencies": {
|
||||
"@octokit/core": "^4.0.5",
|
||||
"decompress-zip": "^0.3.3",
|
||||
"dir-compare": "^4.0.0",
|
||||
"electron-dl": "^3.3.1",
|
||||
"electron-squirrel-startup": "^1.0.0",
|
||||
"js-yaml": "^4.1.0"
|
||||
"js-yaml": "^4.1.0",
|
||||
"node-abi": "^3.28.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@electron-forge/cli": "^6.0.0-beta.66",
|
||||
|
@ -16,6 +16,9 @@
|
||||
<p>Input Directory</p>
|
||||
<input type="text" id="dirBox" name="name" size="80">
|
||||
<progress id="progressbar" max="100" value="0"></progress>
|
||||
|
||||
<button id="git">Do Git Operations</button>
|
||||
|
||||
<script src="./renderer.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
@ -1,5 +1,7 @@
|
||||
const { ipcRenderer, dialog } = require('electron');
|
||||
var DecompressZip = require('decompress-zip');
|
||||
const dircompare = require('dir-compare');
|
||||
|
||||
|
||||
ipcRenderer.on("download complete", (event, file) => {
|
||||
console.log(file); // Full file path
|
||||
@ -41,3 +43,48 @@ extractBtn.addEventListener('click', () => {
|
||||
properties: { directory: directoryPath.value }
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
// Git Operations
|
||||
|
||||
// Vars for git
|
||||
const options = { compareSize: true, compareContent: true, compareFileAsync: true };
|
||||
const path1 = 'E:\\git\\v1';
|
||||
const path2 = 'E:\\git\\v2';
|
||||
|
||||
let gitBtn = document.getElementById('git');
|
||||
gitBtn.addEventListener('click', (e) => {
|
||||
git();
|
||||
});
|
||||
|
||||
const git = async() => {
|
||||
const res = dircompare.compareSync(path1, path2, options);
|
||||
console.log(res.differencesFiles); // Number check :)
|
||||
print(res);
|
||||
}
|
||||
|
||||
function print(result) {
|
||||
//console.log('Directories are %s', result.same ? 'identical' : 'different')
|
||||
|
||||
//console.log('Statistics - equal entries: %s, distinct entries: %s, left only entries: %s, right only entries: %s, differences: %s', result.equal, result.distinct, result.left, result.right, result.differences)
|
||||
|
||||
let oldFolder, newFolder, other;
|
||||
result.diffSet.forEach(function(dif) {
|
||||
if (dif.state !== "equal") {
|
||||
console.log('Difference - name1: %s, type1: %s, name2: %s, type2: %s, state: %s',
|
||||
dif.name1, dif.type1, dif.name2, dif.type2, dif.state);
|
||||
if (dif.state === "right") {
|
||||
newFolder += dif.name2 + "\n";
|
||||
} else if (dif.state === "left") {
|
||||
oldFolder += dif.name1 + "\n";
|
||||
} else {
|
||||
other += dif.name1 + "\n";
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
console.log(newFolder);
|
||||
console.log(oldFolder);
|
||||
console.log(other);
|
||||
}
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user