Merge pull request #2305 from mikiher/nfo-metadata

Add NFO metadata source
advplyr · Nov 26, 2023 · 2e5822b · 2e5822b
2 parents 5a8c60a + 3d46833
commit 2e5822b
Show file tree

Hide file tree

Showing 25 changed files with 367 additions and 26 deletions.
diff --git a/client/components/modals/libraries/EditModal.vue b/client/components/modals/libraries/EditModal.vue
@@ -127,7 +127,7 @@ export default {
           skipMatchingMediaWithIsbn: false,
           autoScanCronExpression: null,
           hideSingleBookSeries: false,
-          metadataPrecedence: ['folderStructure', 'audioMetatags', 'txtFiles', 'opfFile', 'absMetadata']
+          metadataPrecedence: ['folderStructure', 'audioMetatags', 'nfoFile', 'txtFiles', 'opfFile', 'absMetadata']
         }
       }
     },

diff --git a/client/components/modals/libraries/LibraryScannerSettings.vue b/client/components/modals/libraries/LibraryScannerSettings.vue
@@ -19,9 +19,11 @@
         <li v-for="(source, index) in metadataSourceMapped" :key="source.id" :class="source.include ? 'item' : 'opacity-50'" class="w-full px-2 flex items-center relative border border-white/10">
           <span class="material-icons drag-handle text-xl text-gray-400 hover:text-gray-50 mr-2 md:mr-4">reorder</span>
           <div class="text-center py-1 w-8 min-w-8">
-            {{ source.include ? index + 1 : '' }}
+            {{ source.include ? getSourceIndex(source.id) : '' }}
+          </div>
+          <div class="flex-grow inline-flex justify-between px-4 py-3">
+            {{ source.name }} <span v-if="source.include && (index === firstActiveSourceIndex || index === lastActiveSourceIndex)" class="px-2 italic font-semibold text-xs text-gray-400">{{ index === firstActiveSourceIndex ? $strings.LabelHighestPriority : $strings.LabelLowestPriority }}</span>
           </div>
-          <div class="flex-grow px-4 py-3">{{ source.name }}</div>
           <div class="px-2 opacity-100">
             <ui-toggle-switch v-model="source.include" :off-color="'error'" @input="includeToggled(source)" />
           </div>
@@ -64,6 +66,11 @@ export default {
           name: 'Audio file meta tags',
           include: true
         },
