Merge branch 'master' of https://github.com/advplyr/audiobookshelf

client/components/app/MediaPlayerContainer.vue

@@ -55,7 +55,7 @@
       @showPlayerQueueItems="showPlayerQueueItemsModal = true"
     />
 
-    <modals-bookmarks-modal v-model="showBookmarksModal" :bookmarks="bookmarks" :current-time="bookmarkCurrentTime" :library-item-id="libraryItemId" @select="selectBookmark" />
+    <modals-bookmarks-modal v-model="showBookmarksModal" :bookmarks="bookmarks" :current-time="bookmarkCurrentTime" :playback-rate="currentPlaybackRate" :library-item-id="libraryItemId" @select="selectBookmark" />
 
     <modals-sleep-timer-modal v-model="showSleepTimerModal" :timer-set="sleepTimerSet" :timer-type="sleepTimerType" :remaining="sleepTimerRemaining" :has-chapters="!!chapters.length" @set="setSleepTimer" @cancel="cancelSleepTimer" @increment="incrementSleepTimer" @decrement="decrementSleepTimer" />
 

client/components/modals/BookmarksModal.vue

@@ -5,24 +5,26 @@
         <p class="text-3xl text-white truncate">{{ $strings.LabelYourBookmarks }}</p>
       </div>
     </template>
-    <div ref="container" class="w-full rounded-lg bg-bg box-shadow-md overflow-y-auto overflow-x-hidden" style="max-height: 80vh">
-      <div v-if="show" class="w-full h-full">
+    <div v-if="show" class="w-full rounded-lg bg-bg box-shadow-md relative" style="max-height: 80vh">
+      <div v-if="bookmarks.length" class="h-full max-h-[calc(80vh-60px)] w-full relative overflow-y-auto overflow-x-hidden">
         <template v-for="bookmark in bookmarks">
-          <modals-bookmarks-bookmark-item :key="bookmark.id" :highlight="currentTime === bookmark.time" :bookmark="bookmark" @click="clickBookmark" @update="submitUpdateBookmark" @delete="deleteBookmark" />
+          <modals-bookmarks-bookmark-item :key="bookmark.id" :highlight="currentTime === bookmark.time" :bookmark="bookmark" :playback-rate="playbackRate" @click="clickBookmark" @delete="deleteBookmark" />
         </template>
-        <div v-if="!bookmarks.length" class="flex h-32 items-center justify-center">
-          <p class="text-xl">{{ $strings.MessageNoBookmarks }}</p>
-        </div>
-        <div v-if="!hideCreate" class="w-full h-px bg-white bg-opacity-10" />
-        <form v-if="!hideCreate" @submit.prevent="submitCreateBookmark">
-          <div v-show="canCreateBookmark" class="flex px-4 py-2 items-center text-center border-b border-white border-opacity-10 text-white text-opacity-80">
+      </div>
+      <div v-else class="flex h-32 items-center justify-center">
+        <p class="text-xl">{{ $strings.MessageNoBookmarks }}</p>
+      </div>
+
+      <div v-if="canCreateBookmark && !hideCreate" class="w-full border-t border-white/10">
+        <form @submit.prevent="submitCreateBookmark">
+          <div class="flex px-4 py-2 items-center text-center border-b border-white border-opacity-10 text-white text-opacity-80">
             <div class="w-16 max-w-16 text-center">
               <p class="text-sm font-mono text-gray-400">
-                {{ this.$secondsToTimestamp(currentTime) }}
+                {{ this.$secondsToTimestamp(currentTime / playbackRate) }}
               </p>
             </div>
             <div class="flex-grow px-2">
-              <ui-text-input v-model="newBookmarkTitle" placeholder="Note" class="w-full" />
+              <ui-text-input v-model="newBookmarkTitle" placeholder="Note" class="w-full h-10" />
             </div>
             <ui-btn type="submit" color="success" :padding-x="4" class="h-10"><span class="material-symbols text-2xl -mt-px">add</span></ui-btn>
           </div>
@@ -45,6 +47,7 @@ export default {
       default: 0
     },
     libraryItemId: String,
