Merge remote-tracking branch 'remotes/upstream/master'

Timtam · Nov 18, 2024 · 951290b · 951290b
2 parents 430e0f5 + 22f85d3
commit 951290b
Show file tree

Hide file tree

Showing 53 changed files with 1,127 additions and 220 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -1,11 +1,25 @@
-name: "CodeQL"
+name: 'CodeQL'
 
 on:
   push:
-    branches: [ 'master' ]
+    branches: ['master']
+    # Only build when files in these directories have been changed
+    paths:
+      - client/**
+      - server/**
+      - test/**
+      - index.js
+      - package.json
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ 'master' ]
+    branches: ['master']
+    # Only build when files in these directories have been changed
+    paths:
+      - client/**
+      - server/**
+      - test/**
+      - index.js
+      - package.json
   schedule:
     - cron: '16 5 * * 4'
 
@@ -21,45 +35,44 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript' ]
+        language: ['javascript']
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Use only 'java' to analyze code written in Java, Kotlin or both
         # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
 
-        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
+          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality
 
+      # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
 
-    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+      #   If the Autobuild fails above, remove it and uncomment the following three lines.
+      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines.
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+      # - run: |
+      #     echo "Run, Build Application using script"
+      #     ./location_of_script_within_repo/buildscript.sh
 
-    # - run: |
-    #     echo "Run, Build Application using script"
-    #     ./location_of_script_within_repo/buildscript.sh
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        category: "/language:${{matrix.language}}"
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: '/language:${{matrix.language}}'
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -5,6 +5,13 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**' # Don't run dependabot branches, as they are already covered by pull requests
+    # Only build when files in these directories have been changed
+    paths:
+      - client/**
+      - server/**
+      - test/**
+      - index.js
+      - package.json
 
 jobs:
   build:

diff --git a/client/components/covers/AuthorImage.vue b/client/components/covers/AuthorImage.vue
@@ -56,7 +56,7 @@ export default {
     },
     imgSrc() {
       if (!this.imagePath) return null
-      return `${this.$config.routerBasePath}/api/authors/${this.authorId}/image?token=${this.userToken}&ts=${this.updatedAt}`
+      return `${this.$config.routerBasePath}/api/authors/${this.authorId}/image?ts=${this.updatedAt}`
     }
   },
   methods: {

diff --git a/client/components/widgets/SeriesInputWidget.vue b/client/components/widgets/SeriesInputWidget.vue
@@ -71,8 +71,6 @@ export default {
       this.showSeriesForm = true
     },
     submitSeriesForm() {
-      console.log('submit series form', this.value, this.selectedSeries)
-
       if (!this.selectedSeries.name) {
         this.$toast.error('Must enter a series')
         return

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.16.2",
+  "version": "2.17.1",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast client",
   "main": "index.js",

diff --git a/client/pages/item/_id/index.vue b/client/pages/item/_id/index.vue
@@ -638,6 +638,11 @@ export default {
         this.episodesDownloading = this.episodesDownloading.filter((d) => d.id !== episodeDownload.id)
       }
     },
+    episodeDownloadQueueCleared(libraryItemId) {
+      if (libraryItemId === this.libraryItemId) {
+        this.episodeDownloadsQueued = []
+      }
+    },
     rssFeedOpen(data) {
       if (data.entityId === this.libraryItemId) {
         console.log('RSS Feed Opened', data)
@@ -776,6 +781,7 @@ export default {
     this.$root.socket.on('episode_download_queued', this.episodeDownloadQueued)
     this.$root.socket.on('episode_download_started', this.episodeDownloadStarted)
     this.$root.socket.on('episode_download_finished', this.episodeDownloadFinished)
+    this.$root.socket.on('episode_download_queue_cleared', this.episodeDownloadQueueCleared)
   },
   beforeDestroy() {
     this.$eventBus.$off(`${this.libraryItem.id}_updated`, this.libraryItemUpdated)
@@ -787,6 +793,7 @@ export default {
     this.$root.socket.off('episode_download_queued', this.episodeDownloadQueued)
     this.$root.socket.off('episode_download_started', this.episodeDownloadStarted)
     this.$root.socket.off('episode_download_finished', this.episodeDownloadFinished)
+    this.$root.socket.off('episode_download_queue_cleared', this.episodeDownloadQueueCleared)
   }
 }
 </script>

diff --git a/client/pages/library/_library/podcast/download-queue.vue b/client/pages/library/_library/podcast/download-queue.vue
@@ -104,9 +104,6 @@ export default {
         this.episodesDownloading = this.episodesDownloading.filter((d) => d.id !== episodeDownload.id)
       }
     },
-    episodeDownloadQueueUpdated(downloadQueueDetails) {
-      this.episodeDownloadsQueued = downloadQueueDetails.queue.filter((q) => q.libraryId == this.libraryId)
-    },
     async loadInitialDownloadQueue() {
       this.processing = true
       const queuePayload = await this.$axios.$get(`/api/libraries/${this.libraryId}/episode-downloads`).catch((error) => {
@@ -128,7 +125,6 @@ export default {
       this.$root.socket.on('episode_download_queued', this.episodeDownloadQueued)
       this.$root.socket.on('episode_download_started', this.episodeDownloadStarted)
       this.$root.socket.on('episode_download_finished', this.episodeDownloadFinished)
-      this.$root.socket.on('episode_download_queue_updated', this.episodeDownloadQueueUpdated)
     }
   },
   mounted() {
@@ -138,7 +134,6 @@ export default {
     this.$root.socket.off('episode_download_queued', this.episodeDownloadQueued)
     this.$root.socket.off('episode_download_started', this.episodeDownloadStarted)
     this.$root.socket.off('episode_download_finished', this.episodeDownloadFinished)
-    this.$root.socket.off('episode_download_queue_updated', this.episodeDownloadQueueUpdated)
   }
 }
 </script>
diff --git a/client/strings/ar.json b/client/strings/ar.json
@@ -0,0 +1,131 @@
+{
+  "ButtonAdd": "إضافة",
+  "ButtonAddChapters": "إضافة الفصول",
+  "ButtonAddDevice": "إضافة جهاز",
+  "ButtonAddLibrary": "إضافة مكتبة",
+  "ButtonAddPodcasts": "إضافة بودكاست",
+  "ButtonAddUser": "إضافة مستخدم",
+  "ButtonAddYourFirstLibrary": "أضف مكتبتك الأولى",
+  "ButtonApply": "حفظ",
+  "ButtonApplyChapters": "حفظ الفصول",
+  "ButtonAuthors": "المؤلفون",
+  "ButtonBack": "الرجوع",
+  "ButtonBrowseForFolder": "البحث عن المجلد",
+  "ButtonCancel": "إلغاء",
+  "ButtonCancelEncode": "إلغاء الترميز",
+  "ButtonChangeRootPassword": "تغيير كلمة المرور الرئيسية",
+  "ButtonCheckAndDownloadNewEpisodes": "التحقق من الحلقات الجديدة وتنزيلها",
+  "ButtonChooseAFolder": "اختر المجلد",
+  "ButtonChooseFiles": "اختر الملفات",
+  "ButtonClearFilter": "تصفية الفرز",
+  "ButtonCloseFeed": "إغلاق",
+  "ButtonCloseSession": "إغلاق الجلسة المفتوحة",
+  "ButtonCollections": "المجموعات",
+  "ButtonConfigureScanner": "إعدادات الماسح الضوئي",
+  "ButtonCreate": "إنشاء",
+  "ButtonCreateBackup": "إنشاء نسخة احتياطية",
+  "ButtonDelete": "حذف",
+  "ButtonDownloadQueue": "قائمة",
+  "ButtonEdit": "تعديل",
+  "ButtonEditChapters": "تعديل الفصول",
+  "ButtonEditPodcast": "تعديل البودكاست",
+  "ButtonEnable": "تفعيل",
+  "ButtonFireAndFail": "النار والفشل",
+  "ButtonFireOnTest": "حادثة إطلاق النار",
+  "ButtonForceReScan": "فرض إعادة المسح",
+  "ButtonFullPath": "المسار الكامل",
+  "ButtonHide": "إخفاء",
+  "ButtonHome": "الرئيسية",
+  "ButtonIssues": "مشاكل",
+  "ButtonJumpBackward": "اقفز للخلف",
+  "ButtonJumpForward": "اقفز للأمام",
+  "ButtonLatest": "أحدث",
+  "ButtonLibrary": "المكتبة",
+  "ButtonLogout": "تسجيل الخروج",
+  "ButtonLookup": "البحث",
+  "ButtonManageTracks": "إدارة المقاطع",
+  "ButtonMapChapterTitles": "مطابقة عناوين الفصول",
+  "ButtonMatchAllAuthors": "مطابقة كل المؤلفون",
+  "ButtonMatchBooks": "مطابقة الكتب",
+  "ButtonNevermind": "لا تهتم",
+  "ButtonNext": "التالي",
+  "ButtonNextChapter": "الفصل التالي",
+  "ButtonNextItemInQueue": "العنصر التالي في قائمة الانتظار",
+  "ButtonOk": "نعم",
+  "ButtonOpenFeed": "فتح التغذية",
+  "ButtonOpenManager": "فتح الإدارة",
+  "ButtonPause": "تَوَقَّف",
+  "ButtonPlay": "تشغيل",
+  "ButtonPlayAll": "تشغيل الكل",
+  "ButtonPlaying": "مشغل الآن",
+  "ButtonPlaylists": "قوائم التشغيل",
+  "ButtonPrevious": "سابِق",
+  "ButtonPreviousChapter": "الفصل السابق",
+  "ButtonProbeAudioFile": "فحص ملف الصوت",
+  "ButtonPurgeAllCache": "مسح كافة ذاكرة التخزين المؤقتة",
+  "ButtonPurgeItemsCache": "مسح ذاكرة التخزين المؤقتة للعناصر",
+  "ButtonQueueAddItem": "أضف إلى قائمة الانتظار",
+  "ButtonQueueRemoveItem": "إزالة من قائمة الانتظار",
+  "ButtonQuickEmbed": "التضمين السريع",
+  "ButtonQuickEmbedMetadata": "إدراج سريع للبيانات الوصفية",
+  "ButtonQuickMatch": "مطابقة سريعة",
+  "ButtonReScan": "إعادة البحث",
+  "ButtonRead": "اقرأ",
+  "ButtonReadLess": "قلص",
+  "ButtonReadMore": "المزيد",
+  "ButtonRefresh": "تحديث",
+  "ButtonRemove": "إزالة",
+  "ButtonRemoveAll": "إزالة الكل",
+  "ButtonRemoveAllLibraryItems": "إزالة كافة عناصر المكتبة",
+  "ButtonRemoveFromContinueListening": "إزالة من متابعة الاستماع",
+  "ButtonRemoveFromContinueReading": "إزالة من متابعة القراءة",
+  "ButtonRemoveSeriesFromContinueSeries": "إزالة السلسلة من استمرار السلسلة",
+  "ButtonReset": "إعادة ضبط",
+  "ButtonResetToDefault": "إعادة ضبط إلى الوضع الافتراضي",
+  "ButtonRestore": "إستِعادة",
+  "ButtonSave": "حفظ",
+  "ButtonSaveAndClose": "حفظ و إغلاق",
+  "ButtonSaveTracklist": "حفظ قائمة التشغيل",
+  "ButtonScan": "تَحَقُق",
+  "ButtonScanLibrary": "تَحَقُق من المكتبة",
+  "ButtonSearch": "بحث",
+  "ButtonSelectFolderPath": "حدد مسار المجلد",
+  "ButtonSeries": "سلسلة",
+  "ButtonSetChaptersFromTracks": "تعيين الفصول من الملفات",
+  "ButtonShare": "نشر",
+  "ButtonShiftTimes": "أوقات العمل",
+  "ButtonShow": "عرض",
+  "ButtonStartM4BEncode": "ابدأ ترميز M4B",
+  "ButtonStartMetadataEmbed": "ابدأ تضمين البيانات الوصفية",
+  "ButtonStats": "الإحصائيات",
+  "ButtonSubmit": "تقديم",
+  "ButtonTest": "اختبار",
+  "ButtonUnlinkOpenId": "إلغاء ربط المعرف",
+  "ButtonUpload": "رفع",
+  "ButtonUploadBackup": "تحميل النسخة الاحتياطية",
+  "ButtonUploadCover": "ارفق الغلاف",
+  "ButtonUploadOPMLFile": "رفع ملف OPML",
+  "ButtonUserDelete": "حذف المستخدم {0}",
+  "ButtonUserEdit": "تعديل المستخدم {0}",
+  "ButtonViewAll": "عرض الكل",
+  "ButtonYes": "نعم",
+  "ErrorUploadFetchMetadataAPI": "خطأ في جلب البيانات الوصفية",
+  "ErrorUploadFetchMetadataNoResults": "لم يتم العثور على البيانات الوصفية - حاول تحديث العنوان و/أو المؤلف",
+  "ErrorUploadLacksTitle": "يجب أن يكون له عنوان",
+  "HeaderAccount": "الحساب",
+  "HeaderAddCustomMetadataProvider": "إضافة موفر بيانات تعريفية مخصص",
+  "HeaderAdvanced": "متقدم",
+  "HeaderAppriseNotificationSettings": "إعدادات الإشعارات",
+  "HeaderAudioTracks": "المسارات الصوتية",
+  "HeaderAudiobookTools": "أدوات إدارة ملفات الكتب الصوتية",
+  "HeaderAuthentication": "المصادقة",
+  "HeaderBackups": "النسخ الاحتياطية",
+  "HeaderChangePassword": "تغيير كلمة المرور",
+  "HeaderChapters": "الفصول",
+  "HeaderChooseAFolder": "اختيار المجلد",
+  "HeaderCollection": "مجموعة",
+  "HeaderCollectionItems": "عناصر المجموعة",
+  "HeaderCover": "الغلاف",
+  "HeaderCurrentDownloads": "التنزيلات الجارية",
+  "HeaderCustomMessageOnLogin": "رسالة مخصصة عند تسجيل الدخول"
+}
diff --git a/client/strings/cs.json b/client/strings/cs.json
@@ -67,7 +67,7 @@
   "ButtonQueueAddItem": "Přidat do fronty",
   "ButtonQueueRemoveItem": "Odstranit z fronty",
   "ButtonQuickEmbed": "Rychle Zapsat",
-  "ButtonQuickEmbedMetadata": "Rychle Zapsat Metadata",
+  "ButtonQuickEmbedMetadata": "Rychle zapsat Metadata",
   "ButtonQuickMatch": "Rychlé přiřazení",
   "ButtonReScan": "Znovu prohledat",
   "ButtonRead": "Číst",
@@ -163,6 +163,7 @@
   "HeaderNotificationUpdate": "Aktualizovat notifikaci",
   "HeaderNotifications": "Oznámení",
   "HeaderOpenIDConnectAuthentication": "Ověřování pomocí OpenID Connect",
+  "HeaderOpenListeningSessions": "Otevřené relace přehrávače",
   "HeaderOpenRSSFeed": "Otevřít RSS kanál",
   "HeaderOtherFiles": "Ostatní soubory",
   "HeaderPasswordAuthentication": "Autentizace heslem",
@@ -258,6 +259,7 @@
   "LabelByAuthor": "od {0}",
   "LabelChangePassword": "Změnit heslo",
   "LabelChannels": "Kanály",
+  "LabelChapterCount": "{0} Kapitol",
   "LabelChapterTitle": "Název kapitoly",
   "LabelChapters": "Kapitoly",
   "LabelChaptersFound": "Kapitoly nalezeny",