diff --git a/AssetBundleCacher.cs b/AssetBundleCacher.cs index 5481496e..eee01484 100644 --- a/AssetBundleCacher.cs +++ b/AssetBundleCacher.cs @@ -124,6 +124,11 @@ namespace VRCX return; } } + else + { + DownloadProgress = -11; + return; + } } } DownloadProgress = 0; diff --git a/html/src/app.js b/html/src/app.js index b1362506..71d52ee8 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -11725,9 +11725,23 @@ speechSynthesis.getVoices(); cacheDirectory = this.VRChatConfigFile.cache_directory; } await AssetBundleCacher.DeleteCache(cacheDirectory, ref.id, ref.version); + this.getVRChatCacheSize(); this.updateVRChatCache(); }; + $app.methods.showDeleteAllVRChatCacheConfirm = function () { + this.$confirm(`Continue? Delete all VRChat cache`, 'Confirm', { + confirmButtonText: 'Confirm', + cancelButtonText: 'Cancel', + type: 'info', + callback: (action) => { + if (action === 'confirm') { + this.deleteAllVRChatCache(); + } + } + }); + }; + $app.methods.deleteAllVRChatCache = async function () { await this.readVRChatConfigFile(); var cacheDirectory = ''; diff --git a/html/src/index.pug b/html/src/index.pug index acd1e472..68c0f699 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -204,7 +204,7 @@ html .x-friend-item(v-for="user in searchUserResults" :key="user.id" @click="showUserDialog(user.id)") template(v-once) .avatar - //img(v-if="user.userIcon" v-lazy="user.userIcon") No userIcon from search, API bug? + img(v-if="user.userIcon" v-lazy="user.userIcon") img(v-lazy="user.currentAvatarThumbnailImageUrl") .detail span.name(v-text="user.displayName" :class="user.trustClass") @@ -1501,7 +1501,7 @@ html el-form-item(label="Location") el-input(v-model="newInstanceDialog.location" size="mini" readonly @click.native="$event.target.tagName === 'INPUT' && $event.target.select()") el-form-item(label="URL") - el-input(ref="wtf" v-model="newInstanceDialog.url" size="mini" readonly @click.native="$event.target.tagName === 'INPUT' && $event.target.select()") + el-input(v-model="newInstanceDialog.url" size="mini" readonly @click.native="$event.target.tagName === 'INPUT' && $event.target.select()") template(#footer) el-button(size="small" @click="makeHome(newInstanceDialog.location)") Make Home el-button(size="small" @click="showInviteDialog(newInstanceDialog.location)") Invite @@ -1537,7 +1537,7 @@ html el-tooltip(placement="top") template(#content) span Clear Cache - el-button(type="default" @click="deleteAllVRChatCache" :disabled="isGameRunning" size="small" icon="el-icon-delete" circle style="margin-left:5px") + el-button(type="default" @click="showDeleteAllVRChatCacheConfirm" :disabled="isGameRunning" size="small" icon="el-icon-delete" circle style="margin-left:5px") br span Delete all old versions from cache el-button(size="small" style="margin-left:5px" icon="el-icon-folder-delete" @click="sweepVRChatCache()") Sweep Cache