+    playbackRate: Number,
     hideCreate: Boolean
   },
   data() {
@@ -57,6 +60,7 @@ export default {
   watch: {
     show(newVal) {
       if (newVal) {
+        this.selectedBookmark = null
         this.showBookmarkTitleInput = false
         this.newBookmarkTitle = ''
       }
@@ -72,7 +76,7 @@ export default {
       }
     },
     canCreateBookmark() {
-      return !this.bookmarks.find((bm) => bm.time === this.currentTime)
+      return !this.bookmarks.find((bm) => Math.abs(this.currentTime - bm.time) < 1)
     },
     dateFormat() {
       return this.$store.state.serverSettings.dateFormat
@@ -102,19 +106,6 @@ export default {
     clickBookmark(bm) {
       this.$emit('select', bm)
     },
-    submitUpdateBookmark(updatedBookmark) {
-      var bookmark = { ...updatedBookmark }
-      this.$axios
-        .$patch(`/api/me/item/${this.libraryItemId}/bookmark`, bookmark)
-        .then(() => {
-          this.$toast.success(this.$strings.ToastBookmarkUpdateSuccess)
-        })
-        .catch((error) => {
-          this.$toast.error(this.$strings.ToastFailedToUpdate)
-          console.error(error)
-        })
-      this.show = false
-    },
     submitCreateBookmark() {
       if (!this.newBookmarkTitle) {
         this.newBookmarkTitle = this.$formatDatetime(Date.now(), this.dateFormat, this.timeFormat)

client/components/modals/bookmarks/BookmarkItem.vue

@@ -1,16 +1,16 @@
 <template>
-  <div class="flex items-center px-4 py-4 justify-start relative bg-primary hover:bg-opacity-25" :class="wrapperClass" @click.stop="click" @mouseover="mouseover" @mouseleave="mouseleave">
+  <div class="flex items-center px-4 py-4 justify-start relative hover:bg-primary/10" :class="wrapperClass" @click.stop="click" @mouseover="mouseover" @mouseleave="mouseleave">
     <div class="w-16 max-w-16 text-center">
       <p class="text-sm font-mono text-gray-400">
-        {{ this.$secondsToTimestamp(bookmark.time) }}
+        {{ this.$secondsToTimestamp(bookmark.time / playbackRate) }}
       </p>
     </div>
     <div class="flex-grow overflow-hidden px-2">
       <template v-if="isEditing">
         <form @submit.prevent="submitUpdate">
           <div class="flex items-center">
             <div class="flex-grow pr-2">
-              <ui-text-input v-model="newBookmarkTitle" placeholder="Note" class="w-full" />
+              <ui-text-input v-model="newBookmarkTitle" placeholder="Note" class="w-full h-10" />
             </div>
             <ui-btn type="submit" color="success" :padding-x="4" class="h-10"><span class="material-symbols text-2xl -mt-px">forward</span></ui-btn>
             <div class="pl-2 flex items-center">
@@ -35,7 +35,8 @@ export default {
       type: Object,
       default: () => {}
     },
-    highlight: Boolean
+    highlight: Boolean,
+    playbackRate: Number
   },
   data() {
     return {
@@ -83,11 +84,19 @@ export default {
       if (this.newBookmarkTitle === this.bookmark.title) {
         return this.cancelEditing()
       }
-      var bookmark = { ...this.bookmark }
+      const bookmark = { ...this.bookmark }
       bookmark.title = this.newBookmarkTitle
-      this.$emit('update', bookmark)
+
+      this.$axios
+        .$patch(`/api/me/item/${bookmark.libraryItemId}/bookmark`, bookmark)
+        .then(() => {
+          this.isEditing = false
+        })
+        .catch((error) => {
+          this.$toast.error(this.$strings.ToastFailedToUpdate)
+          console.error(error)
+        })
     }
-  },
-  mounted() {}
+  }
 }
 </script>

client/pages/item/_id/index.vue

@@ -141,7 +141,7 @@
     </div>
 
     <modals-podcast-episode-feed v-model="showPodcastEpisodeFeed" :library-item="libraryItem" :episodes="podcastFeedEpisodes" />
-    <modals-bookmarks-modal v-model="showBookmarksModal" :bookmarks="bookmarks" :library-item-id="libraryItemId" hide-create @select="selectBookmark" />
+    <modals-bookmarks-modal v-model="showBookmarksModal" :bookmarks="bookmarks" :playback-rate="1" :library-item-id="libraryItemId" hide-create @select="selectBookmark" />
   </div>
 </template>
 

client/strings/bg.json

@@ -725,7 +725,6 @@
   "ToastBookmarkCreateFailed": "Неуспешно създаване на отметка",
   "ToastBookmarkCreateSuccess": "Отметката е създадена",
   "ToastBookmarkRemoveSuccess": "Отметката е премахната",
-  "ToastBookmarkUpdateSuccess": "Отметката е обновена",
   "ToastChaptersHaveErrors": "Главите имат грешки",
   "ToastChaptersMustHaveTitles": "Главите трябва да имат заглавия",
   "ToastCollectionRemoveSuccess": "Колекцията е премахната",

client/strings/bn.json

@@ -952,7 +952,6 @@
   "ToastBookmarkCreateFailed": "বুকমার্ক তৈরি করতে ব্যর্থ",
   "ToastBookmarkCreateSuccess": "বুকমার্ক যোগ করা হয়েছে",
   "ToastBookmarkRemoveSuccess": "বুকমার্ক সরানো হয়েছে",
-  "ToastBookmarkUpdateSuccess": "বুকমার্ক আপডেট করা হয়েছে",
   "ToastCachePurgeFailed": "ক্যাশে পরিষ্কার করতে ব্যর্থ হয়েছে",
   "ToastCachePurgeSuccess": "ক্যাশে সফলভাবে পরিষ্কার করা হয়েছে",
   "ToastChaptersHaveErrors": "অধ্যায়ে ত্রুটি আছে",

client/strings/ca.json

@@ -898,7 +898,6 @@
   "ToastBookmarkCreateFailed": "Error en crear marcador",
   "ToastBookmarkCreateSuccess": "Marcador afegit",
   "ToastBookmarkRemoveSuccess": "Marcador eliminat",
-  "ToastBookmarkUpdateSuccess": "Marcador actualitzat",
   "ToastCachePurgeFailed": "Error en purgar la memòria cau",
   "ToastCachePurgeSuccess": "Memòria cau purgada amb èxit",
   "ToastChaptersHaveErrors": "Els capítols tenen errors",

client/strings/cs.json

@@ -947,7 +947,6 @@
   "ToastBookmarkCreateFailed": "Vytvoření záložky se nezdařilo",
   "ToastBookmarkCreateSuccess": "Přidána záložka",
   "ToastBookmarkRemoveSuccess": "Záložka odstraněna",
-  "ToastBookmarkUpdateSuccess": "Záložka aktualizována",
   "ToastCachePurgeFailed": "Nepodařilo se vyčistit mezipaměť",
   "ToastCachePurgeSuccess": "Vyrovnávací paměť úspěšně vyčištěna",
   "ToastChaptersHaveErrors": "Kapitoly obsahují chyby",

client/strings/da.json

@@ -37,6 +37,8 @@
   "ButtonHide": "Skjul",
   "ButtonHome": "Hjem",
   "ButtonIssues": "Problemer",
+  "ButtonJumpBackward": "Hop Tilbage",
+  "ButtonJumpForward": "Hop Fremad",
   "ButtonLatest": "Seneste",
   "ButtonLibrary": "Bibliotek",
   "ButtonLogout": "Log ud",
@@ -46,52 +48,77 @@
   "ButtonMatchAllAuthors": "Match alle forfattere",
   "ButtonMatchBooks": "Match bøger",
   "ButtonNevermind": "Glem det",
+  "ButtonNext": "Næste",
+  "ButtonNextChapter": "Næste Kapitel",
+  "ButtonNextItemInQueue": "Næste Element i Køen",
   "ButtonOk": "OK",
   "ButtonOpenFeed": "Åbn feed",
   "ButtonOpenManager": "Åbn manager",
   "ButtonPause": "Pause",
   "ButtonPlay": "Afspil",
+  "ButtonPlayAll": "Afspil Alle",
   "ButtonPlaying": "Afspiller",
   "ButtonPlaylists": "Afspilningslister",
+  "ButtonPrevious": "Sidste",
+  "ButtonPreviousChapter": "Sidste Kapitel",
+  "ButtonProbeAudioFile": "Undersøg Lydfil",
   "ButtonPurgeAllCache": "Ryd al cache",
   "ButtonPurgeItemsCache": "Ryd elementcache",
   "ButtonQueueAddItem": "Tilføj til kø",
   "ButtonQueueRemoveItem": "Fjern fra kø",
+  "ButtonQuickEmbed": "Hurtig Indlejring",
+  "ButtonQuickEmbedMetadata": "Hurtig Indlejring af Metadata",
   "ButtonQuickMatch": "Hurtig Match",
   "ButtonReScan": "Gen-scan",
   "ButtonRead": "Læs",
+  "ButtonRefresh": "Genindlæs",
   "ButtonRemove": "Fjern",
   "ButtonRemoveAll": "Fjern Alle",
   "ButtonRemoveAllLibraryItems": "Fjern Alle Bibliotekselementer",
   "ButtonRemoveFromContinueListening": "Fjern fra Fortsæt Lytning",
   "ButtonRemoveFromContinueReading": "Fjern fra Fortsæt Læsning",
   "ButtonRemoveSeriesFromContinueSeries": "Fjern Serie fra Fortsæt Serie",
   "ButtonReset": "Nulstil",
+  "ButtonResetToDefault": "Nulstil til standard",
   "ButtonRestore": "Gendan",
   "ButtonSave": "Gem",
   "ButtonSaveAndClose": "Gem & Luk",
   "ButtonSaveTracklist": "Gem Sporliste",
+  "ButtonScan": "Scan",
   "ButtonScanLibrary": "Scan Bibliotek",
+  "ButtonScrollLeft": "Rul til Venstre",
+  "ButtonScrollRight": "Rul til Højre",
   "ButtonSearch": "Søg",
   "ButtonSelectFolderPath": "Vælg Mappen Sti",
   "ButtonSeries": "Serier",
   "ButtonSetChaptersFromTracks": "Sæt kapitler fra spor",
+  "ButtonShare": "Del",
   "ButtonShiftTimes": "Skift Tider",
   "ButtonShow": "Vis",
   "ButtonStartM4BEncode": "Start M4B Kode",
   "ButtonStartMetadataEmbed": "Start Metadata Indlejring",
+  "ButtonStats": "Statistik",
   "ButtonSubmit": "Send",
+  "ButtonTest": "Test",
+  "ButtonUnlinkOpenId": "Afkobl OpenID",
+  "ButtonUpload": "Upload",
+  "ButtonUploadBackup": "Upload Backup",
   "ButtonUploadCover": "Upload Omslag",
   "ButtonUploadOPMLFile": "Upload OPML Fil",
   "ButtonUserDelete": "Slet bruger {0}",
   "ButtonUserEdit": "Rediger bruger {0}",
   "ButtonViewAll": "Vis Alle",
   "ButtonYes": "Ja",
+  "ErrorUploadFetchMetadataAPI": "Fejl henter metadata",
+  "ErrorUploadFetchMetadataNoResults": "Kunne ikke hente metadata - prøv at uploade title og/eller forfatter",
+  "ErrorUploadLacksTitle": "Skal have en title",
   "HeaderAccount": "Konto",
+  "HeaderAddCustomMetadataProvider": "Tilføj Brugerdefineret Metadataudbyder",
   "HeaderAdvanced": "Avanceret",
   "HeaderAppriseNotificationSettings": "Apprise Notifikationsindstillinger",
   "HeaderAudioTracks": "Lydspor",
   "HeaderAudiobookTools": "Audiobog Filhåndteringsværktøjer",
+  "HeaderAuthentication": "Autentificering",
   "HeaderBackups": "Sikkerhedskopier",
   "HeaderChangePassword": "Skift Adgangskode",
   "HeaderChapters": "Kapitler",
@@ -100,9 +127,12 @@
   "HeaderCollectionItems": "Samlingselementer",
   "HeaderCover": "Omslag",
   "HeaderCurrentDownloads": "Nuværende Downloads",
+  "HeaderCustomMessageOnLogin": "Brugerdefineret Besked ved Login",
+  "HeaderCustomMetadataProviders": "Brugerdefineret Metadataudbyder",
   "HeaderDetails": "Detaljer",
   "HeaderDownloadQueue": "Download Kø",
   "HeaderEbookFiles": "E-bogsfiler",
+  "HeaderEmail": "Email",
   "HeaderEmailSettings": "Email Indstillinger",
   "HeaderEpisodes": "Episoder",
   "HeaderEreaderDevices": "E-læser Enheder",
@@ -120,33 +150,47 @@
   "HeaderListeningSessions": "Lyttesessioner",
   "HeaderListeningStats": "Lyttestatistik",
   "HeaderLogin": "Log ind",
+  "HeaderLogs": "Logs",
   "HeaderManageGenres": "Administrer Genrer",
   "HeaderManageTags": "Administrer Tags",
   "HeaderMapDetails": "Kort Detaljer",
+  "HeaderMatch": "Match",
+  "HeaderMetadataOrderOfPrecedence": "Metadata-prioritet",
   "HeaderMetadataToEmbed": "Metadata til indlejring",
   "HeaderNewAccount": "Ny Konto",
   "HeaderNewLibrary": "Nyt Bibliotek",
+  "HeaderNotificationCreate": "Opret Notifikation",
+  "HeaderNotificationUpdate": "Updater Notifikation",
   "HeaderNotifications": "Meddelelser",
+  "HeaderOpenIDConnectAuthentication": "OpenID Connect-autentificering",
+  "HeaderOpenListeningSessions": "Åbne lyttesessioner",
   "HeaderOpenRSSFeed": "Åbn RSS Feed",
   "HeaderOtherFiles": "Andre Filer",
+  "HeaderPasswordAuthentication": "Adgangskodeautentificering",
   "HeaderPermissions": "Tilladelser",
   "HeaderPlayerQueue": "Afspilningskø",
+  "HeaderPlayerSettings": "Afspiller Indstillinger",
   "HeaderPlaylist": "Afspilningsliste",
   "HeaderPlaylistItems": "Afspilningsliste Elementer",
   "HeaderPodcastsToAdd": "Podcasts til Tilføjelse",
   "HeaderPreviewCover": "Forhåndsvis Omslag",
   "HeaderRSSFeedGeneral": "RSS Detaljer",
   "HeaderRSSFeedIsOpen": "RSS Feed er Åben",
+  "HeaderRSSFeeds": "RSS-Feeds",
   "HeaderRemoveEpisode": "Fjern Episode",
   "HeaderRemoveEpisodes": "Fjern {0} Episoder",
   "HeaderSavedMediaProgress": "Gemt Medieforløb",
   "HeaderSchedule": "Planlæg",
+  "HeaderScheduleEpisodeDownloads": "Planlæg Automatisk Episode-Download",
   "HeaderScheduleLibraryScans": "Planlæg Automatiske Biblioteksscanninger",
+  "HeaderSession": "Session",
   "HeaderSetBackupSchedule": "Indstil Sikkerhedskopieringsplan",
   "HeaderSettings": "Indstillinger",
   "HeaderSettingsDisplay": "Skærm",
   "HeaderSettingsExperimental": "Eksperimentelle Funktioner",
   "HeaderSettingsGeneral": "Generelt",
+  "HeaderSettingsScanner": "Scanner",
+  "HeaderSettingsWebClient": "Webklient",
   "HeaderSleepTimer": "Søvntimer",
   "HeaderStatsLargestItems": "Største Elementer",
   "HeaderStatsLongestItems": "Længste Elementer (timer)",
@@ -161,7 +205,12 @@
   "HeaderUpdateDetails": "Opdater Detaljer",
   "HeaderUpdateLibrary": "Opdater Bibliotek",
   "HeaderUsers": "Brugere",
+  "HeaderYearReview": "Gennemgang af År {0}",
   "HeaderYourStats": "Dine Statistikker",
+  "LabelAbridged": "Forkortet",
+  "LabelAbridgedChecked": "Forkortet (kontrolleret)",
+  "LabelAbridgedUnchecked": "Uforkortet (ikke kontrolleret)",
+  "LabelAccessibleBy": "Tilgængelig af",
   "LabelAccountType": "Kontotype",
   "LabelAccountTypeAdmin": "Administrator",
   "LabelAccountTypeGuest": "Gæst",
@@ -172,15 +221,26 @@
   "LabelAddToPlaylist": "Tilføj til Afspilningsliste",
   "LabelAddToPlaylistBatch": "Tilføj {0} Elementer til Afspilningsliste",
   "LabelAddedAt": "Tilføjet Kl.",
+  "LabelAdminUsersOnly": "Kun Administratorbrugere",
   "LabelAll": "Alle",
   "LabelAllUsers": "Alle Brugere",
+  "LabelAllUsersExcludingGuests": "Alle bruger eksklusiv gæster",
+  "LabelAllUsersIncludingGuests": "Alle bruger inklusiv gæster",
   "LabelAlreadyInYourLibrary": "Allerede i dit bibliotek",
+  "LabelApiToken": "API Token",
   "LabelAppend": "Tilføj",
+  "LabelAudioBitrate": "Lydbitrate (f.eks. 128k)",
+  "LabelAudioChannels": "Lydkanaler (1 eller 2)",
+  "LabelAudioCodec": "Lydkodek",
   "LabelAuthor": "Forfatter",
   "LabelAuthorFirstLast": "Forfatter (Fornavn Efternavn)",
   "LabelAuthorLastFirst": "Forfatter (Efternavn, Fornavn)",
   "LabelAuthors": "Forfattere",
   "LabelAutoDownloadEpisodes": "Auto Download Episoder",
+  "LabelAutoFetchMetadata": "Automatisk Hent Metadata",
+  "LabelAutoFetchMetadataHelp": "Henter metadata for titler, forfatter og serier for at strømligne uploading. Ekstra metadata har måske brug for at blive matchet efter upload.",
+  "LabelAutoLaunch": "Åben Automatisk",
+  "LabelAutoLaunchDescription": "Viderestil automatisk til login-udbyderen ved navigation til login-siden (manuel overstyring via <code>/login?autoLaunch=0</code>)",
   "LabelBackToUser": "Tilbage til Bruger",
   "LabelBackupLocation": "Backup Placering",
   "LabelBackupsEnableAutomaticBackups": "Aktivér automatisk sikkerhedskopiering",
@@ -190,6 +250,7 @@
   "LabelBackupsNumberToKeep": "Antal sikkerhedskopier at beholde",
   "LabelBackupsNumberToKeepHelp": "Kun 1 sikkerhedskopi fjernes ad gangen, så hvis du allerede har flere sikkerhedskopier end dette, skal du fjerne dem manuelt.",
   "LabelBooks": "Bøger",
+  "LabelByAuthor": "af {0}",
   "LabelChangePassword": "Ændre Adgangskode",
   "LabelChannels": "Kanaler",
   "LabelChapterTitle": "Kapitel Titel",
@@ -636,7 +697,6 @@
   "ToastBookmarkCreateFailed": "Mislykkedes oprettelse af bogmærke",
   "ToastBookmarkCreateSuccess": "Bogmærke tilføjet",
   "ToastBookmarkRemoveSuccess": "Bogmærke fjernet",
-  "ToastBookmarkUpdateSuccess": "Bogmærke opdateret",
   "ToastChaptersHaveErrors": "Kapitler har fejl",
   "ToastChaptersMustHaveTitles": "Kapitler skal have titler",
   "ToastCollectionRemoveSuccess": "Samling fjernet",