From 3ea98d4d1e5d71e6cf2119dfe85d3b75e1f1fab5 Mon Sep 17 00:00:00 2001 From: Xavier Fontanet Date: Sat, 14 Sep 2024 13:16:34 +0200 Subject: [PATCH] add more regions and countries to Cine Foreign and fix music genre. Also help filebot desktop with full path capability --- Movies_Relocate.groovy | 1 + common/classification.groovy | 53 ++++++++++++++++++++++++++++++++++-- movies/folder_file.groovy | 11 +++++++- movies/root_folders.groovy | 11 +++++++- series/root_folders.groovy | 4 ++- 5 files changed, 74 insertions(+), 6 deletions(-) diff --git a/Movies_Relocate.groovy b/Movies_Relocate.groovy index 4ac387b..41d1545 100755 --- a/Movies_Relocate.groovy +++ b/Movies_Relocate.groovy @@ -1,6 +1,7 @@ { def only_relocate=true def relocationFrom="Pelis_Retro/" +def realFullPath = true @movies/init_relocate.groovy @common/validations.groovy @common/classification.groovy diff --git a/common/classification.groovy b/common/classification.groovy index e09a461..ab79d7c 100755 --- a/common/classification.groovy +++ b/common/classification.groovy @@ -27,7 +27,7 @@ if (tieneAnimacion && llenguaOriginal=='ja') { && ["nemo"].any{!localize.English.n.toLowerCase().contains(it)} } //musica -def esMusica = genres.any{ it =~ /Música|Music/} +def esMusica = genres.size()==1 && genres.any{ it =~ /Música|Music/} tipoYaSeteado = esDocu || esAnime @@ -116,8 +116,8 @@ if (!tipoYaSeteado && llenguaOriginal=~/es|spa/) { //asiaticas def asiatica = false if (!tipoYaSeteado) { - def languajAsia = isMovie ? ["zh", "cn", "ko", "th", "vi", "ja", "id", "hi", "tl", "bo", "te"] - : ["zho", "cn", "kor", "tha", "vie", "jpn", "ind", "hin", "tgl", "bod"] + def languajAsia = isMovie ? ["zh", "cn", "ko", "th", "vi", "ja", "id", "tl", "bo", "te"] + : ["zho", "cn", "kor", "tha", "vie", "jpn", "ind", "tgl", "bod"] asiatica = languajAsia.contains(llenguaOriginal) tipoYaSeteado = tipoYaSeteado || asiatica } @@ -136,4 +136,51 @@ if (!tipoYaSeteado) { def languajEslavo = ["pl", "ru", "uk", "be", "cs", "sk", "sl", "hr", "bs", "mk", "sr", "bg", "me"] eslavo = languajEslavo.contains(llenguaOriginal) tipoYaSeteado = tipoYaSeteado || eslavo +} +//africa +def africa = false +if (!tipoYaSeteado) { + def paisAfrica = ["NG"] + africa = paisAfrica.contains(pais) + tipoYaSeteado = tipoYaSeteado || africa +} +//bollywood +def bollywood = false +if (!tipoYaSeteado) { + def languajBollywood = ["hi"] + bollywood = languajBollywood.contains(llenguaOriginal) + tipoYaSeteado = tipoYaSeteado || bollywood +} +//france +def france = false +if (!tipoYaSeteado) { + def languajFrance = ["fr"] + france = languajFrance.contains(llenguaOriginal) + tipoYaSeteado = tipoYaSeteado || france +} +//german +def german = false +if (!tipoYaSeteado) { + def languajGerman = ["de"] + german = languajGerman.contains(llenguaOriginal) + tipoYaSeteado = tipoYaSeteado || german +} +//italy +def italy = false +if (!tipoYaSeteado) { + def languajItaly = ["it"] + italy = languajItaly.contains(llenguaOriginal) + tipoYaSeteado = tipoYaSeteado || italy +} +//brasil +def brasil = false +if (!tipoYaSeteado) { + brasil = pais=="BR" || (numPaises==1 && prodCountries.contains("BR")) + tipoYaSeteado = tipoYaSeteado || brasil +} +//portugal +def portugal = false +if (!tipoYaSeteado) { + portugal = pais=="PT" || (numPaises==1 && prodCountries.contains("PT")) + tipoYaSeteado = tipoYaSeteado || portugal } \ No newline at end of file diff --git a/movies/folder_file.groovy b/movies/folder_file.groovy index 54c3a6e..5c0c1f5 100755 --- a/movies/folder_file.groovy +++ b/movies/folder_file.groovy @@ -15,6 +15,13 @@ else if (espanyola) { else if (asiatica) ruta = ruta_asiaticas + subfolder else if (muslim) ruta = ruta_muslim + subfolder else if (eslavo) ruta = ruta_eslavo + subfolder +else if (africa) ruta = ruta_africa + subfolder +else if (bollywood) ruta = ruta_bollywood + subfolder +else if (france) ruta = ruta_france + subfolder +else if (german) ruta = ruta_german + subfolder +else if (italy) ruta = ruta_italy + subfolder +else if (brasil) ruta = ruta_brasil + subfolder +else if (portugal) ruta = ruta_portugal + subfolder else if (esFamiliar && y>1960) ruta = ruta_familiar + subfolder else if (esMusica) ruta = ruta_concerts else if (y<1980) { @@ -54,10 +61,12 @@ if ({try {only_relocate} catch (err) {false}}()) { } else { def nombrePelicula_formatoPlex = {try { catalana ? localize.Catalan.n : localize.Spanish.plex.name } catch (err) {localize.Spanish.plex.name} }() def nomPrincipal = nombrePelicula_formatoPlex + bloqueVideo + bloqueAudio + bloqueSubs + def edition = getEdition(fn) + edition = edition != null ? edition : '' def trackerCatch = fn.find(/(?i)\bHD.?O(limpo)?\b|\bRedBits\b/) def tracker = trackerCatch != null ? '['+trackerCatch.replace("HDOlimpo", "HDO")+']' : '' - file = nomPrincipal + tracker + tmdb + file = nomPrincipal + edition + tracker + tmdb } return ruta + inicial + carpetaPeli + file diff --git a/movies/root_folders.groovy b/movies/root_folders.groovy index d33d230..e6ebae7 100755 --- a/movies/root_folders.groovy +++ b/movies/root_folders.groovy @@ -1,5 +1,7 @@ /** RUTAS **/ -def root = {try {hardlink} catch (err) {false}}() ? '/data/media/movies/' : '/pelis/' +def wantsRealFullPath = {try {realFullPath} catch (err) {false}}() +def wantsHardlink = {try {hardlink} catch (err) {false}}() +def root = (wantsRealFullPath || wantsHardlink) ? '/data/media/movies/' : '/pelis/' def root_live = '/data/media/live/' def ruta2000 = root+"Pelis_2000/" def ruta = ruta2000 @@ -17,6 +19,13 @@ def ruta_classic = root+"Pelis_Classic/" def ruta_asiaticas = root+"Pelis_Asia/" def ruta_muslim = root+"Pelis_Muslim/" def ruta_eslavo = root+"Pelis_Eslavo/" +def ruta_africa = root+"Pelis_Africa/" +def ruta_bollywood = root+"Pelis_Bollywood/" +def ruta_france = root+"Pelis_France/" +def ruta_german = root+"Pelis_German/" +def ruta_italy = root+"Pelis_Italy/" +def ruta_brasil = root+"Pelis_Brasil/" +def ruta_portugal = root+"Pelis_Portugal/" def ruta_concerts = root_live+"concerts/" def rutaKO = root+"error/" /**********/ diff --git a/series/root_folders.groovy b/series/root_folders.groovy index ce352da..2336bdf 100755 --- a/series/root_folders.groovy +++ b/series/root_folders.groovy @@ -1,4 +1,6 @@ -def root = {try {hardlink} catch (err) {false}}() ? '/data/media/tv/' : '/series/' +def wantsRealFullPath = {try {realFullPath} catch (err) {false}}() +def wantsHardlink = {try {hardlink} catch (err) {false}}() +def root = (wantsRealFullPath || wantsHardlink)? '/data/media/tv/' : '/series/' def tostay = folder.toString().contains('stay/') def subfolder = tostay ? "stay/" : "main/"