Fixed preRelease updates

- prereleases wont block updates anymore when disabled
DrJume · Jun 18, 2018 · 7d18684 · 7d18684
1 parent 932f5b2
commit 7d18684
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/handlers/TaskScheduler.js b/handlers/TaskScheduler.js
@@ -24,11 +24,6 @@ function StartTaskRunner() {
       return
     }
 
-    if (update.isPreRelease && !Config.update.pre_release) {
-      log.info('NO_PRE_RELEASE_UPDATE')
-      return
-    }
-
     await Updater.runUpdate(update)
   })
 

diff --git a/services/Updater.js b/services/Updater.js
@@ -14,16 +14,19 @@ const WebServer = require('handlers/WebServer')
 const packageData = require('../package.json')
 
 async function checkUpdate() {
-  const [err, httpResponse] = await try_(axios.get('https://api.github.com/repos/drjume/vplan-viso/releases/latest'), 'HTTP_REQUEST_ERR#response.data#config.url')
+  const updateURL = `https://api.github.com/repos/drjume/vplan-viso/releases${Config.update.pre_release ? '' : '/latest'}`
+
+  const [err, httpResponse] = await try_(axios.get(updateURL), 'HTTP_REQUEST_ERR#response.data#config.url')
   if (err) return undefined
 
-  const latest = httpResponse.data
+  const latest = Config.update.pre_release ? httpResponse.data[0] : httpResponse.data
+
+  if (Config.update.pre_release) log.warn('UPDATE_PRERELEASE')
 
   const UpdateInfo = {
     latestVersion: semver.clean(latest.tag_name),
     packageVersion: semver.clean(packageData.version),
     isLatestNewer: semver.gt(latest.tag_name, packageData.version),
-    isPreRelease: latest.prerelease,
     tarballUrl: latest.tarball_url,
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,11 +24,6 @@ function StartTaskRunner() { @@
           return
         }
-        if (update.isPreRelease && !Config.update.pre_release) {
-          log.info('NO_PRE_RELEASE_UPDATE')
-          return
-        }
         await Updater.runUpdate(update)
       })
@@ Expand Down @@