From 4935a6a1fd38a31c42d1ae8b1e03aa40c475a89c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 15 May 2018 16:52:19 +0200 Subject: [PATCH] Catch indexdb database destroy --- .../src/assets/player/peertube-chunk-store.ts | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/client/src/assets/player/peertube-chunk-store.ts b/client/src/assets/player/peertube-chunk-store.ts index 005e98a81..84fbaf146 100644 --- a/client/src/assets/player/peertube-chunk-store.ts +++ b/client/src/assets/player/peertube-chunk-store.ts @@ -183,25 +183,21 @@ export class PeertubeChunkStore extends EventEmitter { private checkExpiration () { this.expirationDB.transaction('rw', this.expirationDB.databases, async () => { - try { - // Update our database expiration since we are alive - await this.expirationDB.databases.put({ - name: this.databaseName, - expiration: new Date().getTime() + PeertubeChunkStore.CLEANER_EXPIRATION_MS - }) + // Update our database expiration since we are alive + await this.expirationDB.databases.put({ + name: this.databaseName, + expiration: new Date().getTime() + PeertubeChunkStore.CLEANER_EXPIRATION_MS + }) - const now = new Date().getTime() - const databasesToDeleteInfo = await this.expirationDB.databases.where('expiration').below(now).toArray() + const now = new Date().getTime() + const databasesToDeleteInfo = await this.expirationDB.databases.where('expiration').below(now).toArray() - for (const databaseToDeleteInfo of databasesToDeleteInfo) { - await this.dropDatabase(databaseToDeleteInfo.name) + for (const databaseToDeleteInfo of databasesToDeleteInfo) { + await this.dropDatabase(databaseToDeleteInfo.name) - await this.expirationDB.databases.where({ name: databaseToDeleteInfo.name }).delete() - } - } catch (err) { - console.error('Cannot check expiration.', err) + await this.expirationDB.databases.where({ name: databaseToDeleteInfo.name }).delete() } - }) + }).catch(err => console.error('Cannot check expiration.', err)) } private dropDatabase (databaseName: string) { @@ -209,6 +205,7 @@ export class PeertubeChunkStore extends EventEmitter { console.log('Deleting %s.', databaseName) return dbToDelete.delete() + .catch(err => console.error('Cannot delete %s.', databaseName)) } private nextTick (cb, err, val?) { -- 2.25.1