✨ Feature: add dist upload to cos & update checkupdate logic

src/main/events/picgoCoreIPC.ts

@@ -26,7 +26,8 @@ import {
   PICGO_REMOVE_BY_ID_DB,
   PICGO_OPEN_FILE,
   PASTE_TEXT,
-  OPEN_WINDOW
+  OPEN_WINDOW,
+  DEFAULT_LOGO
 } from '#/events/constants'
 
 import { GalleryDB } from 'apis/core/datastore'
@@ -366,6 +367,12 @@ const handleOpenWindow = () => {
   })
 }
 
+const handleDefaultLogo = () => {
+  ipcMain.on(DEFAULT_LOGO, (event: IpcMainEvent) => {
+    event.sender.send(DEFAULT_LOGO, path.join(__static, 'roundLogo.png'))
+  })
+}
+
 export default {
   listen () {
     handleGetPluginList()
@@ -379,6 +386,7 @@ export default {
     handleImportLocalPlugin()
     handleOpenFile()
     handleOpenWindow()
+    handleDefaultLogo()
   },
   // TODO: separate to single file
   handlePluginUninstall,

src/main/utils/updateChecker.ts

@@ -1,12 +1,12 @@
 import { dialog, shell } from 'electron'
 import db from '~/main/apis/core/datastore'
-import axios from 'axios'
 import pkg from 'root/package.json'
 import { lt } from 'semver'
 import { T } from '~/universal/i18n'
+import { getLatestVersion } from '#/utils/getLatestVersion'
 const version = pkg.version
-const releaseUrl = 'https://api.github.com/repos/Molunerfinn/PicGo/releases/latest'
-const releaseUrlBackup = 'https://cdn.jsdelivr.net/gh/Molunerfinn/PicGo@latest/package.json'
+// const releaseUrl = 'https://api.github.com/repos/Molunerfinn/PicGo/releases'
+// const releaseUrlBackup = 'https://picgo-1251750343.cos.ap-chengdu.myqcloud.com'
 const downloadUrl = 'https://github.com/Molunerfinn/PicGo/releases/latest'
 
 const checkVersion = async () => {
@@ -16,17 +16,10 @@ const checkVersion = async () => {
     showTip = true
   }
   if (showTip) {
-    let res: any
-    try {
-      res = await axios.get(releaseUrl).catch(async () => {
-        const result = await axios.get(releaseUrlBackup)
-        return result
-      })
-    } catch (err) {
-      console.log(err)
-    }
-    if (res.status === 200) {
-      const latest = res.data.version || res.data.name
+    const isCheckBetaUpdate = db.get('settings.checkBetaUpdate') !== false
+    const res: string = await getLatestVersion(isCheckBetaUpdate)
+    if (res !== '') {
+      const latest = res
       const result = compareVersion2Update(version, latest)
       if (result) {
         dialog.showMessageBox({

src/renderer/pages/PicGoSetting.vue

@@ -393,10 +393,9 @@ import {
 import { Component, Vue } from 'vue-property-decorator'
 import { T, languageList } from '~/universal/i18n'
 import { enforceNumber } from '~/universal/utils/common'
-// import db from '#/datastore'
-const releaseUrl = 'https://api.github.com/repos/Molunerfinn/PicGo/releases/latest'
-const releaseUrlBackup = 'https://cdn.jsdelivr.net/gh/Molunerfinn/PicGo@latest/package.json'
-const downloadUrl = 'https://github.com/Molunerfinn/PicGo/releases/latest'
+import { getLatestVersion } from '#/utils/getLatestVersion'
+import { compare } from 'compare-versions'
+import { STABLE_RELEASE_URL, BETA_RELEASE_URL } from '#/utils/static'
 const customLinkRule = (rule: string, value: string, callback: (arg0?: Error) => void) => {
   if (!/\$url/.test(value)) {
     return callback(new Error(T('TIPS_MUST_CONTAINS_URL')))
@@ -635,39 +634,23 @@ export default class extends Vue {
     })
   }
 
-  compareVersion2Update (current: string, latest: string) {
-    const currentVersion = current.split('.').map(item => parseInt(item))
-    const latestVersion = latest.split('.').map(item => parseInt(item))
-
-    for (let i = 0; i < 3; i++) {
-      if (currentVersion[i] < latestVersion[i]) {
-        return true
-      }
-      if (currentVersion[i] > latestVersion[i]) {
-        return false
-      }
-    }
-    return false
+  compareVersion2Update (current: string, latest: string): boolean {
+    return compare(current, latest, '<')
   }
 
-  checkUpdate () {
+  async checkUpdate () {
     this.checkUpdateVisible = true
-    this.$http.get(releaseUrl)
-      .then(res => {
-        this.latestVersion = res.data.name
-      }).catch(async () => {
-        this.$http.get(releaseUrlBackup)
-          .then(res => {
-            this.latestVersion = res.data.version
-          }).catch(() => {
-            this.latestVersion = this.$T('TIPS_NETWORK_ERROR')
-          })
-      })
+    const version = await getLatestVersion(this.form.checkBetaUpdate)
+    if (version) {
+      this.latestVersion = version
+    } else {
+      this.latestVersion = this.$T('TIPS_NETWORK_ERROR')
+    }
   }
 
   confirmCheckVersion () {
     if (this.needUpdate) {
-      ipcRenderer.send(OPEN_URL, downloadUrl)
+      ipcRenderer.send(OPEN_URL, this.form.checkBetaUpdate ? BETA_RELEASE_URL : STABLE_RELEASE_URL)
     }
     this.checkUpdateVisible = false
   }

src/renderer/pages/Plugin.vue

@@ -120,7 +120,8 @@ import {
   PICGO_CONFIG_PLUGIN,
   PICGO_HANDLE_PLUGIN_ING,
   PICGO_TOGGLE_PLUGIN,
-  SHOW_PLUGIN_PAGE_MENU
+  SHOW_PLUGIN_PAGE_MENU,
+  DEFAULT_LOGO
 } from '#/events/constants'
 
 @Component({
@@ -144,7 +145,7 @@ export default class extends Vue {
   importLocalPluginToolTip = this.$T('PLUGIN_IMPORT_LOCAL')
   id = ''
   os = ''
-  defaultLogo: string = 'this.src="https://cdn.jsdelivr.net/gh/Molunerfinn/PicGo@dev/public/roundLogo.png"'
+  defaultLogo: string = ''
   get npmSearchText () {
     return this.searchText.match('picgo-plugin-')
       ? this.searchText
@@ -247,11 +248,19 @@ export default class extends Vue {
         this.needReload = true
       }
     })
+    ipcRenderer.on(DEFAULT_LOGO, (evt: IpcRendererEvent, logoPath) => {
+      this.defaultLogo = `this.src="${logoPath.replace(/\\/g, '/')}"`
+    })
     this.getPluginList()
     this.getSearchResult = debounce(this.getSearchResult, 50)
+    this.getDefaultLogo()
     this.needReload = await this.getConfig<boolean>('needReload') || false
   }
 
+  getDefaultLogo () {
+    ipcRenderer.send(DEFAULT_LOGO)
+  }
+
   async buildContextMenu (plugin: IPicGoPlugin) {
     ipcRenderer.send(SHOW_PLUGIN_PAGE_MENU, plugin)
   }
@@ -439,6 +448,7 @@ export default class extends Vue {
     ipcRenderer.removeAllListeners('uninstallSuccess')
     ipcRenderer.removeAllListeners('updateSuccess')
     ipcRenderer.removeAllListeners('hideLoading')
+    ipcRenderer.removeAllListeners(DEFAULT_LOGO)
   }
 }
 </script>

src/universal/events/constants.ts

@@ -34,3 +34,4 @@ export const SHOW_MAIN_PAGE_DONATION = 'SHOW_MAIN_PAGE_DONATION'
 export const FORCE_UPDATE = 'FORCE_UPDATE'
 export const CHANGE_LANGUAGE = 'CHANGE_LANGUAGE'
 export const OPEN_WINDOW = 'OPEN_WINDOW'
+export const DEFAULT_LOGO = 'DEFAULT_LOGO'

src/universal/utils/getLatestVersion.ts

@@ -0,0 +1,25 @@
+import axios from 'axios'
+import { RELEASE_URL, RELEASE_URL_BACKUP } from './static'
+import yaml from 'js-yaml'
+
+export const getLatestVersion = async (isCheckBetaUpdate: boolean = false) => {
+  let res: string = ''
+  try {
+    res = await axios.get(RELEASE_URL).then(r => {
+      const list = r.data as IStringKeyMap[]
+      if (isCheckBetaUpdate) {
+        const betaList = list.filter(item => item.name.includes('beta'))
+        return betaList[0].name
+      }
+      const normalList = list.filter(item => !item.name.includes('beta'))
+      return normalList[0].name
+    }).catch(async () => {
+      const result = await axios.get(isCheckBetaUpdate ? `${RELEASE_URL_BACKUP}/latest.beta.yml` : `${RELEASE_URL_BACKUP}/latest.yml`)
+      const r = yaml.load(result.data) as IStringKeyMap
+      return r.version
+    })
+  } catch (err) {
+    console.log(err)
+  }
+  return res
+}

src/universal/utils/static.ts

@@ -1 +1,5 @@
 export const CLIPBOARD_IMAGE_FOLDER = 'picgo-clipboard-images'
+export const RELEASE_URL = 'https://api.github.com/repos/Molunerfinn/PicGo/releases'
+export const RELEASE_URL_BACKUP = 'https://picgo-1251750343.cos.ap-chengdu.myqcloud.com'
+export const STABLE_RELEASE_URL = 'https://github.com/Molunerfinn/PicGo/releases/latest'
+export const BETA_RELEASE_URL = 'https://github.com/Molunerfinn/PicGo/releases'