Remove old code for downloads, user progress, sql, server config. Add web plugin for DbManager

pages/bookshelf/index.vue

@@ -39,15 +39,6 @@ export default {
     }
   },
   computed: {
-    books() {
-      return this.$store.getters['downloads/getDownloads'].map((dl) => {
-        var download = { ...dl }
-        var ab = { ...download.audiobook }
-        delete download.audiobook
-        ab.download = download
-        return ab
-      })
-    },
     user() {
       return this.$store.state.user.user
     },
@@ -57,69 +48,6 @@ export default {
     currentLibraryName() {
       return this.$store.getters['libraries/getCurrentLibraryName']
     },
-    booksWithUserAbData() {
-      var books = this.books.map((b) => {
-        var userAbData = this.$store.getters['user/getUserAudiobookData'](b.id)
-        return { ...b, userAbData }
-      })
-      return books
-    },
-    booksCurrentlyReading() {
-      var books = this.booksWithUserAbData
-        .map((b) => ({ ...b }))
-        .filter((b) => b.userAbData && !b.userAbData.isRead && b.userAbData.progress > 0)
-        .sort((a, b) => {
-          return b.userAbData.lastUpdate - a.userAbData.lastUpdate
-        })
-      return books
-    },
-    booksRecentlyAdded() {
-      var books = this.books
-        .map((b) => {
-          return { ...b }
-        })
-        .sort((a, b) => b.addedAt - a.addedAt)
-      return books.slice(0, 10)
-    },
-    booksRead() {
-      var books = this.booksWithUserAbData
-        .filter((b) => b.userAbData && b.userAbData.isRead)
-        .sort((a, b) => {
-          return b.userAbData.lastUpdate - a.userAbData.lastUpdate
-        })
-      return books.slice(0, 10)
-    },
-    downloadOnlyShelves() {
-      var shelves = []
-
-      if (this.booksCurrentlyReading.length) {
-        shelves.push({
-          id: 'recent',
-          label: 'Continue Reading',
-          type: 'books',
-          entities: this.booksCurrentlyReading
-        })
-      }
-
-      if (this.booksRecentlyAdded.length) {
-        shelves.push({
-          id: 'added',
-          label: 'Recently Added',
-          type: 'books',
-          entities: this.booksRecentlyAdded
-        })
-      }
-
-      if (this.booksRead.length) {
-        shelves.push({
-          id: 'read',
-          label: 'Read Again',
-          type: 'books',
-          entities: this.booksRead
-        })
-      }
-      return shelves
-    },
     currentLibraryId() {
       return this.$store.state.libraries.currentLibraryId
     }
@@ -195,11 +123,6 @@ export default {
         await this.fetchCategories()
       }
     },
-    // downloadsLoaded() {
-    //   if (!this.isSocketConnected) {
-    //     this.shelves = this.downloadOnlyShelves
-    //   }
-    // },
     audiobookAdded(audiobook) {
       console.log('Audiobook added', audiobook)
       // TODO: Check if audiobook would be on this shelf

pages/downloads.vue

@@ -1,291 +0,0 @@
-<template>
-  <div class="w-full h-full py-6">
-    <h1 class="text-2xl px-4">Downloads</h1>
-
-    <div v-if="!isIos" class="w-full px-2 py-2">
-      <template v-for="folder in localFolders">
-        <div :key="folder.id" class="flex items-center p-2">
-          <div class="flex-grow">
-            <p>{{ folder.id }}|{{ folder.name }}|{{ folder.contentUrl }}</p>
-          </div>
-          <div class="w-40">
-            <ui-btn @click="searchFolder(folder.id)">Scan</ui-btn>
-          </div>
-        </div>
-      </template>
-      <div v-if="!localFolders.length" class="flex justify-center">
-        <p class="text-center">No Media Folders</p>
-      </div>
-    </div>
-
-    <div v-if="!isIos" class="w-full px-2 py-2" :class="hasStoragePermission ? '' : 'text-error'">
-      <div class="flex items-center">
-        <span class="material-icons" @click="changeDownloadFolderClick">{{ hasStoragePermission ? 'folder' : 'error' }}</span>
-        <p v-if="hasStoragePermission" class="text-sm px-4" @click="changeDownloadFolderClick">{{ downloadFolderSimplePath || 'No Download Folder Selected' }}</p>
-        <p v-else class="text-sm px-4" @click="changeDownloadFolderClick">No Storage Permissions. Click here</p>
-      </div>
-      <!-- <p v-if="hasStoragePermission" class="text-xs text-gray-400 break-all max-w-full">{{ downloadFolderUri }}</p> -->
-    </div>
-
-    <div v-if="!isIos" class="w-full h-10 relative">
-      <div class="absolute top-px left-0 z-10 w-full h-full flex">
-        <div class="flex-grow h-full bg-primary rounded-t-md mr-px" @click="showingDownloads = true">
-          <div class="flex items-center justify-center rounded-t-md border-t border-l border-r border-white border-opacity-20 h-full" :class="showingDownloads ? 'text-gray-100' : 'border-b bg-black bg-opacity-20 text-gray-400'">
-            <p>Downloads</p>
-          </div>
-        </div>
-        <div class="flex-grow h-full bg-primary rounded-t-md ml-px" @click="showingDownloads = false">
-          <div class="flex items-center justify-center h-full rounded-t-md border-t border-l border-r border-white border-opacity-20" :class="!showingDownloads ? 'text-gray-100' : 'border-b bg-black bg-opacity-20 text-gray-400'">
-            <p>Files</p>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div v-if="!isIos" class="list-content-body relative w-full overflow-x-hidden overflow-y-auto bg-primary">
-      <template v-if="showingDownloads">
-        <div v-if="!totalDownloads" class="flex items-center justify-center h-40">
-          <p>No Downloads</p>
-        </div>
-        <ul v-else class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
-          <li v-for="download in downloadsDownloading" :key="download.id" class="text-gray-400 select-none relative px-4 py-5 border-b border-white border-opacity-10 bg-black bg-opacity-10">
-            <div class="flex items-center justify-center">
-              <div class="w-3/4">
-                <span class="text-xs">({{ downloadingProgress[download.id] || 0 }}%) {{ download.isPreparing ? 'Preparing' : 'Downloading' }}...</span>
-                <p class="font-normal truncate text-sm">{{ download.audiobook.book.title }}</p>
-              </div>
-              <div class="flex-grow" />
-
-              <div class="shadow-sm text-white flex items-center justify-center rounded-full animate-spin">
-                <span class="material-icons">refresh</span>
-              </div>
-            </div>
-          </li>
-          <li v-for="download in downloadsReady" :key="download.id" class="text-gray-50 select-none relative pr-4 pl-2 py-5 border-b border-white border-opacity-10" @click="jumpToAudiobook(download)">
-            <modals-downloads-download-item :download="download" @play="playDownload" @delete="clickDeleteDownload" />
-          </li>
-        </ul>
-      </template>
-      <template v-else>
-        <div class="w-full h-full">
-          <div class="w-full flex justify-around py-4 px-2">
-            <!-- <ui-btn small @click="searchFolder">Re-Scan</ui-btn> -->
-            <!-- <ui-btn small @click="changeDownloadFolderClick">Change Folder</ui-btn> -->
-            <ui-btn small color="error" @click="resetFolder">Reset</ui-btn>
-          </div>
-
-          <!-- Temp testing new folder scan results -->
-          <div v-for="mediaItem in localMediaItems" :key="mediaItem.contentUrl" class="flex py-2">
-            <div class="w-12 h-12 bg-primary">
-              <img v-if="mediaItem.coverPathSrc" :src="mediaItem.coverPathSrc" class="w-full h-full object-contain" />
-            </div>
-            <div class="flex-grow px-2">
-              <p>{{ mediaItem.name }}</p>
-              <p>{{ mediaItem.audioTracks.length }} Tracks</p>
-            </div>
-          </div>
-
-          <p v-if="isScanning" class="text-center my-8">Scanning Folder..</p>
-          <p v-else-if="!mediaScanResults" class="text-center my-8">No Files Found</p>
-          <div v-else>
-            <div v-for="mediaFolder in mediaScanResults.folders" :key="mediaFolder.uri" class="w-full px-2 py-2">
-              <div class="flex items-center">
-                <span class="material-icons text-base text-white text-opacity-50">folder</span>
-                <p class="ml-1 py-0.5">{{ mediaFolder.name }}</p>
-              </div>
-              <div v-for="mediaFile in mediaFolder.files" :key="mediaFile.uri" class="ml-3 flex items-center">
-                <span class="material-icons text-base text-white text-opacity-50">{{ mediaFile.isAudio ? 'music_note' : 'image' }}</span>
-                <p class="ml-1 py-0.5">{{ mediaFile.name }}</p>
-              </div>
-            </div>
-            <div v-for="mediaFile in mediaScanResults.files" :key="mediaFile.uri" class="w-full px-2 py-2">
-              <div class="flex items-center">
-                <span class="material-icons text-base text-white text-opacity-50">{{ mediaFile.isAudio ? 'music_note' : 'image' }}</span>
-                <p class="ml-1 py-0.5">{{ mediaFile.name }}</p>
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-    </div>
-  </div>
-</template>
-
-<script>
-import { Capacitor } from '@capacitor/core'
-import { Dialog } from '@capacitor/dialog'
-import AudioDownloader from '@/plugins/audio-downloader'
-import StorageManager from '@/plugins/storage-manager'
-
-export default {
-  data() {
-    return {
-      downloadingProgress: {},
-      totalSize: 0,
-      showingDownloads: true,
-      isScanning: false,
-      localMediaItems: [],
-      localFolders: []
-    }
-  },
-  computed: {
-    isIos() {
-      return this.$platform === 'ios'
-    },
-    isSocketConnected() {
-      return this.$store.state.socketConnected
-    },
-    hasStoragePermission() {
-      return this.$store.state.hasStoragePermission
-    },
-    downloadFolder() {
-      return this.$store.state.downloadFolder
-    },
-    downloadFolderSimplePath() {
-      return this.downloadFolder ? this.downloadFolder.simplePath : null
-    },
-    downloadFolderUri() {
-      return this.downloadFolder ? this.downloadFolder.uri : null
-    },
-    totalDownloads() {
-      return this.downloadsReady.length + this.downloadsDownloading.length
-    },
-    downloadsDownloading() {
-      return this.downloads.filter((d) => d.isDownloading || d.isPreparing)
-    },
-    downloadsReady() {
-      return this.downloads.filter((d) => !d.isDownloading && !d.isPreparing)
-    },
-    downloads() {
-      return this.$store.state.downloads.downloads
-    },
-    mediaScanResults() {
-      return this.$store.state.downloads.mediaScanResults
-    }
-  },
-  methods: {
-    async changeDownloadFolderClick() {
-      if (!this.hasStoragePermission) {
-        StorageManager.requestStoragePermission()
-      } else {
-        var folderObj = await StorageManager.selectFolder({ mediaType: 'book' })
-        if (folderObj.error) {
-          return this.$toast.error(`Error: ${folderObj.error || 'Unknown Error'}`)
-        }
-
-        var indexOfExisting = this.localFolders.findIndex((lf) => lf.id == folderObj.id)
-        if (indexOfExisting >= 0) {
-          this.localFolders.splice(indexOfExisting, 1, folderObj)
-        } else {
-          this.localFolders.push(folderObj)
-        }
-
-        var permissionsGood = await StorageManager.checkFolderPermissions({ folderUrl: folderObj.contentUrl })
-
-        if (!permissionsGood) {
-          this.$toast.error('Folder permissions failed')
-          return
-        } else {
-          this.$toast.success('Folder permission success')
-        }
-
-        // await this.$localStore.setDownloadFolder(folderObj)
-        await this.searchFolder(folderObj.id)
-
-        if (this.isSocketConnected) {
-          this.$store.dispatch('downloads/linkOrphanDownloads')
-        }
-      }
-    },
-    async searchFolder(folderId) {
-      this.isScanning = true
-      var response = await StorageManager.searchFolder({ folderId })
-
-      if (response && response.localMediaItems) {
-        this.localMediaItems = response.localMediaItems.map((mi) => {
-          if (mi.coverPath) {
-            mi.coverPathSrc = Capacitor.convertFileSrc(mi.coverPath)
-          }
-          return mi
-        })
-        console.log('Set Local Media Items', this.localMediaItems.length)
-      } else {
-        console.log('No Local media items found')
-      }
-      // var searchResults = response
-      // searchResults.folders = JSON.parse(searchResults.folders)
-      // searchResults.files = JSON.parse(searchResults.files)
-
-      // if (searchResults.folders.length) {
-      //   console.log('Search results folders length', searchResults.folders.length)
-
-      //   searchResults.folders = searchResults.folders.map((sr) => {
-      //     if (sr.files) {
-      //       sr.files = JSON.parse(sr.files)
-      //     }
-      //     return sr
-      //   })
-      //   this.$store.commit('downloads/setMediaScanResults', searchResults)
-      // } else {
-      //   this.$toast.warning('No audio or image files found')
-      // }
-      this.isScanning = false
-    },
-    async resetFolder() {
-      await this.$localStore.setDownloadFolder(null)
-      this.$store.commit('downloads/setMediaScanResults', {})
-      this.$toast.info('Unlinked Folder')
-    },
-    jumpToAudiobook(download) {
-      this.show = false
-      this.$router.push(`/audiobook/${download.id}`)
-    },
-    async clickDeleteDownload(download) {
-      const { value } = await Dialog.confirm({
-        title: 'Confirm',
-        message: 'Delete this download?'
-      })
-      if (value) {
-        this.deleteDownload(download)
-      }
-    },
-    playDownload(download) {
-      this.$store.commit('setPlayOnLoad', true)
-      this.$store.commit('setPlayingDownload', download)
-      this.show = false
-    },
-    async deleteDownload(download) {
-      console.log('Delete download', download.filename)
-
-      if (this.$store.state.playingDownload && this.$store.state.playingDownload.id === download.id) {
-        console.warn('Deleting download when currently playing download - terminate play')
-        if (this.$refs.streamContainer) {
-          this.$refs.streamContainer.cancelStream()
-        }
-      }
-      if (download.contentUrl) {
-        await StorageManager.delete(download)
-      }
-      this.$store.commit('downloads/removeDownload', download)
-    },
-    onDownloadProgress(data) {
-      var progress = data.progress
-      var audiobookId = data.audiobookId
-
-      var downloadObj = this.$store.getters['downloads/getDownload'](audiobookId)
-      if (downloadObj) {
-        this.$set(this.downloadingProgress, audiobookId, progress)
-      }
-    },
-    async init() {
-      this.localFolders = (await this.$db.getLocalFolders()) || []
-      AudioDownloader.addListener('onDownloadProgress', this.onDownloadProgress)
-    }
-  },
-  mounted() {
-    this.init()
-  },
-  beforeDestroy() {
-    AudioDownloader.removeListener('onDownloadProgress', this.onDownloadProgress)
-  }
-}
-</script>

pages/item/_id.vue

@@ -66,7 +66,6 @@
 </template>
 
 <script>
-import Path from 'path'
 import { Dialog } from '@capacitor/dialog'
 import AudioDownloader from '@/plugins/audio-downloader'
 import StorageManager from '@/plugins/storage-manager'
@@ -197,19 +196,10 @@ export default {
       if (!this.ebookFile) return null
       return this.ebookFile.ebookFormat
     },
-    // isDownloadPreparing() {
-    //   return this.downloadObj ? this.downloadObj.isPreparing : false
-    // },
     isDownloadPlayable() {
       return false
       // return this.downloadObj && !this.isDownloading && !this.isDownloadPreparing
     },
-    // downloadedCover() {
-    //   return this.downloadObj ? this.downloadObj.cover : null
-    // },
-    // downloadObj() {
-    //   return this.$store.getters['downloads/getDownload'](this.libraryItemId)
-    // },
     hasStoragePermission() {
       return this.$store.state.hasStoragePermission
     }
@@ -220,25 +210,8 @@ export default {
     },
     playClick() {
       this.$eventBus.$emit('play-item', this.libraryItem.id)
-
-      // this.$store.commit('setPlayOnLoad', true)
-      // if (!this.isDownloadPlayable) {
-      // Stream
-      // console.log('[PLAYCLICK] Set Playing STREAM ' + this.title)
-      // this.$store.commit('setStreamAudiobook', this.libraryItem)
-      // this.$server.socket.emit('open_stream', this.libraryItem.id)
-      // } else {
-      // Local
-      // console.log('[PLAYCLICK] Set Playing Local Download ' + this.title)
-      // this.$store.commit('setPlayingDownload', this.downloadObj)
-      // }
     },
     async clearProgressClick() {
-      // if (!this.$server.connected) {
-      //   this.$toast.info('Clear downloaded book progress not yet implemented')
-      //   return
-      // }
-
       const { value } = await Dialog.confirm({
         title: 'Confirm',
         message: 'Are you sure you want to reset your progress?'
@@ -327,33 +300,9 @@ export default {
       if (downloadRes.error) {
         var errorMsg = downloadRes.error || 'Unknown error'
         console.error('Download error', errorMsg)
-        this.$toast.update(download.toastId, { content: `Error: ${errorMsg}`, options: { timeout: 5000, type: 'error' } })
-        this.$store.commit('downloads/removeDownload', download)
+        this.$toast.error(errorMsg)
       }
-    },
-    async changeDownloadFolderClick() {
-      if (!this.hasStoragePermission) {
-        console.log('Requesting Storage Permission')
-        await StorageManager.requestStoragePermission()
-      } else {
-        var folderObj = await StorageManager.selectFolder()
-        if (folderObj.error) {
-          return this.$toast.error(`Error: ${folderObj.error || 'Unknown Error'}`)
-        }
-
-        var permissionsGood = await StorageManager.checkFolderPermissions({ folderUrl: folderObj.uri })
-        console.log('Storage Permission check folder ' + permissionsGood)
-
-        if (!permissionsGood) {
-          this.$toast.error('Folder permissions failed')
-          return
-        } else {
-          this.$toast.success('Folder permission success')
-        }
-
-        await this.$localStore.setDownloadFolder(folderObj)
-      }
-    },
+    }
     // async prepareDownload() {
     //   var audiobook = this.libraryItem
     //   if (!audiobook) {
@@ -451,34 +400,34 @@ export default {
     //     this.$store.commit('downloads/removeDownload', download)
     //   }
     // },
-    downloadReady(prepareDownload) {
-      var download = this.$store.getters['downloads/getDownload'](prepareDownload.audiobookId)
-      if (download) {
-        var fileext = prepareDownload.ext
-        var url = `${this.$store.state.serverUrl}/downloads/${prepareDownload.id}/${prepareDownload.filename}?token=${this.userToken}`
-        this.startDownload(url, fileext, download)
-      } else {
-        console.error('Prepare download killed but download not found', prepareDownload)
-      }
-    },
-    downloadKilled(prepareDownload) {
-      var download = this.$store.getters['downloads/getDownload'](prepareDownload.audiobookId)
-      if (download) {
-        this.$toast.update(download.toastId, { content: `Prepare download killed for "${download.audiobook.book.title}"`, options: { timeout: 5000, type: 'error' } })
-        this.$store.commit('downloads/removeDownload', download)
-      } else {
-        console.error('Prepare download killed but download not found', prepareDownload)
-      }
-    },
-    downloadFailed(prepareDownload) {
-      var download = this.$store.getters['downloads/getDownload'](prepareDownload.audiobookId)
-      if (download) {
-        this.$toast.update(download.toastId, { content: `Prepare download failed for "${download.audiobook.book.title}"`, options: { timeout: 5000, type: 'error' } })
-        this.$store.commit('downloads/removeDownload', download)
-      } else {
-        console.error('Prepare download failed but download not found', prepareDownload)
-      }
-    }
+    // downloadReady(prepareDownload) {
+    //   var download = this.$store.getters['downloads/getDownload'](prepareDownload.audiobookId)
+    //   if (download) {
+    //     var fileext = prepareDownload.ext
+    //     var url = `${this.$store.state.serverUrl}/downloads/${prepareDownload.id}/${prepareDownload.filename}?token=${this.userToken}`
+    //     this.startDownload(url, fileext, download)
+    //   } else {
+    //     console.error('Prepare download killed but download not found', prepareDownload)
+    //   }
+    // },
+    // downloadKilled(prepareDownload) {
+    //   var download = this.$store.getters['downloads/getDownload'](prepareDownload.audiobookId)
+    //   if (download) {
+    //     this.$toast.update(download.toastId, { content: `Prepare download killed for "${download.audiobook.book.title}"`, options: { timeout: 5000, type: 'error' } })
+    //     this.$store.commit('downloads/removeDownload', download)
+    //   } else {
+    //     console.error('Prepare download killed but download not found', prepareDownload)
+    //   }
+    // },
+    // downloadFailed(prepareDownload) {
+    //   var download = this.$store.getters['downloads/getDownload'](prepareDownload.audiobookId)
+    //   if (download) {
+    //     this.$toast.update(download.toastId, { content: `Prepare download failed for "${download.audiobook.book.title}"`, options: { timeout: 5000, type: 'error' } })
+    //     this.$store.commit('downloads/removeDownload', download)
+    //   } else {
+    //     console.error('Prepare download failed but download not found', prepareDownload)
+    //   }
+    // }
   },
   mounted() {
     // if (!this.$server.socket) {