From 69f6660c999569305915e02578dadde09072ffbc Mon Sep 17 00:00:00 2001 From: Natsumi Date: Wed, 19 May 2021 10:04:59 +1200 Subject: [PATCH] AssetBundleCacher 3 Add date --- html/src/app.js | 27 ++++++++++++--------------- html/src/index.pug | 5 ++++- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/html/src/app.js b/html/src/app.js index 6472a5d4..6223b2ce 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -6845,7 +6845,11 @@ speechSynthesis.getVoices(); stripe: true, size: 'mini' }, - layout: 'table' + pageSize: 10, + paginationProps: { + small: true, + layout: 'prev,pager,next' + } }; $app.data.downloadQueueTable = { data: [], @@ -11312,10 +11316,9 @@ speechSynthesis.getVoices(); worldId: L.worldId }).then((args) => { var { ref } = args; - var date = new Date().toJSON(); this.checkVRChatCache(ref).then((cacheSize) => { if (cacheSize === -1) { - this.downloadQueue.set(ref.id, {ref, type, date, userId, location}); + this.downloadQueue.set(ref.id, {ref, type, userId, location}); this.downloadQueueTable.data = Array.from(this.downloadQueue.values()); if (!this.downloadInProgress) { this.downloadVRChatCache(); @@ -11325,18 +11328,6 @@ speechSynthesis.getVoices(); }); }; - $app.data.downloadProgressBarOptions = { - color: "#409EFF", - "empty-color": "#346CA6", - size: 50, - thickness: 4, - "empty-thickness": 2, - "line-mode": "normal 5", - animation: "rs 500 200", - "font-size": "20px", - "font-color": "white", - }; - $app.data.downloadProgress = 0; $app.data.downloadInProgress = false; $app.data.downloadIsProcessing = false; @@ -11361,6 +11352,7 @@ speechSynthesis.getVoices(); }); } this.downloadCurrent.status = 'Success'; + this.downloadCurrent.date = Date.now(); this.downloadHistoryTable.data.unshift(this.downloadCurrent); this.downloadCurrent = {}; this.downloadProgress = 0; @@ -11373,6 +11365,7 @@ speechSynthesis.getVoices(); type: 'info' }); this.downloadCurrent.status = 'Canceled'; + this.downloadCurrent.date = Date.now(); this.downloadHistoryTable.data.unshift(this.downloadCurrent); this.downloadCurrent = {}; this.downloadProgress = 0; @@ -11412,6 +11405,7 @@ speechSynthesis.getVoices(); }); } this.downloadCurrent.status = 'Already in cache'; + this.downloadCurrent.date = Date.now(); this.downloadHistoryTable.data.unshift(this.downloadCurrent); this.downloadCurrent = {}; this.downloadProgress = 0; @@ -11424,6 +11418,7 @@ speechSynthesis.getVoices(); type: 'error' }); this.downloadCurrent.status = 'Failed to process'; + this.downloadCurrent.date = Date.now(); this.downloadHistoryTable.data.unshift(this.downloadCurrent); this.downloadCurrent = {}; this.downloadProgress = 0; @@ -11436,6 +11431,7 @@ speechSynthesis.getVoices(); type: 'error' }); this.downloadCurrent.status = 'Failed to move into cache'; + this.downloadCurrent.date = Date.now(); this.downloadHistoryTable.data.unshift(this.downloadCurrent); this.downloadCurrent = {}; this.downloadProgress = 0; @@ -11448,6 +11444,7 @@ speechSynthesis.getVoices(); type: 'error' }); this.downloadCurrent.status = 'Download failed'; + this.downloadCurrent.date = Date.now(); this.downloadHistoryTable.data.unshift(this.downloadCurrent); this.downloadCurrent = {}; this.downloadProgress = 0; diff --git a/html/src/index.pug b/html/src/index.pug index 3794260b..520bd1f8 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -863,7 +863,7 @@ html el-switch(v-model="worldAutoCacheInviteFilter" inactive-text="VIP" active-text="Everyone" :disabled="worldAutoCacheInvite == 'Never'") br div.options-container-item - span.name Download on VIP GPS: + span.name Download on GPS: br toggle-switch(:options="worldCacheToggleSwitchOption" group="worldCacheGPSToggleSwitchOption" v-model="worldAutoCacheGPS" class="toggle-switch") div.options-container-item @@ -1554,6 +1554,9 @@ html el-button(type="text" icon="el-icon-close" size="mini" @click="cancelVRChatCacheDownload(scope.row.ref.id)") span(style="margin-top:15px") History: data-tables(v-bind="downloadHistoryTable" style="margin-top:10px") + el-table-column(label="Time" prop="date" width="90") + template(v-once #default="scope") + timer(:epoch="scope.row.date") el-table-column(label="World Name" prop="name") template(v-once #default="scope") span.x-link(v-text="scope.row.ref.name" @click="showWorldDialog(scope.row.location)")