diff --git a/app/js/renderer.js b/app/js/renderer.js index b38a943..4f8322a 100644 --- a/app/js/renderer.js +++ b/app/js/renderer.js @@ -462,6 +462,9 @@ function urlInputFieldOnFocus () { * @param {booean} [silent] - Boolean with default value. Shows a feedback in case of no available updates If 'silent' = false. Special handling for manually triggered update search */ function searchUpdate (silent = true) { + + var semver = require('semver') + ui.windowMainApplicationStateSet('Searching media-dupes updates') // check if pre-releases should be included or not @@ -529,7 +532,9 @@ function searchUpdate (silent = true) { utils.writeConsoleMsg('info', 'searchUpdate ::: Latest media-dupes version: ' + remoteAppVersionLatest) // If a stable (not a prelease) update is available - see #73 - if (localAppVersion < remoteAppVersionLatest) { + + //if (localAppVersion < remoteAppVersionLatest) { + if(semver.lt(localAppVersion, remoteAppVersionLatest)) { utils.writeConsoleMsg('info', 'searchUpdate ::: Found update, notify user') // prepare the message for the user - depending on the fact if it is a pre-release or not diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index efa4a3f..67b0897 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -25,12 +25,13 @@ The following categories are used: *** -### media-dupes 0.10.0 (2020xxyy) - DEV +### media-dupes 0.10.0 (20200607) #### `Added` * Added todo-list-protection to ensure items of the list arent removed while media-dupes is processing the list. See [#127](https://github.com/yafp/media-dupes/issues/127) * Added a warning dialog about consequences of not updating media-dupes. See [#129](https://github.com/yafp/media-dupes/issues/129) #### `Changed` +* Improved update check - using semver for version comparison. * Updated dependencies: * Updated `about-window` from `1.13.2` to `1.13.4` * Updated `datatables.net-dt` from `1.10.20` to `1.10.21` diff --git a/package-lock.json b/package-lock.json index f487de6..3522f20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "media-dupes", - "version": "0.9.20200607", + "version": "0.10.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -6217,11 +6217,9 @@ "dev": true }, "semver": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz", - "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==", - "dev": true, - "optional": true + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==" }, "semver-compare": { "version": "1.0.0", diff --git a/package.json b/package.json index b5cd505..41cf388 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "media-dupes", "productName": "media-dupes", "desktopName": "media-dupes.desktop", - "version": "0.9.20200607", + "version": "0.10.0", "description": "a minimal content duplicator for common media services like youtube", "main": "main.js", "repository": { @@ -276,6 +276,7 @@ "metascraper-youtube": "^5.11.21", "noty": "^3.2.0-beta", "popper.js": "^1.16.1", + "semver": "^7.3.2", "time-stamp": "^2.2.0", "v8-compile-cache": "^2.1.1", "yargs": "^15.3.1",