1
0
Fork 0

add more regions and countries to Cine Foreign and fix music genre. Also help filebot desktop with full path capability

This commit is contained in:
Xavier Fontanet 2024-09-14 13:16:34 +02:00
parent bc3d9dd0da
commit 3ea98d4d1e
5 changed files with 74 additions and 6 deletions

View File

@ -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

View File

@ -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
}
@ -137,3 +137,50 @@ if (!tipoYaSeteado) {
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
}

View File

@ -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

View File

@ -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/"
/**********/

View File

@ -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/"