kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

added comments, get hash only for mm

Browse Source
This commit is contained in:
Karsten Hassel 2021-09-05 23:35:49 +02:00
parent b1fc766908
commit ce13d7f98b
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/default/updatenotification/node_helper.js
View File

@ -87,22 +87,35 @@ module.exports = NodeHelper.create({
// remote branch: // remote branch:
tracking: "" tracking: ""
}; };
let res = await this.execShell("cd " + repo.folder + " && git rev-parse HEAD"); let res;
if (res.stderr) { if (module === "default") {
Log.error("Failed to get current commit hash for " + repo.module + ": " + res.stderr); // the hash is only needed for the mm repo
res = await this.execShell("cd " + repo.folder + " && git rev-parse HEAD");
if (res.stderr) {
Log.error("Failed to get current commit hash for " + repo.module + ": " + res.stderr);
}
gitInfo.hash = res.stdout;
} }
gitInfo.hash = res.stdout;
res = await this.execShell("cd " + repo.folder + " && git status -sb"); res = await this.execShell("cd " + repo.folder + " && git status -sb");
if (res.stderr) { if (res.stderr) {
Log.error("Failed to get git status for " + repo.module + ": " + res.stderr); Log.error("Failed to get git status for " + repo.module + ": " + res.stderr);
// exit without git status info // exit without git status info
return; return;
} }
// get branch and remote // only the first line of stdout is evaluated
let status = res.stdout.split("\n")[0]; let status = res.stdout.split("\n")[0];
// examples for status:
// ## develop...origin/develop
// ## master...origin/master [behind 8]
status = status.match(/(?![.#])([^.]*)/g); status = status.match(/(?![.#])([^.]*)/g);
// examples for status:
// [ ' develop', 'origin/develop', '' ]
// [ ' master', 'origin/master [behind 8]', '' ]
gitInfo.current = status[0].trim(); gitInfo.current = status[0].trim();
status = status[1].split(" "); status = status[1].split(" ");
// examples for status:
// [ 'origin/develop' ]
// [ 'origin/master', '[behind', '8]' ]
gitInfo.tracking = status[0].trim(); gitInfo.tracking = status[0].trim();
if (status[2]) { if (status[2]) {
// git fetch was already called before so `git status -sb` delivers already the behind number // git fetch was already called before so `git status -sb` delivers already the behind number
@ -110,14 +123,18 @@ module.exports = NodeHelper.create({
return gitInfo; return gitInfo;
} }
res = await this.execShell("cd " + repo.folder + " && git fetch --dry-run"); res = await this.execShell("cd " + repo.folder + " && git fetch --dry-run");
// here the result is in stderr // example output:
// From https://github.com/MichMich/MagicMirror
// e40ddd4..06389e3 develop -> origin/develop
// here the result is in stderr (this is a git default, don't ask why ...)
if (res.stderr === "") return; if (res.stderr === "") return;
// set default > 0
gitInfo.behind = 1;
let refs = res.stderr.match(/s*([a-z,0-9]+[.][.][a-z,0-9]+)s*/g)[0]; let refs = res.stderr.match(/s*([a-z,0-9]+[.][.][a-z,0-9]+)s*/g)[0];
if (refs === "") { if (refs === "") {
// if match fails set behind to a number greater 0 and return
gitInfo.behind = 1;
return gitInfo; return gitInfo;
} }
// get behind with refs
res = await this.execShell("cd " + repo.folder + " && git rev-list --ancestry-path --count " + refs); res = await this.execShell("cd " + repo.folder + " && git rev-list --ancestry-path --count " + refs);
gitInfo.behind = parseInt(res.stdout); gitInfo.behind = parseInt(res.stdout);
return gitInfo; return gitInfo;