diff --git a/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDatabase.kt b/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDatabase.kt index cf1d8222..0a16d887 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDatabase.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDatabase.kt @@ -5,10 +5,7 @@ import com.audiobookshelf.app.MainActivity import com.audiobookshelf.app.device.DeviceManager import com.audiobookshelf.app.server.ApiHandler import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.getcapacitor.JSObject -import com.getcapacitor.Plugin -import com.getcapacitor.PluginCall -import com.getcapacitor.PluginMethod +import com.getcapacitor.* import com.getcapacitor.annotation.CapacitorPlugin import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope @@ -202,6 +199,27 @@ class AbsDatabase : Plugin() { } } + @PluginMethod + fun updateLocalTrackOrder(call:PluginCall) { + var localLibraryItemId = call.getString("localLibraryItemId", "") ?: "" + var localLibraryItem = DeviceManager.dbManager.getLocalLibraryItem(localLibraryItemId) + if (localLibraryItem == null) { + call.resolve() + return + } + + var tracks:JSArray = call.getArray("tracks") ?: JSArray() + Log.d(tag, "updateLocalTrackOrder $tracks") + + for (i in 0..tracks.length()) { + var track = tracks.getJSONObject(i) + var localFileId = track.getString("localFileId") + Log.d(tag, "LOCAL FILE ID $localFileId") + } + + call.resolve() + } + // // Generic Webview calls to db // diff --git a/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDownloader.kt b/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDownloader.kt index 75c56558..ce17a0d2 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDownloader.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDownloader.kt @@ -100,8 +100,9 @@ class AbsDownloader : Plugin() { fun downloadLibraryItem(call: PluginCall) { var libraryItemId = call.data.getString("libraryItemId").toString() var episodeId = call.data.getString("episodeId").toString() + if (episodeId == "null") episodeId = "" var localFolderId = call.data.getString("localFolderId").toString() - Log.d(tag, "Download library item $libraryItemId to folder $localFolderId") + Log.d(tag, "Download library item $libraryItemId to folder $localFolderId / episode: $episodeId") var downloadId = if (episodeId.isNullOrEmpty()) libraryItemId else "$libraryItemId-$episodeId" if (downloadQueue.find { it.id == downloadId } != null) { diff --git a/components/app/Appbar.vue b/components/app/Appbar.vue index b7fe929d..c42cece6 100644 --- a/components/app/Appbar.vue +++ b/components/app/Appbar.vue @@ -8,11 +8,9 @@ arrow_back
-
- - - -

{{ currentLibraryName }}

+
+ +

{{ currentLibraryName }}

@@ -45,6 +43,9 @@ export default { currentLibraryName() { return this.currentLibrary ? this.currentLibrary.name : 'Main' }, + currentLibraryIcon() { + return this.currentLibrary ? this.currentLibrary.icon : 'database' + }, showBack() { if (!this.$route.name) return true return this.$route.name !== 'index' && !this.$route.name.startsWith('bookshelf') diff --git a/components/cards/AuthorCard.vue b/components/cards/AuthorCard.vue index b8106ce9..65773719 100644 --- a/components/cards/AuthorCard.vue +++ b/components/cards/AuthorCard.vue @@ -1,5 +1,5 @@