+        nfoFile: {
+          id: 'nfoFile',
+          name: 'NFO file',
+          include: true
+        },
         txtFiles: {
           id: 'txtFiles',
           name: 'desc.txt & reader.txt files',
@@ -92,20 +99,34 @@ export default {
     },
     isBookLibrary() {
       return this.mediaType === 'book'
+    },
+    firstActiveSourceIndex() {
+      return this.metadataSourceMapped.findIndex((source) => source.include)
+    },
+    lastActiveSourceIndex() {
+      return this.metadataSourceMapped.findLastIndex((source) => source.include)
     }
   },
   methods: {
+    getSourceIndex(source) {
+      const activeSources = (this.librarySettings.metadataPrecedence || []).map((s) => s).reverse()
+      return activeSources.findIndex((s) => s === source) + 1
+    },
     resetToDefault() {
       this.metadataSourceMapped = []
       for (const key in this.metadataSourceData) {
         this.metadataSourceMapped.push({ ...this.metadataSourceData[key] })
       }
+      this.metadataSourceMapped.reverse()
+
       this.$emit('update', this.getLibraryData())
     },
     getLibraryData() {
+      const metadataSourceIds = this.metadataSourceMapped.map((source) => (source.include ? source.id : null)).filter((s) => s)
+      metadataSourceIds.reverse()
       return {
         settings: {
-          metadataPrecedence: this.metadataSourceMapped.map((source) => (source.include ? source.id : null)).filter((s) => s)
+          metadataPrecedence: metadataSourceIds
         }
       }
     },
@@ -120,15 +141,16 @@ export default {
     },
     init() {
       const metadataPrecedence = this.librarySettings.metadataPrecedence || []
-
       this.metadataSourceMapped = metadataPrecedence.map((source) => this.metadataSourceData[source]).filter((s) => s)
 
       for (const sourceKey in this.metadataSourceData) {
         if (!metadataPrecedence.includes(sourceKey)) {
           const unusedSourceData = { ...this.metadataSourceData[sourceKey], include: false }
-          this.metadataSourceMapped.push(unusedSourceData)
+          this.metadataSourceMapped.unshift(unusedSourceData)
         }
       }
+
+      this.metadataSourceMapped.reverse()
     }
   },
   mounted() {

diff --git a/client/strings/cs.json b/client/strings/cs.json
@@ -283,6 +283,7 @@
   "LabelHardDeleteFile": "Trvale smazat soubor",
   "LabelHasEbook": "Obsahuje elektronickou knihu",
   "LabelHasSupplementaryEbook": "Obsahuje doplňkovou elektronickou knihu",
+  "LabelHighestPriority": "Highest priority",
   "LabelHost": "Hostitel",
   "LabelHour": "Hodina",
   "LabelIcon": "Ikona",
@@ -324,11 +325,12 @@
   "LabelLogLevelInfo": "Informace",
   "LabelLogLevelWarn": "Varovat",
   "LabelLookForNewEpisodesAfterDate": "Hledat nové epizody po tomto datu",
+  "LabelLowestPriority": "Lowest Priority",
   "LabelMatchExistingUsersBy": "Match existing users by",
   "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
   "LabelMediaPlayer": "Přehrávač médií",
   "LabelMediaType": "Typ média",
-  "LabelMetadataOrderOfPrecedenceDescription": "1 je nejnižší priorita, 5 je nejvyšší priorita",
+  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
   "LabelMetadataProvider": "Poskytovatel metadat",
   "LabelMetaTag": "Metaznačka",
   "LabelMetaTags": "Metaznačky",

diff --git a/client/strings/da.json b/client/strings/da.json
@@ -283,6 +283,7 @@
   "LabelHardDeleteFile": "Permanent slet fil",
   "LabelHasEbook": "Har e-bog",
   "LabelHasSupplementaryEbook": "Har supplerende e-bog",
+  "LabelHighestPriority": "Highest priority",
   "LabelHost": "Vært",
   "LabelHour": "Time",
   "LabelIcon": "Ikon",
@@ -324,11 +325,12 @@
   "LabelLogLevelInfo": "Information",
   "LabelLogLevelWarn": "Advarsel",
   "LabelLookForNewEpisodesAfterDate": "Søg efter nye episoder efter denne dato",
+  "LabelLowestPriority": "Lowest Priority",
   "LabelMatchExistingUsersBy": "Match existing users by",
   "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
   "LabelMediaPlayer": "Medieafspiller",
   "LabelMediaType": "Medietype",
-  "LabelMetadataOrderOfPrecedenceDescription": "1 is lowest priority, 5 is highest priority",
+  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
   "LabelMetadataProvider": "Metadataudbyder",
   "LabelMetaTag": "Meta-tag",
   "LabelMetaTags": "Meta-tags",

diff --git a/client/strings/de.json b/client/strings/de.json
@@ -283,6 +283,7 @@
   "LabelHardDeleteFile": "Datei dauerhaft löschen",
   "LabelHasEbook": "mit E-Book",
   "LabelHasSupplementaryEbook": "mit zusätlichem E-Book",
+  "LabelHighestPriority": "Highest priority",
   "LabelHost": "Host",
   "LabelHour": "Stunde",
   "LabelIcon": "Symbol",
@@ -324,11 +325,12 @@
   "LabelLogLevelInfo": "Informationen",
   "LabelLogLevelWarn": "Warnungen",
   "LabelLookForNewEpisodesAfterDate": "Suchen nach neuen Episoden nach diesem Datum",
+  "LabelLowestPriority": "Lowest Priority",
   "LabelMatchExistingUsersBy": "Zuordnen existierender Benutzer mit",
   "LabelMatchExistingUsersByDescription": "Wird zum Verbinden vorhandener Benutzer verwendet. Sobald die Verbindung hergestellt ist, wird den Benutzern eine eindeutige ID von Ihrem SSO-Anbieter zugeordnet",
   "LabelMediaPlayer": "Mediaplayer",
   "LabelMediaType": "Medientyp",
-  "LabelMetadataOrderOfPrecedenceDescription": "1 ist die niedrigste Priorität, 5 ist die höhste Priorität",
+  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
   "LabelMetadataProvider": "Metadatenanbieter",
   "LabelMetaTag": "Meta Schlagwort",
   "LabelMetaTags": "Meta Tags",

diff --git a/client/strings/en-us.json b/client/strings/en-us.json
@@ -283,6 +283,7 @@
   "LabelHardDeleteFile": "Hard delete file",
   "LabelHasEbook": "Has ebook",
   "LabelHasSupplementaryEbook": "Has supplementary ebook",
+  "LabelHighestPriority": "Highest priority",
   "LabelHost": "Host",
   "LabelHour": "Hour",
   "LabelIcon": "Icon",
@@ -324,11 +325,12 @@
   "LabelLogLevelInfo": "Info",
   "LabelLogLevelWarn": "Warn",
   "LabelLookForNewEpisodesAfterDate": "Look for new episodes after this date",
+  "LabelLowestPriority": "Lowest Priority",
   "LabelMatchExistingUsersBy": "Match existing users by",
   "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
   "LabelMediaPlayer": "Media Player",
   "LabelMediaType": "Media Type",
-  "LabelMetadataOrderOfPrecedenceDescription": "1 is lowest priority, 5 is highest priority",
+  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
   "LabelMetadataProvider": "Metadata Provider",
   "LabelMetaTag": "Meta Tag",
   "LabelMetaTags": "Meta Tags",

diff --git a/client/strings/es.json b/client/strings/es.json
@@ -283,6 +283,7 @@
   "LabelHardDeleteFile": "Eliminar Definitivamente",
   "LabelHasEbook": "Tiene Ebook",
   "LabelHasSupplementaryEbook": "Tiene Ebook Suplementario",
+  "LabelHighestPriority": "Highest priority",
   "LabelHost": "Host",
   "LabelHour": "Hora",
   "LabelIcon": "Icono",
@@ -324,11 +325,12 @@
   "LabelLogLevelInfo": "Información",
   "LabelLogLevelWarn": "Advertencia",
   "LabelLookForNewEpisodesAfterDate": "Buscar Nuevos Episodios a partir de esta Fecha",
+  "LabelLowestPriority": "Lowest Priority",
   "LabelMatchExistingUsersBy": "Match existing users by",
   "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
   "LabelMediaPlayer": "Reproductor de Medios",
   "LabelMediaType": "Tipo de Multimedia",
-  "LabelMetadataOrderOfPrecedenceDescription": "1 is lowest priority, 5 is highest priority",
+  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
   "LabelMetadataProvider": "Proveedor de Metadata",
   "LabelMetaTag": "Meta Tag",
   "LabelMetaTags": "Meta Tags",

diff --git a/client/strings/fr.json b/client/strings/fr.json
@@ -283,6 +283,7 @@
   "LabelHardDeleteFile": "Suppression du fichier",
   "LabelHasEbook": "Dispose d’un livre numérique",
   "LabelHasSupplementaryEbook": "Dispose d’un livre numérique supplémentaire",
+  "LabelHighestPriority": "Highest priority",
   "LabelHost": "Hôte",
   "LabelHour": "Heure",
   "LabelIcon": "Icone",
@@ -324,11 +325,12 @@
   "LabelLogLevelInfo": "Info",
   "LabelLogLevelWarn": "Warn",
   "LabelLookForNewEpisodesAfterDate": "Chercher de nouveaux épisode après cette date",
+  "LabelLowestPriority": "Lowest Priority",
   "LabelMatchExistingUsersBy": "Match existing users by",
   "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
   "LabelMediaPlayer": "Lecteur multimédia",
   "LabelMediaType": "Type de média",
-  "LabelMetadataOrderOfPrecedenceDescription": "1 is lowest priority, 5 is highest priority",
+  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
   "LabelMetadataProvider": "Fournisseur de métadonnées",
   "LabelMetaTag": "Etiquette de métadonnée",
   "LabelMetaTags": "Etiquettes de métadonnée",

diff --git a/client/strings/gu.json b/client/strings/gu.json
@@ -283,6 +283,7 @@
   "LabelHardDeleteFile": "Hard delete file",
   "LabelHasEbook": "Has ebook",
   "LabelHasSupplementaryEbook": "Has supplementary ebook",
+  "LabelHighestPriority": "Highest priority",
   "LabelHost": "Host",
   "LabelHour": "Hour",
   "LabelIcon": "Icon",
@@ -324,11 +325,12 @@
   "LabelLogLevelInfo": "Info",
   "LabelLogLevelWarn": "Warn",
   "LabelLookForNewEpisodesAfterDate": "Look for new episodes after this date",
+  "LabelLowestPriority": "Lowest Priority",
   "LabelMatchExistingUsersBy": "Match existing users by",
   "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
   "LabelMediaPlayer": "Media Player",
   "LabelMediaType": "Media Type",
-  "LabelMetadataOrderOfPrecedenceDescription": "1 is lowest priority, 5 is highest priority",
+  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
   "LabelMetadataProvider": "Metadata Provider",
   "LabelMetaTag": "Meta Tag",
   "LabelMetaTags": "Meta Tags",

diff --git a/client/strings/hi.json b/client/strings/hi.json
@@ -283,6 +283,7 @@
   "LabelHardDeleteFile": "Hard delete file",
   "LabelHasEbook": "Has ebook",
   "LabelHasSupplementaryEbook": "Has supplementary ebook",
+  "LabelHighestPriority": "Highest priority",
   "LabelHost": "Host",
   "LabelHour": "Hour",
   "LabelIcon": "Icon",
@@ -324,11 +325,12 @@
   "LabelLogLevelInfo": "Info",
   "LabelLogLevelWarn": "Warn",
   "LabelLookForNewEpisodesAfterDate": "Look for new episodes after this date",
+  "LabelLowestPriority": "Lowest Priority",
   "LabelMatchExistingUsersBy": "Match existing users by",
   "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
   "LabelMediaPlayer": "Media Player",
   "LabelMediaType": "Media Type",
-  "LabelMetadataOrderOfPrecedenceDescription": "1 is lowest priority, 5 is highest priority",
+  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
   "LabelMetadataProvider": "Metadata Provider",
   "LabelMetaTag": "Meta Tag",
   "LabelMetaTags": "Meta Tags",

diff --git a/client/strings/hr.json b/client/strings/hr.json
@@ -283,6 +283,7 @@
   "LabelHardDeleteFile": "Obriši datoteku zauvijek",
   "LabelHasEbook": "Has ebook",
   "LabelHasSupplementaryEbook": "Has supplementary ebook",
+  "LabelHighestPriority": "Highest priority",
   "LabelHost": "Host",
   "LabelHour": "Sat",
   "LabelIcon": "Ikona",
@@ -324,11 +325,12 @@
   "LabelLogLevelInfo": "Info",
   "LabelLogLevelWarn": "Warn",
   "LabelLookForNewEpisodesAfterDate": "Traži nove epizode nakon ovog datuma",
+  "LabelLowestPriority": "Lowest Priority",
   "LabelMatchExistingUsersBy": "Match existing users by",
   "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
   "LabelMediaPlayer": "Media Player",
   "LabelMediaType": "Media Type",
-  "LabelMetadataOrderOfPrecedenceDescription": "1 is lowest priority, 5 is highest priority",
+  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
   "LabelMetadataProvider": "Poslužitelj metapodataka ",
   "LabelMetaTag": "Meta Tag",
   "LabelMetaTags": "Meta Tags",

diff --git a/client/strings/it.json b/client/strings/it.json
@@ -283,6 +283,7 @@
   "LabelHardDeleteFile": "Elimina Definitivamente",
   "LabelHasEbook": "Un ebook",
   "LabelHasSupplementaryEbook": "Un ebook Supplementare",
+  "LabelHighestPriority": "Highest priority",
   "LabelHost": "Host",
   "LabelHour": "Ora",
   "LabelIcon": "Icona",
@@ -324,11 +325,12 @@
   "LabelLogLevelInfo": "Info",
   "LabelLogLevelWarn": "Allarme",
   "LabelLookForNewEpisodesAfterDate": "Cerca nuovi episodi dopo questa data",
+  "LabelLowestPriority": "Lowest Priority",
   "LabelMatchExistingUsersBy": "Match existing users by",
   "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
   "LabelMediaPlayer": "Media Player",
   "LabelMediaType": "Tipo Media",
-  "LabelMetadataOrderOfPrecedenceDescription": "1 e bassa priorità, 5 è alta priorità",
+  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
   "LabelMetadataProvider": "Metadata Provider",
   "LabelMetaTag": "Meta Tag",
   "LabelMetaTags": "Meta Tags",

diff --git a/client/strings/lt.json b/client/strings/lt.json
@@ -283,6 +283,7 @@
   "LabelHardDeleteFile": "Galutinai ištrinti failą",
   "LabelHasEbook": "Turi e-knygą",
   "LabelHasSupplementaryEbook": "Turi papildomą e-knygą",
+  "LabelHighestPriority": "Highest priority",
   "LabelHost": "Serveris",
   "LabelHour": "Valanda",
   "LabelIcon": "Piktograma",
@@ -324,11 +325,12 @@
   "LabelLogLevelInfo": "Info",
   "LabelLogLevelWarn": "Warn",
   "LabelLookForNewEpisodesAfterDate": "Ieškoti naujų epizodų po šios datos",
+  "LabelLowestPriority": "Lowest Priority",
   "LabelMatchExistingUsersBy": "Match existing users by",
   "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
   "LabelMediaPlayer": "Grotuvas",
   "LabelMediaType": "Medijos tipas",
-  "LabelMetadataOrderOfPrecedenceDescription": "1 is lowest priority, 5 is highest priority",
+  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
   "LabelMetadataProvider": "Metaduomenų tiekėjas",
   "LabelMetaTag": "Meta žymė",
   "LabelMetaTags": "Meta žymos",

diff --git a/client/strings/nl.json b/client/strings/nl.json
@@ -283,6 +283,7 @@
   "LabelHardDeleteFile": "Hard-delete bestand",
   "LabelHasEbook": "Heeft ebook",
   "LabelHasSupplementaryEbook": "Heeft supplementair ebook",
+  "LabelHighestPriority": "Highest priority",
   "LabelHost": "Host",
   "LabelHour": "Uur",
   "LabelIcon": "Icoon",
@@ -324,11 +325,12 @@
   "LabelLogLevelInfo": "Info",
   "LabelLogLevelWarn": "Waarschuwing",
   "LabelLookForNewEpisodesAfterDate": "Zoek naar nieuwe afleveringen na deze datum",
+  "LabelLowestPriority": "Lowest Priority",
   "LabelMatchExistingUsersBy": "Match existing users by",
   "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
   "LabelMediaPlayer": "Mediaspeler",
   "LabelMediaType": "Mediatype",
-  "LabelMetadataOrderOfPrecedenceDescription": "1 is lowest priority, 5 is highest priority",
+  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
   "LabelMetadataProvider": "Metadatabron",
   "LabelMetaTag": "Meta-tag",
   "LabelMetaTags": "Meta-tags",

diff --git a/client/strings/no.json b/client/strings/no.json
@@ -283,6 +283,7 @@
   "LabelHardDeleteFile": "Tving sletting av fil",
   "LabelHasEbook": "Har ebok",
   "LabelHasSupplementaryEbook": "Har supplerende ebok",
+  "LabelHighestPriority": "Highest priority",
   "LabelHost": "Tjener",
   "LabelHour": "Time",
   "LabelIcon": "Ikon",
@@ -324,11 +325,12 @@
   "LabelLogLevelInfo": "Info",
   "LabelLogLevelWarn": "Warn",
   "LabelLookForNewEpisodesAfterDate": "Se etter nye episoder etter denne datoen",
+  "LabelLowestPriority": "Lowest Priority",
   "LabelMatchExistingUsersBy": "Match existing users by",
   "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
   "LabelMediaPlayer": "Mediespiller",
   "LabelMediaType": "Medie type",
-  "LabelMetadataOrderOfPrecedenceDescription": "1 is lowest priority, 5 is highest priority",
+  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
   "LabelMetadataProvider": "Metadata Leverandør",
   "LabelMetaTag": "Meta Tag",
   "LabelMetaTags": "Meta Tags",

diff --git a/client/strings/pl.json b/client/strings/pl.json
@@ -283,6 +283,7 @@
   "LabelHardDeleteFile": "Usuń trwale plik",
   "LabelHasEbook": "Has ebook",
   "LabelHasSupplementaryEbook": "Has supplementary ebook",
+  "LabelHighestPriority": "Highest priority",
   "LabelHost": "Host",
   "LabelHour": "Godzina",
   "LabelIcon": "Ikona",
@@ -324,11 +325,12 @@
   "LabelLogLevelInfo": "Informacja",
   "LabelLogLevelWarn": "Ostrzeżenie",
   "LabelLookForNewEpisodesAfterDate": "Szukaj nowych odcinków po dacie",
+  "LabelLowestPriority": "Lowest Priority",
   "LabelMatchExistingUsersBy": "Match existing users by",
   "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
   "LabelMediaPlayer": "Odtwarzacz",
   "LabelMediaType": "Typ mediów",
-  "LabelMetadataOrderOfPrecedenceDescription": "1 is lowest priority, 5 is highest priority",
+  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
   "LabelMetadataProvider": "Dostawca metadanych",
   "LabelMetaTag": "Tag",
   "LabelMetaTags": "Meta Tags",