Merge pull request #2677 from Teekeks/enhance-ebook-filter

feat: Expanded filter to include "has no ebook" and "has no supplementary ebooks" options

client/components/controls/LibraryFilterSelect.vue

@@ -368,9 +368,17 @@ export default {
           id: 'ebook',
           name: this.$strings.LabelHasEbook
         },
+        {
+          id: 'no-ebook',
+          name: this.$strings.LabelMissingEbook
+        },
         {
           id: 'supplementary',
           name: this.$strings.LabelHasSupplementaryEbook
+        },
+        {
+          id: 'no-supplementary',
+          name: this.$strings.LabelMissingSupplementaryEbook
         }
       ]
     },

client/strings/cs.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Metaznačky",
   "LabelMinute": "Minuta",
   "LabelMissing": "Chybějící",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Chybějící díly",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
   "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Více",

client/strings/da.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Meta-tags",
   "LabelMinute": "Minut",
   "LabelMissing": "Mangler",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Manglende dele",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
   "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Mere",

client/strings/de.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Meta Tags",
   "LabelMinute": "Minute",
   "LabelMissing": "Fehlend",
+  "LabelMissingEbook": "E-Book fehlt",
   "LabelMissingParts": "Fehlende Teile",
+  "LabelMissingSupplementaryEbook": "Ergänzendes E-Book fehlt",
   "LabelMobileRedirectURIs": "Erlaubte Weiterleitungs-URIs für die mobile App",
   "LabelMobileRedirectURIsDescription": "Dies ist eine Whitelist gültiger Umleitungs-URIs für mobile Apps. Der Standardwert ist <code>audiobookshelf://oauth</code>, den du entfernen oder durch zusätzliche URIs für die Integration von Drittanbieter-Apps ergänzen kannst. Die Verwendung eines Sternchens (<code>*</code>) als alleiniger Eintrag erlaubt jede URI.",
   "LabelMore": "Mehr",

client/strings/en-us.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Meta Tags",
   "LabelMinute": "Minute",
   "LabelMissing": "Missing",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Missing Parts",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
   "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "More",

client/strings/es.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Metaetiquetas",
   "LabelMinute": "Minuto",
   "LabelMissing": "Ausente",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Partes Ausentes",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "URIs de redirección a móviles permitidos",
   "LabelMobileRedirectURIsDescription": "Esta es una lista de URIs válidos para redireccionamiento de apps móviles. La URI por defecto es <code>audiobookshelf://oauth</code>, la cual puedes remover or corroborar con URIs adicionales para la integración con apps de terceros. Utilizando un asterisco  (<code>*</code>) como el único punto de entrada permite cualquier URI.",
   "LabelMore": "Más",

client/strings/et.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Meta märgendid",
   "LabelMinute": "Minut",
   "LabelMissing": "Puudub",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Puuduvad osad",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "Lubatud mobiilile suunamise URI-d",
   "LabelMobileRedirectURIsDescription": "See on mobiilirakenduste jaoks kehtivate suunamise URI-de lubatud nimekiri. Vaikimisi on selleks <code>audiobookshelf://oauth</code>, mida saate eemaldada või täiendada täiendavate URI-dega kolmanda osapoole rakenduste integreerimiseks. Tärni (<code>*</code>) ainukese kirjena kasutamine võimaldab mis tahes URI-d.",
   "LabelMore": "Rohkem",

client/strings/fr.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Balises de métadonnée",
   "LabelMinute": "Minute",
   "LabelMissing": "Manquant",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Parties manquantes",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "URI de redirection mobile autorisés",
   "LabelMobileRedirectURIsDescription": "Il s'agit d'une liste blanche d’URI de redirection valides pour les applications mobiles. Celui par défaut est <code>audiobookshelf://oauth</code>, que vous pouvez supprimer ou compléter avec des URIs supplémentaires pour l'intégration d'applications tierces. L’utilisation d’un astérisque (<code>*</code>) comme seule entrée autorise n’importe quel URI.",
   "LabelMore": "Plus",

client/strings/gu.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Meta Tags",
   "LabelMinute": "Minute",
   "LabelMissing": "Missing",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Missing Parts",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
   "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "More",

client/strings/hi.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Meta Tags",
   "LabelMinute": "Minute",
   "LabelMissing": "Missing",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Missing Parts",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
   "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "More",

client/strings/hr.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Meta Tags",
   "LabelMinute": "Minuta",
   "LabelMissing": "Nedostaje",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Nedostajali dijelovi",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
   "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Više",

client/strings/hu.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Meta címkék",
   "LabelMinute": "Perc",
   "LabelMissing": "Hiányzó",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Hiányzó részek",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "Engedélyezett mobil átirányítási URI-k",
   "LabelMobileRedirectURIsDescription": "Ez egy fehérlista az érvényes mobilalkalmazás-átirányítási URI-k számára. Az alapértelmezett <code>audiobookshelf://oauth</code>, amely eltávolítható vagy kiegészíthető további URI-kkal harmadik féltől származó alkalmazásintegráció érdekében. Ha az egyetlen bejegyzés egy csillag (<code>*</code>), akkor bármely URI engedélyezett.",
   "LabelMore": "Több",

