fix: refresh forge logic

Voxelum · Jul 14, 2019 · ff332ab · ff332ab
1 parent f57400b
commit ff332ab
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/src/main/store/modules/version.js b/src/main/store/modules/version.js
@@ -287,9 +287,6 @@ const mod = {
                     const { body, statusCode } = await fetchJson(`https://voxelauncher.azurewebsites.net/api/v1/forge/versions/${version}`, {
                         headers,
                     });
-                    console.log(Object.keys(body));
-                    console.log(body.mcversion);
-                    console.log(body.versions);
 
                     if (statusCode !== 304 && body) {
                         console.log('commit');

diff --git a/src/renderer/windows/main/components/VersionSetting.vue b/src/renderer/windows/main/components/VersionSetting.vue
@@ -26,7 +26,7 @@
           <v-tab>
             Minecraft
           </v-tab>
-          <v-tab @click="refreshForgeVersion">
+          <v-tab @click="refreshForgeVersion(false)">
             Forge
           </v-tab>
           <v-tab>
@@ -56,7 +56,7 @@
             </v-list-tile>
             <v-divider dark />
             <forge-version-list style="background-color: transparent" :refreshing="$repo.state.version.refreshingForge" :version-list="forgeVersionList"
-                                :mcversion="mcversion" :filter="filterForge" @refresh="refreshForgeVersion" @value="forgeVersion = $event ? $event.version : ''" />
+                                :mcversion="mcversion" :filter="filterForge" @refresh="refreshForgeVersion(true)" @value="forgeVersion = $event ? $event.version : ''" />
           </v-tab-item>
           <v-tab-item style="height: 100%" @mousewheel="onMouseWheel">
             <liteloader-version-list :mcversion="mcversion" :filter-text="filterText" @value="liteloaderVersion = $event ? $event.version : ''" />
@@ -124,28 +124,34 @@ export default {
       this.forgeVersion = profile.forge.version;
 
       const mcversion = this.mcversion;
-      console.log(mcversion);
       const ver = this.$repo.state.version.forge[mcversion];
       if (ver) {
         this.forgeVersionList = ver.versions;
       } else {
+        this.forgeVersionList = [];
         this.$repo.dispatch('getForgeWebPage', this.mcversion)
           .then(r => (r ? r.versions : []))
-          .then((r) => { this.forgeVersionList = r; });
+          .then((r) => { this.forgeVersionList = [...r]; });
       }
     },
     onMouseWheel(e) {
       e.stopPropagation();
       return false;
     },
-    refreshForgeVersion() {
-      if (this.mcversion !== this.profile.mcversion) {
-        this.$repo.dispatch('getForgeWebPage', this.mcversion)
-          .then(r => (r ? r.versions : []))
-          .then((r) => { this.forgeVersionList = r; });
+    async refreshForgeVersion(force) {
+      if (force || this.mcversion !== this.profile.mcversion) {
+        this.forgeVersionList = [];
+        let r;
+        if (force) {
+          await this.$repo.dispatch('refreshForge', this.mcversion);
+          r = this.$repo.state.version.forge[this.mcversion];
+        } else {
+          r = await this.$repo.dispatch('getForgeWebPage', this.mcversion);
+        }
+        await this.$nextTick();
+        this.forgeVersionList = r ? Object.freeze([...r.versions]) : Object.freeze([]);
       }
     },
-
     filterMinecraft(v) {
       if (!this.showAlpha && v.type !== 'release') return false;
       return v.id.indexOf(this.filterText) !== -1;