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

Ensure updatenotification module isn't shown when local is *ahead* of remote (#2943)

Browse Source 
This PR resolves a small bug in the updatenotification module if a local
git repo is ahead of the remote (for example I have made local commits
for my personal needs).

Currently, if `git status -sb` reports a status like: `##
master...origin/master [ahead 2]` then updatenotification treats this as
though it's "behind".

This PR uses a single Regex to match `git status -sb` output and uses
capture groups to extract info to populate the `gitInfo` object to avoid
needing to do string manipulation to extract this information.

Co-authored-by: Dario Mratovich <dario.mratovich@outlook.com>
This commit is contained in:
Dario Mratovich 2022-10-13 02:23:42 +08:00 committed by GitHub
parent 85a9f14178
commit 1eb2965b2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -31,6 +31,7 @@ Special thanks to: @rejas, @sdetweil
### Fixed ### Fixed
- Correctly show apparent temperature in SMHI weather provider - Correctly show apparent temperature in SMHI weather provider
- Ensure updatenotification module isn't shown when local is _ahead_ of remote
## [2.21.0] - 2022-10-01 ## [2.21.0] - 2022-10-01

20
modules/default/updatenotification/git_helper.js
View File

@ -92,20 +92,18 @@ class GitHelper {
// examples for status: // examples for status:
// ## develop...origin/develop // ## develop...origin/develop
// ## master...origin/master [behind 8] // ## master...origin/master [behind 8]
status = status.match(/(?![.#])([^.]*)/g); // ## master...origin/master [ahead 8, behind 1]
status = status.match(/## (.*)\.\.\.([^ ]*)(?: .*behind (\d+))?/);
// examples for status: // examples for status:
// [ ' develop', 'origin/develop', '' ] // [ '## develop...origin/develop', 'develop', 'origin/develop' ]
// [ ' master', 'origin/master [behind 8]', '' ] // [ '## master...origin/master [behind 8]', 'master', 'origin/master', '8' ]
gitInfo.current = status[0].trim(); // [ '## master...origin/master [ahead 8, behind 1]', 'master', 'origin/master', '1' ]
status = status[1].split(" "); gitInfo.current = status[1];
// examples for status: gitInfo.tracking = status[2];
// [ 'origin/develop' ]
// [ 'origin/master', '[behind', '8]' ]
gitInfo.tracking = status[0].trim();
if (status[2]) { if (status[3]) {
// 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
gitInfo.behind = parseInt(status[2].substring(0, status[2].length - 1)); gitInfo.behind = parseInt(status[3]);
gitInfo.isBehindInStatus = true; gitInfo.isBehindInStatus = true;
} }