Version bump v2.12.2

Translations update from Hosted Weblate

client/components/modals/changelog/ViewModal.vue

@@ -6,10 +6,15 @@
       </div>
     </template>
     <div class="px-8 py-6 w-full rounded-lg bg-bg shadow-lg border border-black-300 relative overflow-y-scroll" style="max-height: 80vh">
-      <p class="text-xl font-bold pb-4">
-        Changelog <a :href="currentTagUrl" target="_blank" class="hover:underline">v{{ currentVersionNumber }}</a> ({{ currentVersionPubDate }})
-      </p>
-      <div class="custom-text" v-html="compiledMarkedown" />
+      <template v-for="release in releasesToShow">
+        <div :key="release.name">
+          <p class="text-xl font-bold pb-4">
+            Changelog <a :href="`https://github.com/advplyr/audiobookshelf/releases/tag/${release.name}`" target="_blank" class="hover:underline">{{ release.name }}</a> ({{ $formatDate(release.pubdate, dateFormat) }})
+          </p>
+          <div class="custom-text" v-html="getChangelog(release)" />
+        </div>
+        <div v-if="release !== releasesToShow[releasesToShow.length - 1]" class="border-b border-black-300 my-8" />
+      </template>
     </div>
   </modals-modal>
 </template>
@@ -37,24 +42,15 @@ export default {
     dateFormat() {
       return this.$store.state.serverSettings.dateFormat
     },
-    changelog() {
-      return this.versionData?.currentVersionChangelog || 'No Changelog Available'
-    },
-    compiledMarkedown() {
-      return marked.parse(this.changelog, { gfm: true, breaks: true })
-    },
-    currentVersionPubDate() {
-      if (!this.versionData?.currentVersionPubDate) return 'Unknown release date'
-      return `${this.$formatDate(this.versionData.currentVersionPubDate, this.dateFormat)}`
-    },
-    currentTagUrl() {
-      return this.versionData?.currentTagUrl
-    },
-    currentVersionNumber() {
-      return this.$config.version
+    releasesToShow() {
+      return this.versionData?.releasesToShow || []
+    }
+  },
+  methods: {
+    getChangelog(release) {
+      return marked.parse(release.changelog || 'No Changelog Available', { gfm: true, breaks: true })
     }
   },
-  methods: {},
   mounted() {}
 }
 </script>