client/strings/it.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Meta Tags",
   "LabelMinute": "Minuto",
   "LabelMissing": "Altro",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Parti rimanenti",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "URI di reindirizzamento mobile consentiti",
   "LabelMobileRedirectURIsDescription": "Questa è una lista bianca di URI di reindirizzamento validi per le app mobili. Quello predefinito è <code>audiobookshelf://oauth</code>, che puoi rimuovere o integrare con URI aggiuntivi per l'integrazione di app di terze parti. Utilizzando un asterisco (<code>*</code>) poiché l'unica voce consente qualsiasi URI.",
   "LabelMore": "Molto",

client/strings/lt.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Meta žymos",
   "LabelMinute": "Minutė",
   "LabelMissing": "Trūksta",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Trūkstamos dalys",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
   "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Daugiau",

client/strings/nl.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Meta-tags",
   "LabelMinute": "Minuut",
   "LabelMissing": "Ontbrekend",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Ontbrekende delen",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
   "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Meer",

client/strings/no.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Meta Tags",
   "LabelMinute": "Minutt",
   "LabelMissing": "Mangler",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Manglende deler",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
   "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Mer",

client/strings/pl.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Meta Tags",
   "LabelMinute": "Minuta",
   "LabelMissing": "Brakujący",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Brakujące cześci",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
   "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Więcej",

client/strings/pt-br.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Etiquetas Meta",
   "LabelMinute": "Minuto",
   "LabelMissing": "Ausente",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Partes Ausentes",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "URIs de redirecionamento móveis permitidas",
   "LabelMobileRedirectURIsDescription": "Essa é uma lista de permissionamento para URIs válidas para o redirecionamento de aplicativos móveis. A padrão é <code>audiobookshelf://oauth</code>, que pode ser removida ou acrescentada com novas URIs para integração com apps de terceiros. Usando um asterisco (<code>*</code>) como um item único dará permissão para qualquer URI.",
   "LabelMore": "Mais",

client/strings/ru.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Мета теги",
   "LabelMinute": "Минуты",
   "LabelMissing": "Потеряно",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Потерянные части",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "Разрешенные URI перенаправления с мобильных устройств",
   "LabelMobileRedirectURIsDescription": "Это белый список допустимых URI перенаправления для мобильных приложений. По умолчанию используется <code>audiobookshelf://oauth</code>, который можно удалить или дополнить дополнительными URI для интеграции со сторонними приложениями. Использование звездочки (<code>*</code>) в качестве единственной записи разрешает любой URI.",
   "LabelMore": "Еще",

client/strings/sv.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "Metamärken",
   "LabelMinute": "Minut",
   "LabelMissing": "Saknad",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "Saknade delar",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
   "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Mer",

client/strings/zh-cn.json

@@ -356,7 +356,9 @@
   "LabelMetaTags": "元标签",
   "LabelMinute": "分钟",
   "LabelMissing": "丢失",
+  "LabelMissingEbook": "Has no ebook",
   "LabelMissingParts": "丢失的部分",
+  "LabelMissingSupplementaryEbook": "Has no supplementary ebook",
   "LabelMobileRedirectURIs": "允许移动应用重定向 URI",
   "LabelMobileRedirectURIsDescription": "这是移动应用程序的有效重定向 URI 白名单. 默认值为 <code>audiobookshelf://oauth</code>，您可以删除它或添加其他 URI 以进行第三方应用集成. 使用星号 (<code>*</code>) 作为唯一条目允许任何 URI.",
   "LabelMore": "更多",

server/utils/queries/libraryItemsBookFilters.js

@@ -204,6 +204,10 @@ module.exports = {
         mediaWhere['ebookFile'] = {
           [Sequelize.Op.not]: null
         }
+      } else if (value == 'no-ebook') {
+        mediaWhere['ebookFile'] = {
+          [Sequelize.Op.eq]: null
+        }
       }
     } else if (group === 'missing') {
       if (['asin', 'isbn', 'subtitle', 'publishedYear', 'description', 'publisher', 'language', 'cover'].includes(value)) {
@@ -421,6 +425,10 @@ module.exports = {
       libraryItemWhere['libraryFiles'] = {
         [Sequelize.Op.substring]: `"isSupplementary":true`
       }
+    } else if (filterGroup === 'ebooks' && filterValue === 'no-supplementary') {
+      libraryItemWhere['libraryFiles'] = {
+        [Sequelize.Op.notLike]: Sequelize.literal(`\'%"isSupplementary":true%\'`),
+      }
     } else if (filterGroup === 'missing' && filterValue === 'authors') {
       authorInclude = {
         model: Database.authorModel,