Add:Sync local progress to server natively #74

android/app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.audiobookshelf.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 56
-        versionName "0.9.36-beta"
+        versionCode 58
+        versionName "0.9.38-beta"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/src/main/java/com/audiobookshelf/app/AudiobookProgressSyncer.kt

@@ -24,6 +24,7 @@ class AudiobookProgressSyncer constructor(playerNotificationService:PlayerNotifi
   var listeningTimerRunning:Boolean = false
 
   private var webviewOpenOnStart:Boolean = false
+  private var webviewClosedMidSession:Boolean = false
   private var listeningBookTitle:String? = ""
   private var listeningBookIsLocal:Boolean = false
   private var listeningBookId:String? = ""
@@ -54,9 +55,16 @@ class AudiobookProgressSyncer constructor(playerNotificationService:PlayerNotifi
     listeningTimerTask = Timer("ListeningTimer", false).schedule(0L, 5000L) {
       Handler(Looper.getMainLooper()).post() {
         // Webview was closed while android auto is open - switch to native sync
-        if (!playerNotificationService.getIsWebviewOpen() && webviewOpenOnStart) {
+        var isWebviewOpen = playerNotificationService.getIsWebviewOpen()
+        if (!isWebviewOpen && webviewOpenOnStart) {
           Log.d(tag, "Listening Timer: webview closed Switching to native sync tracking")
           webviewOpenOnStart = false
+          webviewClosedMidSession = true
+          lastUpdateTime = System.currentTimeMillis() / 1000L
+        } else if (isWebviewOpen && webviewClosedMidSession) {
+          Log.d(tag, "Listening Timer: webview re-opened Switching back to webview sync tracking")
+          webviewClosedMidSession = false
+          webviewOpenOnStart = true
           lastUpdateTime = System.currentTimeMillis() / 1000L
         }
         if (!webviewOpenOnStart && playerNotificationService.currentPlayer.isPlaying) {
@@ -97,7 +105,7 @@ class AudiobookProgressSyncer constructor(playerNotificationService:PlayerNotifi
       // Send sync data only for streaming books
       var syncData: JSObject = JSObject()
       syncData.put("timeListened", elapsed)
-      syncData.put("currentTime", playerNotificationService.getCurrentTime())
+      syncData.put("currentTime", playerNotificationService.getCurrentTime() / 1000)
       syncData.put("streamId", listeningStreamId)
       syncData.put("audiobookId", listeningBookId)
       sendStreamSyncData(syncData) {
@@ -106,9 +114,36 @@ class AudiobookProgressSyncer constructor(playerNotificationService:PlayerNotifi
     } else if (listeningStreamId == "download") {
       // TODO: Save downloaded audiobook progress & send to server if connected
       Log.d(tag, "ListeningTimer: Is listening download")
+
+      // Send sync data only for local books
+      var syncData: JSObject = JSObject()
+      var duration = playerNotificationService.getAudiobookDuration() / 1000
+      var currentTime = playerNotificationService.getCurrentTime() / 1000
+      syncData.put("totalDuration", duration)
+      syncData.put("currentTime", currentTime)
+      syncData.put("progress", if (duration > 0) (currentTime / duration) else 0)
+      syncData.put("isRead", false)
+      syncData.put("lastUpdate", System.currentTimeMillis())
+      syncData.put("audiobookId", listeningBookId)
+      sendLocalSyncData(syncData) {
+        Log.d(tag, "Local sync done")
+      }
     }
   }
 
+  fun sendLocalSyncData(payload:JSObject, cb: (() -> Unit)) {
+    var serverUrl = playerNotificationService.getServerUrl()
+    var token = playerNotificationService.getUserToken()
+
+    if (serverUrl == "" || token == "") {
+      return
+    }
+
+    Log.d(tag, "Sync Local $serverUrl | $token")
+    var url = "$serverUrl/api/syncLocal"
+    sendServerRequest(url, token, payload, cb)
+  }
+
   fun sendStreamSyncData(payload:JSObject, cb: (() -> Unit)) {
     var serverUrl = playerNotificationService.getServerUrl()
     var token = playerNotificationService.getUserToken()
@@ -119,7 +154,10 @@ class AudiobookProgressSyncer constructor(playerNotificationService:PlayerNotifi
 
     Log.d(tag, "Sync Stream $serverUrl | $token")
     var url = "$serverUrl/api/syncStream"
+    sendServerRequest(url, token, payload, cb)
+  }
 
+  fun sendServerRequest(url:String, token:String, payload:JSObject, cb: () -> Unit) {
     val mediaType = "application/json; charset=utf-8".toMediaType()
     val requestBody = payload.toString().toRequestBody(mediaType)
     val request = Request.Builder().post(requestBody)

android/app/src/main/java/com/audiobookshelf/app/PlayerNotificationService.kt

@@ -648,8 +648,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
           Log.d(tag, "Playing ${getCurrentBookTitle()} | ${currentPlayer.mediaMetadata.title} | ${currentPlayer.mediaMetadata.displayTitle}")
           if (player.isPlaying) {
             audiobookProgressSyncer.start()
-          }
-          if (!player.isPlaying && audiobookProgressSyncer.listeningTimerRunning) {
+          } else {
             audiobookProgressSyncer.stop()
           }
 
@@ -674,19 +673,29 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
 
     // Issue with onenote plus crashing when using local cover art. https://github.com/advplyr/audiobookshelf-app/issues/35
     if (currentAudiobookStreamData?.coverUri != null && currentAudiobookStreamData?.isLocal == true) {
-      try {
-        Log.d(tag, "CHECKING COVER ${currentAudiobookStreamData?.coverUri}")
-        var file = DocumentFile.fromTreeUri(ctx, currentAudiobookStreamData!!.coverUri)
-        Log.d(tag, "GOT FILE ${file?.name} | ${file?.type} | Can Read: ${file?.canRead()} |isExternalStorageDocument:  ${file?.isExternalStorageDocument}")
-        if (file?.canRead() !== true) {
-          Log.d(tag, "Invalid cover: no read access")
-          currentAudiobookStreamData?.clearCover()
-        }
-      } catch(e:Exception) {
-        Log.d(tag, "Invalid cover: Failed to read local cover file $e")
+      var deviceName = Build.DEVICE
+      var deviceMan = Build.MANUFACTURER
+      var deviceModel = Build.MODEL
+      Log.d(tag, "Checking device $deviceName | Model $deviceModel | Manufacturer $deviceMan")
+      if (deviceMan.toLowerCase().contains("oneplus") || deviceName.toLowerCase().contains("oneplus")) {
+        Log.d(tag, "Detected OnePlus device - removing local cover")
         currentAudiobookStreamData?.clearCover()
-        e.printStackTrace()
       }
+
+      // OnePlus devices were showing valid permissions for image
+//      try {
+//        Log.d(tag, "CHECKING COVER ${currentAudiobookStreamData?.coverUri}")
+//        var file = DocumentFile.fromTreeUri(ctx, currentAudiobookStreamData!!.coverUri)
+//        Log.d(tag, "GOT FILE ${file?.name} | ${file?.type} | Can Read: ${file?.canRead()} |isExternalStorageDocument:  ${file?.isExternalStorageDocument}")
+//        if (file?.canRead() !== true) {
+//          Log.d(tag, "Invalid cover: no read access")
+//          currentAudiobookStreamData?.clearCover()
+//        }
+//      } catch(e:Exception) {
+//        Log.d(tag, "Invalid cover: Failed to read local cover file $e")
+//        currentAudiobookStreamData?.clearCover()
+//        e.printStackTrace()
+//      }
     }
 
     var metadata = currentAudiobookStreamData!!.getMediaMetadataCompat()
@@ -774,6 +783,12 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
     return currentAudiobookStreamData?.id
   }
 
+  // The duration stored on the audiobook
+  fun getAudiobookDuration() : Long {
+    if (currentAudiobookStreamData == null) return 0L
+    return currentAudiobookStreamData!!.duration
+  }
+
   fun getServerUrl(): String {
     return audiobookManager.serverUrl
   }

components/app/AudioPlayer.vue

@@ -185,15 +185,20 @@ export default {
       return this.book.authorFL
     },
     chapters() {
-      return this.audiobook ? this.audiobook.chapters || [] : []
+      return (this.audiobook ? this.audiobook.chapters || [] : []).map((chapter) => {
+        var chap = { ...chapter }
+        chap.start = Number(chap.start)
+        chap.end = Number(chap.end)
+        return chap
+      })
     },
     currentChapter() {
       if (!this.audiobook || !this.chapters.length) return null
-      return this.chapters.find((ch) => Number(ch.start.toFixed(2)) <= this.currentTime && Number(ch.end.toFixed(2)) > this.currentTime)
+      return this.chapters.find((ch) => Number(Number(ch.start).toFixed(2)) <= this.currentTime && Number(Number(ch.end).toFixed(2)) > this.currentTime)
     },
     nextChapter() {
       if (!this.chapters.length) return
-      return this.chapters.find((c) => Number(c.start.toFixed(2)) > this.currentTime)
+      return this.chapters.find((c) => Number(Number(c.start).toFixed(2)) > this.currentTime)
     },
     currentChapterTitle() {
       return this.currentChapter ? this.currentChapter.title : ''
@@ -336,7 +341,7 @@ export default {
 
       // If 1 second or less into current chapter, then go to previous
       if (this.currentTime - this.currentChapter.start <= 1) {
-        var currChapterIndex = this.chapters.findIndex((ch) => ch.start <= this.currentTime && ch.end >= this.currentTime)
+        var currChapterIndex = this.chapters.findIndex((ch) => Number(ch.start) <= this.currentTime && Number(ch.end) >= this.currentTime)
         if (currChapterIndex > 0) {
           var prevChapter = this.chapters[currChapterIndex - 1]
           this.seek(prevChapter.start)

components/app/AudioPlayerContainer.vue

@@ -78,7 +78,7 @@ export default {
     },
     currentChapter() {
       if (!this.audiobook || !this.chapters.length) return null
-      return this.chapters.find((ch) => ch.start <= this.currentTime && ch.end > this.currentTime)
+      return this.chapters.find((ch) => Number(ch.start) <= this.currentTime && Number(ch.end) > this.currentTime)
     },
     socketConnected() {
       return this.$store.state.socketConnected

components/bookshelf/LazyBookshelf.vue

@@ -319,7 +319,6 @@ export default {
       if (this.isFirstInit) return
       this.isFirstInit = true
       this.initSizeData()
-
       await this.loadPage(0)
       var lastBookIndex = Math.min(this.totalEntities, this.shelvesPerPage * this.entitiesPerShelf)
       this.mountEntites(0, lastBookIndex)

layouts/default.vue

@@ -56,7 +56,8 @@ export default {
         this.initSocketListeners()
 
         // Load libraries
-        this.$store.dispatch('libraries/load')
+        await this.$store.dispatch('libraries/load')
+        this.$eventBus.$emit('library-changed')
         this.$store.dispatch('libraries/fetch', this.currentLibraryId)
       } else {
         this.removeSocketListeners()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-app",
-  "version": "0.9.36-beta",
+  "version": "0.9.38-beta",
   "author": "advplyr",
   "scripts": {
     "dev": "nuxt --hostname localhost --port 1337",

pages/bookshelf/index.vue

@@ -18,10 +18,7 @@
             <span class="material-icons text-error text-lg">cloud_off</span>
             <p class="pl-2 text-error text-sm">Audiobookshelf server not connected.</p>
           </div>
-          <p class="px-4 text-center text-error absolute bottom-12 left-0 right-0 mx-auto">
-            <strong>Important!</strong> This app requires that you are running
-            <u>your own server</u> and does not provide any content.
-          </p>
+          <p class="px-4 text-center text-error absolute bottom-12 left-0 right-0 mx-auto"><strong>Important!</strong> This app requires that you are running <u>your own server</u> and does not provide any content.</p>
         </div>
         <div class="flex justify-center">
           <ui-btn v-if="!isSocketConnected" small @click="$router.push('/connect')" class="w-32">Connect</ui-btn>
@@ -136,7 +133,7 @@ export default {
       this.shelves = categories
     },
     async socketInit(isConnected) {
-      if (isConnected) {
+      if (isConnected && this.currentLibraryId) {
         console.log('Connected - Load from server')
         await this.fetchCategories()
       } else {
@@ -146,8 +143,7 @@ export default {
       this.loading = false
     },
     async libraryChanged(libid) {
-      console.log('Library changed', libid)
-      if (this.isSocketConnected) {
+      if (this.isSocketConnected && this.currentLibraryId) {
         await this.fetchCategories()
       } else {
         this.shelves = this.downloadOnlyShelves
@@ -246,7 +242,7 @@ export default {
   },
   mounted() {
     this.initListeners()
-    if (this.$server.initialized) {
+    if (this.$server.initialized && this.currentLibraryId) {
       this.fetchCategories()
     } else {
       this.shelves = this.downloadOnlyShelves

pages/downloads.vue

@@ -31,26 +31,22 @@
           <p>No Downloads</p>
         </div>
         <ul v-else class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
-          <template v-for="download in downloadsDownloading">
-            <li :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>
+          <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>
-            </li>
-          </template>
-          <template v-for="download in downloadsReady">
-            <li :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>
-          </template>
+              <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>
@@ -62,29 +58,26 @@
           </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>
-          <template v-else>
-            <template v-for="mediaFolder in mediaScanResults.folders">
-              <div :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 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>
-            </template>
-            <template v-for="mediaFile in mediaScanResults.files">
-              <div :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 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>
-            </template>
-          </template>
+            </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>

plugins/sqlStore.js

@@ -23,7 +23,6 @@ class StoreService {
   init() {
     this.platform = Capacitor.getPlatform()
     this.store = CapacitorDataStorageSqlite
-    console.log('in init ', this.platform)
   }
 
   /**

store/audiobooks.js

@@ -18,7 +18,7 @@ export const getters = {
       console.error('No book item id', bookItem)
     }
     if (process.env.NODE_ENV !== 'production') { // Testing
-      return `http://localhost:3333/api/books/${bookItem.id}/cover?token=${userToken}&ts=${bookLastUpdate}`
+      // return `http://localhost:3333/api/books/${bookItem.id}/cover?token=${userToken}&ts=${bookLastUpdate}`
     }
 
     var url = new URL(`/api/books/${bookItem.id}/cover`, rootState.serverUrl)

store/libraries.js

@@ -2,7 +2,7 @@ export const state = () => ({
   libraries: [],
   lastLoad: 0,
   listeners: [],
-  currentLibraryId: 'main',
+  currentLibraryId: '',
   showModal: false,
   folders: [],
   folderLastUpdate: 0,
@@ -65,17 +65,23 @@ export const actions = {
       return false
     }
 
-    this.$axios
+    return this.$axios
       .$get(`/api/libraries`)
       .then((data) => {
+        // Set current library
+        if (data.length) {
+          commit('setCurrentLibrary', data[0].id)
+        }
+
         commit('set', data)
         commit('setLastLoad')
+        return true
       })
       .catch((error) => {
         console.error('Failed', error)
         commit('set', [])
+        return false
       })
-    return true
   },
 
 }