Mangrana
/
filebot-presets
1
0
Fork 0
Code

bugfixes

This commit is contained in:
Xavier Fontanet 2023-05-11 23:21:23 +02:00
parent 5164803ad7
commit c17979748f
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
MaNGranA_Pelis.groovy
View File

@ -78,6 +78,7 @@ try { //empieza el script
: vf : vf
def fuente = {try{ source } catch(err){null}}() def fuente = {try{ source } catch(err){null}}()
if (fuente!=null) calidad = calidad.startsWith("micro") ? calidad : vf if (fuente!=null) calidad = calidad.startsWith("micro") ? calidad : vf
/***************************/ /***************************/
/** Formato distribución **/ /** Formato distribución **/
formato_distribucion = fuente!=null ? fuente : relocation ? '' : formato_distribucion = fuente!=null ? fuente : relocation ? '' :
@ -132,17 +133,18 @@ try { //empieza el script
try { myFps = ' '+fps.replace(/.0/,'').replace(' ','') }catch(err){} try { myFps = ' '+fps.replace(/.0/,'').replace(' ','') }catch(err){}
/***************************/ /***************************/
/* RESULTADO MEDIAINFO */ /* BLOQUE VIDEO */
def bloqueCalidadVideo = calidad + formato_distribucion def bloqueCalidadVideo = calidad + formato_distribucion
def bloqueDescVideo = myBitrate + profundidadColor + myFps + hdr_info def bloqueDescVideo = myBitrate + profundidadColor + myFps + hdr_info
def bloqueVideo = ' ['+codecVideo+' '+bloqueCalidadVideo+' '+bloqueDescVideo+']' def bloqueVideo = ' ['+codecVideo+' '+bloqueCalidadVideo+' '+bloqueDescVideo+']'
/**********************************************************************************************************/
/** AUDIO (ejecución) **/ /** AUDIO (ejecución) **/
def bloqueAudio='' def bloqueAudio=''
def audiosMap = [:] def audiosMap = [:]
for (aud in audio) { for (aud in audio) {
def shortDesc = aud.Language_String3 def shortDesc = aud.Language_String3 !=null ? aud.Language_String3
: (aud.Title=~/(?i).+spa.+/?'spa': aud.Title.substring(0,3).toLowerCase())
audiosMap[shortDesc] = audiosMap[shortDesc] ?: [:] audiosMap[shortDesc] = audiosMap[shortDesc] ?: [:]
audiosMap[shortDesc][aud.Format] = audiosMap[shortDesc][aud.Format] ?: [] audiosMap[shortDesc][aud.Format] = audiosMap[shortDesc][aud.Format] ?: []
audiosMap[shortDesc][aud.Format] << aud audiosMap[shortDesc][aud.Format] << aud
@ -174,14 +176,14 @@ try { //empieza el script
bloqueAudio += str bloqueAudio += str
} }
groupedAudiosMap=null groupedAudiosMap=null
bloqueAudio = '['+removeLastComa(bloqueAudio) bloqueAudio = '['+removeLastComa(bloqueAudio)+']'
/***** subtitulos *******/ /***** subtitulos *******/
def bloqueSubs def bloqueSubs
try { try {
def capturedSubs = [:] def capturedSubs = [:]
bloqueSubs = '][' bloqueSubs = '['
for (sub in text) handleSub(sub, capturedSubs) for (sub in text) handleSub(sub, capturedSubs)
for (entry in capturedSubs) bloqueSubs += (entry.value!='null'?entry.value:'und')+', ' for (entry in capturedSubs) bloqueSubs += (entry.value!='null'?entry.value:'und')+', '
bloqueSubs = bloqueSubs.substring(0,bloqueSubs.size()-2)+']' bloqueSubs = bloqueSubs.substring(0,bloqueSubs.size()-2)+']'
@ -371,13 +373,13 @@ def getMaxQuality (mapAudioIndexedByFormat) {
def printAudio (audio2Print) { def printAudio (audio2Print) {
def formato_audio = audio2Print.Format_Commercial def formato_audio = audio2Print.Format_Commercial
.replaceAll(/Dolby Digital/, 'Dolby') .replaceAll(/Dolby Digital/, 'Dolby')
.replaceAll(/ Plus/, '+') .replaceAll(/ Plus/, 'P')
.replaceAll(/DTS-HD Master Audio/, 'DTS-MA') .replaceAll(/DTS-HD Master Audio/, 'DTS-MA')
.replaceAll(/DTS-HD High Resolution Audio/, 'DTS-HD-H') .replaceAll(/DTS-HD High Resolution Audio/, 'DTS-HR')
.replaceAll(/MPEG Audio/, 'MPEG') .replaceAll(/MPEG Audio/, 'MPEG')
.replaceAll(/HE-AAC/, 'AAC+') .replaceAll(/HE-AAC/, 'hAAC')
.replaceAll(/ with Dolby Atmos/, 'Atmos') .replaceAll(/ with Dolby Atmos/, 'Atmos')
.replaceAll(/TrueHD/, 'HD') .replaceAll(/TrueHD/, 'tHD')
def canales = audio2Print.Channels.replace(2:'2.0', 6:'5.1', 8:'7.1') def canales = audio2Print.Channels.replace(2:'2.0', 6:'5.1', 8:'7.1')
return formato_audio + ' ' + canales return formato_audio + ' ' + canales
} }
@ -399,15 +401,18 @@ def countAudiosInMap(audMap){
} }
/********* SUBS ***************/ /********* SUBS ***************/
def handleSub(sub, capturedSubs) { def handleSub(sub, capturedSubs) {
def lang = sub.Language_String != null ? sub.Language_String : sub.title def lang = sub.Language_String3 !=null ? sub.Language_String3
def lang3 = sub.Language_String3 != null ? sub.Language_String3 : sub.title : (sub.Title=~/(?i).+spa.+/?'spa': sub.Title.substring(0,3).toLowerCase())
if (sub.Title!=null && sub.Title=~/(?i).*latin.*/) lang='lat'
def forced = sub.title!=null ? sub.title.toLowerCase().contains("forzado") : false def forced = sub.title!=null ? sub.title.toLowerCase().contains("forzado") : false
if (!capturedSubs.containsKey(lang)) { if (!capturedSubs.containsKey(lang)) {
capturedSubs[lang] = lang3+(forced?'+F':'') capturedSubs[lang] = lang+(forced?' F':'')
} else { } else {
def existing=capturedSubs[lang] def existing=capturedSubs[lang]
if (!existing.contains('+F') && !existing.contains('+')) def newTxt=''+existing
capturedSubs[lang] = lang3+(forced?'+F':'+') if (!existing.contains('+')) newTxt += '+'
if (forced && !existing.contains('F')) newTxt += ' F'
capturedSubs[lang]=newTxt.replace(" F+","+F")
} }
} }

5
new audio test.groovy
View File

@ -1,4 +1,4 @@
def skipAudioCheck=true
def getAudiosFromListByFormat (format, listAudios) { def getAudiosFromListByFormat (format, listAudios) {
def result=[] def result=[]
for (singleAudio in listAudios) { for (singleAudio in listAudios) {
@ -131,7 +131,8 @@ def printAudio (audio2Print) {
def bloqueAudio2='' def bloqueAudio2=''
def audiosMap = [:] def audiosMap = [:]
for (aud in audio) { for (aud in audio) {
def shortDesc = aud.Language_String3 def shortDesc = aud.Language_String3 !=null ? aud.Language_String3
: (aud.Title=~/(?i).+spa.+/?'spa': aud.Title.substring(0,3).toLowerCase())
audiosMap[shortDesc] = audiosMap[shortDesc] ?: [:] audiosMap[shortDesc] = audiosMap[shortDesc] ?: [:]
audiosMap[shortDesc][aud.Format] = audiosMap[shortDesc][aud.Format] ?: [] audiosMap[shortDesc][aud.Format] = audiosMap[shortDesc][aud.Format] ?: []
audiosMap[shortDesc][aud.Format] << aud audiosMap[shortDesc][aud.Format] << aud