client/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.12.1",
+  "version": "2.12.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "audiobookshelf-client",
-      "version": "2.12.1",
+      "version": "2.12.2",
       "license": "ISC",
       "dependencies": {
         "@nuxtjs/axios": "^5.13.6",

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.12.1",
+  "version": "2.12.2",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast client",
   "main": "index.js",

client/plugins/version.js

@@ -11,6 +11,7 @@ function parseSemver(ver) {
       return null
     }
     return {
+      name: ver,
       total,
       version: groups[2],
       major: Number(groups[3]),
@@ -24,49 +25,61 @@ function parseSemver(ver) {
   return null
 }
 
+function getReleases() {
+  return axios
+    .get(`https://api.github.com/repos/advplyr/audiobookshelf/releases`)
+    .then((res) => {
+      return res.data
+        .map((release) => {
+          const tagName = release.tag_name
+          const verObj = parseSemver(tagName)
+          if (verObj) {
+            verObj.pubdate = new Date(release.published_at)
+            verObj.changelog = release.body
+            return verObj
+          }
+          return null
+        })
+        .filter((verObj) => verObj)
+    })
+    .catch((error) => {
+      console.error('Failed to get releases', error)
+      return []
+    })
+}
+
 export const currentVersion = packagejson.version
 
 export async function checkForUpdate() {
   if (!packagejson.version) {
     return null
   }
-  var currVerObj = parseSemver('v' + packagejson.version)
-  if (!currVerObj) {
-    console.error('Invalid version', packagejson.version)
-    return null
-  }
-  var largestVer = null
-  await axios.get(`https://api.github.com/repos/advplyr/audiobookshelf/releases`).then((res) => {
-    var releases = res.data
-    if (releases && releases.length) {
-      releases.forEach((release) => {
-        var tagName = release.tag_name
-        var verObj = parseSemver(tagName)
-        if (verObj) {
-          if (!largestVer || largestVer.total < verObj.total) {
-            largestVer = verObj
-          }
-        }
 
-        if (verObj.version == currVerObj.version) {
-          currVerObj.pubdate = new Date(release.published_at)
-          currVerObj.changelog = release.body
-        }
-      })
-    }
-  })
-  if (!largestVer) {
-    console.error('No valid version tags to compare with')
+  const releases = await getReleases()
+  if (!releases.length) {
+    console.error('No releases found')
     return null
   }
 
+  const currentVersion = releases.find((release) => release.version == packagejson.version)
+  if (!currentVersion) {
+    console.error('Current version not found in releases')
+    return null
+  }
+
+  const latestVersion = releases[0]
+  const currentVersionMinor = currentVersion.minor
+  const currentVersionMajor = currentVersion.major
+  // Show all releases with the same minor version and lower or equal total version
+  const releasesToShow = releases.filter((release) => {
+    return release.major == currentVersionMajor && release.minor == currentVersionMinor && release.total <= currentVersion.total
+  })
+
   return {
-    hasUpdate: largestVer.total > currVerObj.total,
-    latestVersion: largestVer.version,
-    githubTagUrl: `https://github.com/advplyr/audiobookshelf/releases/tag/v${largestVer.version}`,
-    currentVersion: currVerObj.version,
-    currentTagUrl: `https://github.com/advplyr/audiobookshelf/releases/tag/v${currVerObj.version}`,
-    currentVersionPubDate: currVerObj.pubdate,
-    currentVersionChangelog: currVerObj.changelog
+    hasUpdate: latestVersion.total > currentVersion.total,
+    latestVersion: latestVersion.version,
+    githubTagUrl: `https://github.com/advplyr/audiobookshelf/releases/tag/v${latestVersion.version}`,
+    currentVersion: currentVersion.version,
+    releasesToShow
   }
 }

client/store/index.js

@@ -32,33 +32,33 @@ export const state = () => ({
 })
 
 export const getters = {
-  getServerSetting: state => key => {
+  getServerSetting: (state) => (key) => {
     if (!state.serverSettings) return null
     return state.serverSettings[key]
   },
-  getLibraryItemIdStreaming: state => {
+  getLibraryItemIdStreaming: (state) => {
     return state.streamLibraryItem?.id || null
   },
   getIsStreamingFromDifferentLibrary: (state, getters, rootState) => {
     if (!state.streamLibraryItem) return false
     return state.streamLibraryItem.libraryId !== rootState.libraries.currentLibraryId
   },
-  getIsMediaStreaming: state => (libraryItemId, episodeId) => {
+  getIsMediaStreaming: (state) => (libraryItemId, episodeId) => {
     if (!state.streamLibraryItem) return null
     if (!episodeId) return state.streamLibraryItem.id == libraryItemId
     return state.streamLibraryItem.id == libraryItemId && state.streamEpisodeId == episodeId
   },
-  getIsMediaQueued: state => (libraryItemId, episodeId) => {
-    return state.playerQueueItems.some(i => {
+  getIsMediaQueued: (state) => (libraryItemId, episodeId) => {
+    return state.playerQueueItems.some((i) => {
       if (!episodeId) return i.libraryItemId === libraryItemId
       return i.libraryItemId === libraryItemId && i.episodeId === episodeId
     })
   },
-  getBookshelfView: state => {
+  getBookshelfView: (state) => {
     if (!state.serverSettings || isNaN(state.serverSettings.bookshelfView)) return Constants.BookshelfView.STANDARD
     return state.serverSettings.bookshelfView
   },
-  getHomeBookshelfView: state => {
+  getHomeBookshelfView: (state) => {
     if (!state.serverSettings || isNaN(state.serverSettings.homeBookshelfView)) return Constants.BookshelfView.STANDARD
     return state.serverSettings.homeBookshelfView
   }
@@ -69,17 +69,20 @@ export const actions = {
     const updatePayload = {
       ...payload
     }
-    return this.$axios.$patch('/api/settings', updatePayload).then((result) => {
-      if (result.success) {
-        commit('setServerSettings', result.serverSettings)
-        return true
-      } else {
+    return this.$axios
+      .$patch('/api/settings', updatePayload)
+      .then((result) => {
+        if (result.success) {
+          commit('setServerSettings', result.serverSettings)
+          return true
+        } else {
+          return false
+        }
+      })
+      .catch((error) => {
+        console.error('Failed to update server settings', error)
         return false
-      }
-    }).catch((error) => {
-      console.error('Failed to update server settings', error)
-      return false
-    })
+      })
   },
   checkForUpdate({ commit }) {
     const VERSION_CHECK_BUFF = 1000 * 60 * 5 // 5 minutes
@@ -96,7 +99,7 @@ export const actions = {
     }
 
     var shouldCheckForUpdate = Date.now() - Number(lastVerCheck) > VERSION_CHECK_BUFF
-    if (!shouldCheckForUpdate && savedVersionData && savedVersionData.version !== currentVersion) {
+    if (!shouldCheckForUpdate && savedVersionData && (savedVersionData.version !== currentVersion || !savedVersionData.releasesToShow)) {
       // Version mismatch between saved data so check for update anyway
       shouldCheckForUpdate = true
     }
@@ -180,7 +183,7 @@ export const mutations = {
     })
   },
   addItemToQueue(state, item) {
-    const exists = state.playerQueueItems.some(i => {
+    const exists = state.playerQueueItems.some((i) => {
       if (!i.episodeId) return i.libraryItemId === item.libraryItemId
       return i.libraryItemId === item.libraryItemId && i.episodeId === item.episodeId
     })

client/strings/fi.json

@@ -88,6 +88,7 @@
   "ButtonShow": "Näytä",
   "ButtonStartM4BEncode": "Aloita M4B enkoodaus",
   "ButtonStartMetadataEmbed": "Aloita metadatan embed",
+  "ButtonStats": "Tilastot",
   "ButtonSubmit": "Lähetä",
   "ButtonTest": "Testi",
   "ButtonUpload": "Lähetä palvelimelle",
@@ -120,66 +121,158 @@
   "HeaderDetails": "Yksityiskohdat",
   "HeaderDownloadQueue": "Latausjono",
   "HeaderEbookFiles": "E-kirjatiedostot",
+  "HeaderEmail": "Sähköposti",
+  "HeaderEmailSettings": "Sähköpostiasetukset",
   "HeaderEpisodes": "Jaksot",
+  "HeaderEreaderDevices": "E-lukijalaitteet",
   "HeaderEreaderSettings": "E-lukijan asetukset",
+  "HeaderFiles": "Tiedostot",
+  "HeaderIgnoredFiles": "Ohitetut tiedostot",
   "HeaderLatestEpisodes": "Viimeisimmät jaksot",
   "HeaderLibraries": "Kirjastot",
+  "HeaderLibraryFiles": "Kirjaston tiedostot",
+  "HeaderLibraryStats": "Kirjaston tilastot",
+  "HeaderListeningStats": "Kuuntelutilastot",
+  "HeaderLogs": "Lokit",
+  "HeaderNewAccount": "Uusi tili",
+  "HeaderNewLibrary": "Uusi kirjasto",
+  "HeaderNotifications": "Ilmoitukset",
   "HeaderOpenRSSFeed": "Avaa RSS-syöte",
+  "HeaderOtherFiles": "Muut tiedostot",
+  "HeaderPermissions": "Käyttöoikeudet",
   "HeaderPlaylist": "Soittolista",
+  "HeaderPlaylistItems": "Soittolistan kohteet",
   "HeaderRSSFeedGeneral": "RSS yksityiskohdat",
   "HeaderRSSFeedIsOpen": "RSS syöte on avoinna",
+  "HeaderRemoveEpisode": "Poista jakso",
+  "HeaderRemoveEpisodes": "Poista {0} jaksoa",
+  "HeaderSchedule": "Ajoita",
+  "HeaderScheduleLibraryScans": "Ajoita automaattiset kirjastoskannaukset",
+  "HeaderSetBackupSchedule": "Aseta varmuuskopiointiaikataulu",
   "HeaderSettings": "Asetukset",
+  "HeaderSettingsExperimental": "Kokeelliset ominaisuudet",
   "HeaderSleepTimer": "Uniajastin",
   "HeaderStatsMinutesListeningChart": "Kuunteluminuutit (viim. 7 pv)",
   "HeaderStatsRecentSessions": "Viimeaikaiset istunnot",
   "HeaderTableOfContents": "Sisällysluettelo",
+  "HeaderTools": "Työkalut",
+  "HeaderUsers": "Käyttäjät",
   "HeaderYourStats": "Tilastosi",
+  "LabelAccountType": "Tilin tyyppi",
+  "LabelAccountTypeGuest": "Vieras",
+  "LabelAccountTypeUser": "Käyttäjä",
+  "LabelActivity": "Toiminta",
+  "LabelAddToCollection": "Lisää kokoelmaan",
+  "LabelAddToCollectionBatch": "Lisää {0} kirjaa kokoelmaan",
   "LabelAddToPlaylist": "Lisää soittolistaan",
+  "LabelAddToPlaylistBatch": "Lisää {0} kohdetta soittolistaan",
   "LabelAdded": "Lisätty",
   "LabelAddedAt": "Lisätty listalle",
   "LabelAll": "Kaikki",
+  "LabelAllUsers": "Kaikki käyttäjät",
+  "LabelAllUsersExcludingGuests": "Kaikki käyttäjät vieraita lukuun ottamatta",
+  "LabelAllUsersIncludingGuests": "Kaikki käyttäjät mukaan lukien vieraat",
   "LabelAuthor": "Tekijä",
   "LabelAuthorFirstLast": "Tekijä (Etunimi Sukunimi)",
   "LabelAuthorLastFirst": "Tekijä (Sukunimi, Etunimi)",
   "LabelAuthors": "Tekijät",
   "LabelAutoDownloadEpisodes": "Lataa jaksot automaattisesti",
+  "LabelBackupsEnableAutomaticBackups": "Ota automaattinen varmuuskopiointi käyttöön",
+  "LabelBackupsEnableAutomaticBackupsHelp": "Varmuuskopiot tallennettu kansioon /metadata/backups",
+  "LabelBackupsMaxBackupSize": "Varmuuskopion enimmäiskoko (Gt) (0 rajaton)",
+  "LabelBackupsNumberToKeep": "Säilytettävien varmuuskopioiden määrä",
   "LabelBooks": "Kirjat",
+  "LabelButtonText": "Painikkeen teksti",
+  "LabelChangePassword": "Vaihda salasana",
   "LabelChapters": "Luvut",
+  "LabelClickForMoreInfo": "Napsauta saadaksesi lisätietoja",
   "LabelClosePlayer": "Sulje soitin",
+  "LabelCodec": "Koodekki",
   "LabelCollapseSeries": "Pienennä sarja",
+  "LabelCollection": "Kokoelma",
+  "LabelCollections": "Kokoelmat",
   "LabelComplete": "Valmis",
+  "LabelConfirmPassword": "Vahvista salasana",
   "LabelContinueListening": "Jatka kuuntelua",
   "LabelContinueReading": "Jatka lukemista",
   "LabelContinueSeries": "Jatka sarjoja",
+  "LabelCover": "Kansikuva",
+  "LabelCoverImageURL": "Kansikuvan URL-osoite",
+  "LabelCurrent": "Nykyinen",
   "LabelDescription": "Kuvaus",
+  "LabelDevice": "Laite",
+  "LabelDeviceInfo": "Laitteen tiedot",
   "LabelDownload": "Lataa",
+  "LabelDownloadNEpisodes": "Lataa {0} jaksoa",
   "LabelDuration": "Kesto",
   "LabelEbook": "E-kirja",
   "LabelEbooks": "E-kirjat",
+  "LabelEdit": "Muokkaa",
+  "LabelEmail": "Sähköposti",
   "LabelEnable": "Ota käyttöön",
+  "LabelEndOfChapter": "Luvun loppu",
+  "LabelEpisode": "Jakso",
   "LabelFile": "Tiedosto",
   "LabelFileBirthtime": "Tiedoston syntymäaika",
   "LabelFileModified": "Muutettu tiedosto",
   "LabelFilename": "Tiedostonimi",
   "LabelFolder": "Kansio",
+  "LabelInProgress": "Kesken",
+  "LabelIncomplete": "Keskeneräinen",
   "LabelLanguage": "Kieli",
+  "LabelListenAgain": "Kuuntele uudelleen",
+  "LabelMediaType": "Mediatyyppi",
   "LabelMore": "Lisää",
+  "LabelMoreInfo": "Lisätietoja",
+  "LabelName": "Nimi",
   "LabelNarrator": "Lukija",
   "LabelNarrators": "Lukijat",
   "LabelNewestAuthors": "Uusimmat kirjailijat",
   "LabelNewestEpisodes": "Uusimmat jaksot",
   "LabelPassword": "Salasana",
   "LabelPath": "Polku",
+  "LabelPodcast": "Podcast",
+  "LabelPodcasts": "Podcastit",
+  "LabelPublishYear": "Julkaisuvuosi",
+  "LabelRSSFeedPreventIndexing": "Estä indeksointi",
   "LabelRead": "Lue",
   "LabelReadAgain": "Lue uudelleen",
+  "LabelRecentSeries": "Viimeisimmät sarjat",
+  "LabelRecentlyAdded": "Viimeeksi lisätyt",
   "LabelSeason": "Kausi",
+  "LabelSetEbookAsPrimary": "Aseta ensisijaiseksi",
+  "LabelSetEbookAsSupplementary": "Aseta täydentäväksi",
   "LabelShowAll": "Näytä kaikki",
   "LabelSize": "Koko",
   "LabelSleepTimer": "Uniajastin",
+  "LabelStatsDailyAverage": "Päivittäinen keskiarvo",
+  "LabelStatsInARow": "peräjälkeen",
+  "LabelStatsMinutes": "minuuttia",
   "LabelTheme": "Teema",
   "LabelThemeDark": "Tumma",
   "LabelThemeLight": "Kirkas",
+  "LabelTimeRemaining": "{0} jäljellä",
+  "LabelType": "Tyyppi",
   "LabelUser": "Käyttäjä",
   "LabelUsername": "Käyttäjätunnus",
-  "MessageDownloadingEpisode": "Ladataan jaksoa"
+  "LabelYourBookmarks": "Kirjanmerkkisi",
+  "LabelYourProgress": "Edistymisesi",
+  "MessageDownloadingEpisode": "Ladataan jaksoa",
+  "MessageEpisodesQueuedForDownload": "{0} jaksoa on latausjonossa",
+  "MessageFetching": "Haetaan...",
+  "MessageLoading": "Ladataan...",
+  "MessageMarkAsFinished": "Merkitse valmiiksi",
+  "MessageNoBookmarks": "Ei kirjanmerkkejä",
+  "MessageNoItems": "Ei kohteita",
+  "MessageNoItemsFound": "Kohteita ei löytynyt",
+  "MessageNoPodcastsFound": "Podcasteja ei löytynyt",
+  "MessageNoUserPlaylists": "Sinulla ei ole soittolistoja",
+  "MessageReportBugsAndContribute": "Ilmoita virheistä, toivo ominaisuuksia ja osallistu",
+  "ToastBookmarkCreateFailed": "Kirjanmerkin luominen epäonnistui",
+  "ToastBookmarkRemoveFailed": "Kirjanmerkin poistaminen epäonnistui",
+  "ToastBookmarkUpdateFailed": "Kirjanmerkin päivittäminen epäonnistui",
+  "ToastItemMarkedAsFinishedFailed": "Valmiiksi merkitseminen epäonnistui",
+  "ToastPlaylistCreateFailed": "Soittolistan luominen epäonnistui",
+  "ToastPodcastCreateFailed": "Podcastin luominen epäonnistui",
+  "ToastPodcastCreateSuccess": "Podcastin luominen onnistui"
 }

client/strings/fr.json

@@ -37,7 +37,7 @@
   "ButtonJumpForward": "Avancer",
   "ButtonLatest": "Dernière version",
   "ButtonLibrary": "Bibliothèque",
-  "ButtonLogout": "Me déconnecter",
+  "ButtonLogout": "Déconnexion",
   "ButtonLookup": "Chercher",
   "ButtonManageTracks": "Gérer les pistes",
   "ButtonMapChapterTitles": "Correspondance des titres de chapitres",
@@ -59,7 +59,7 @@
   "ButtonPurgeItemsCache": "Purger le cache des éléments",
   "ButtonQueueAddItem": "Ajouter à la liste de lecture",
   "ButtonQueueRemoveItem": "Supprimer de la liste de lecture",
-  "ButtonQuickEmbedMetadata": "Ajoutez rapidement des métadonnées",
+  "ButtonQuickEmbedMetadata": "Ajouter rapidement des métadonnées",
   "ButtonQuickMatch": "Recherche rapide",
   "ButtonReScan": "Nouvelle analyse",
   "ButtonRead": "Lire",
@@ -285,7 +285,7 @@
   "LabelEmail": "Courriel",
   "LabelEmailSettingsFromAddress": "Expéditeur",
   "LabelEmailSettingsRejectUnauthorized": "Rejeter les certificats non autorisés",
-  "LabelEmailSettingsRejectUnauthorizedHelp": "Désactiver la validation du certificat SSL peut exposer votre connexion à des risques de sécurité, tels que des attaques de type « man-in-the-middle ». Ne désactivez cette option que si vous en comprenez les implications et si vous faites confiance au serveur de messagerie auquel vous vous connectez.",
+  "LabelEmailSettingsRejectUnauthorizedHelp": "Désactiver la validation du certificat SSL peut exposer votre connexion à des risques de sécurité, tels que des attaques de type « Attaque de l’homme du milieu ». Ne désactivez cette option que si vous en comprenez les implications et si vous faites confiance au serveur de messagerie auquel vous vous connectez.",
   "LabelEmailSettingsSecure": "Sécurisé",
   "LabelEmailSettingsSecureHelp": "Si vous activez cette option, TLS sera utiliser lors de la connexion au serveur. Sinon, TLS est utilisé uniquement si le serveur supporte l’extension STARTTLS. Dans la plupart des cas, activez l’option, vous vous connecterai sur le port 465. Pour le port 587 ou 25, désactiver l’option. (source : nodemailer.com/smtp/#authentication)",
   "LabelEmailSettingsTestAddress": "Adresse de test",
@@ -454,7 +454,7 @@
   "LabelRSSFeedSlug": "Balise URL du flux RSS",
   "LabelRSSFeedURL": "Adresse du flux RSS",
   "LabelRandomly": "Au hasard",
-  "LabelReAddSeriesToContinueListening": "Ajoutez à nouveau la série pour continuer à l’écouter",
+  "LabelReAddSeriesToContinueListening": "Ajouter à nouveau la série pour continuer à l’écouter",
   "LabelRead": "Lire",
   "LabelReadAgain": "Lire à nouveau",
   "LabelReadEbookWithoutProgress": "Lire le livre numérique sans sauvegarder la progression",
@@ -616,7 +616,7 @@
   "LabelYearReviewShow": "Afficher le bilan de l’année",
   "LabelYourAudiobookDuration": "Durée de vos livres audios",
   "LabelYourBookmarks": "Vos favoris",
-  "LabelYourPlaylists": "Vos listes de lecture",
+  "LabelYourPlaylists": "Mes listes de lecture",
   "LabelYourProgress": "Votre progression",
   "MessageAddToPlayerQueue": "Ajouter en file d’attente",
   "MessageAppriseDescription": "Nécessite une instance d’<a href=\"https://github.com/caronc/apprise-api\" target=\"_blank\">API Apprise</a> pour utiliser cette fonctionnalité ou une api qui prend en charge les mêmes requêtes.<br />L’URL de l’API Apprise doit comprendre le chemin complet pour envoyer la notification. Par exemple, si votre instance écoute sur <code>http://192.168.1.1:8337</code> alors vous devez mettre <code>http://192.168.1.1:8337/notify</code>.",

client/strings/zh-cn.json

@@ -89,7 +89,7 @@
   "ButtonShow": "显示",
   "ButtonStartM4BEncode": "开始 M4B 编码",
   "ButtonStartMetadataEmbed": "开始嵌入元数据",
-  "ButtonStats": "状态",
+  "ButtonStats": "统计数据",
   "ButtonSubmit": "提交",
   "ButtonTest": "测试",
   "ButtonUpload": "上传",

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "audiobookshelf",
-  "version": "2.12.1",
+  "version": "2.12.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "audiobookshelf",
-      "version": "2.12.1",
+      "version": "2.12.2",
       "license": "GPL-3.0",
       "dependencies": {
         "axios": "^0.27.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "2.12.1",
+  "version": "2.12.2",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast server",
   "main": "index.js",

server/Server.js

@@ -41,7 +41,6 @@ const LibraryScanner = require('./scanner/LibraryScanner')
 //Import the main Passport and Express-Session library
 const passport = require('passport')
 const expressSession = require('express-session')
-const MemoryStore = require('./libs/memorystore')(expressSession)
 
 class Server {
   constructor(SOURCE, PORT, HOST, CONFIG_PATH, METADATA_PATH, ROUTER_BASE_PATH) {
@@ -219,12 +218,7 @@ class Server {
         cookie: {
           // also send the cookie if were are not on https (not every use has https)
           secure: false
-        },
-        store: new MemoryStore({
-          checkPeriod: 86400000, // prune expired entries every 24h
-          ttl: 86400000, // 24h
-          max: 1000
-        })
+        }
       })
     )
     // init passport.js

server/managers/ApiCacheManager.js

@@ -3,8 +3,7 @@ const Logger = require('../Logger')
 const Database = require('../Database')
 
 class ApiCacheManager {
-
-  defaultCacheOptions = { max: 1000, maxSize: 10 * 1000 * 1000, sizeCalculation: item => (item.body.length + JSON.stringify(item.headers).length) }
+  defaultCacheOptions = { max: 1000, maxSize: 10 * 1000 * 1000, sizeCalculation: (item) => item.body.length + JSON.stringify(item.headers).length }
   defaultTtlOptions = { ttl: 30 * 60 * 1000 }
 
   constructor(cache = new LRUCache(this.defaultCacheOptions), ttlOptions = this.defaultTtlOptions) {
@@ -14,7 +13,7 @@ class ApiCacheManager {
 
   init(database = Database) {
     let hooks = ['afterCreate', 'afterUpdate', 'afterDestroy', 'afterBulkCreate', 'afterBulkUpdate', 'afterBulkDestroy', 'afterUpsert']
-    hooks.forEach(hook => database.sequelize.addHook(hook, (model) => this.clear(model, hook)))
+    hooks.forEach((hook) => database.sequelize.addHook(hook, (model) => this.clear(model, hook)))
   }
 
   clear(model, hook) {
@@ -33,7 +32,16 @@ class ApiCacheManager {
   }
 
   get middleware() {
+    /**
+     * @param {import('express').Request} req
+     * @param {import('express').Response} res
+     * @param {import('express').NextFunction} next
+     */
     return (req, res, next) => {
+      if (req.query.sort === 'random') {
+        Logger.debug(`[ApiCacheManager] Skipping cache for random sort`)
+        return next()
+      }
       const key = { user: req.user.username, url: req.url }
       const stringifiedKey = JSON.stringify(key)
       Logger.debug(`[ApiCacheManager] count: ${this.cache.size} size: ${this.cache.calculatedSize}`)
@@ -61,4 +69,4 @@ class ApiCacheManager {
     }
   }
 }
-module.exports = ApiCacheManager
+module.exports = ApiCacheManager

server/utils/ffmpegHelpers.js

@@ -104,7 +104,7 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
       method: 'GET',
       responseType: 'stream',
       headers: {
-        'User-Agent': 'audiobookshelf (+https://audiobookshelf.org; like iTMS)'
+        'User-Agent': 'audiobookshelf (+https://audiobookshelf.org)'
       },
       timeout: 30000
     }).catch((error) => {

server/utils/fileUtils.js

@@ -15,7 +15,7 @@ const { AudioMimeType } = require('./constants')
  */
 const filePathToPOSIX = (path) => {
   if (!global.isWin || !path) return path
-  return path.replace(/\\/g, '/')
+  return path.startsWith('\\\\') ? '\\\\' + path.slice(2).replace(/\\/g, '/') : path.replace(/\\/g, '/')
 }
 module.exports.filePathToPOSIX = filePathToPOSIX
 
@@ -169,7 +169,7 @@ async function recurseFiles(path, relPathToReplace = null) {
     extensions: true,
     deep: true,
     realPath: true,
-    normalizePath: true
+    normalizePath: false
   }
   let list = await rra.list(path, options)
   if (list.error) {
@@ -186,6 +186,8 @@ async function recurseFiles(path, relPathToReplace = null) {
         return false
       }
 
+      item.fullname = filePathToPOSIX(item.fullname)
+      item.path = filePathToPOSIX(item.path)
       const relpath = item.fullname.replace(relPathToReplace, '')
       let reldirname = Path.dirname(relpath)
       if (reldirname === '.') reldirname = ''

test/server/managers/ApiCacheManager.test.js

@@ -11,8 +11,8 @@ describe('ApiCacheManager', () => {
   let manager
 
   beforeEach(() => {
-    cache = { get: sinon.stub(), set: sinon.spy() } 
-    req = { user: { username: 'testUser' }, url: '/test-url' }
+    cache = { get: sinon.stub(), set: sinon.spy() }
+    req = { user: { username: 'testUser' }, url: '/test-url', query: {} }
     res = { send: sinon.spy(), getHeaders: sinon.stub(), statusCode: 200, status: sinon.spy(), set: sinon.spy() }
     next = sinon.spy()
   })
@@ -94,4 +94,4 @@ describe('ApiCacheManager', () => {
       expect(res.originalSend.calledWith(body)).to.be.true
     })
   })
-})
+})