Merge pull request #57 from Migz93/master

Update: Migz2CleanTitle

Community/Tdarr_Plugin_MC93_Migz1FFMPEG.js

@@ -53,6 +53,10 @@ function plugin(file, librarySettings, inputs) {
     } else {
 	  response.container = '.' + inputs.container
 	}
+	
+  if (inputs.container == "mkv") {
+	  extraArguments = "-map -0:d "
+  }
    
   if (file.fileMedium !== "video") {
       response.processFile = false
@@ -73,6 +77,7 @@ function plugin(file, librarySettings, inputs) {
   var minimumBitrate = ~~(targetBitrate * 0.7)
   var maximumBitrate = ~~(targetBitrate * 1.3)
   
+  
   if (targetBitrate == "0") {
 	  response.processFile = false
       response.infoLog += "☒Target bitrate could not be calculated. Skipping this plugin. \n"
@@ -87,7 +92,7 @@ function plugin(file, librarySettings, inputs) {
           return response
 		} else {
 		  response.processFile = true
-		  response.preset += `, -c copy`
+		  response.preset += `, -c copy ${extraArguments}`
 		  response.infoLog += `☒Current bitrate is below configured bitrate cutoff of ${inputs.bitrate_cutoff} but is not in correct container. Remuxing to ${inputs.container} but not transcoding. \n`
 		  return response
 	    }
@@ -102,7 +107,7 @@ function plugin(file, librarySettings, inputs) {
 			  }
 		  if (file.ffProbeData.streams[i].codec_name == 'hevc' && file.container != '${inputs.container}') {
 			  response.infoLog += `☒File is hevc but is not in ${inputs.container} container. Remuxing. \n`
-			  response.preset = ', -map 0 -c copy'
+			  response.preset = `, -map 0 -c copy ${extraArguments}`
 			  response.processFile = true;
 			  return response
 			  }
@@ -140,9 +145,6 @@ function plugin(file, librarySettings, inputs) {
     response.preset = `-c:v vp9_cuvid`
   }
   
-  if (inputs.container == "mkv") {
-	  extraArguments = "-map -0:d "
-  }
   
   response.preset += `,-map 0 -c:v hevc_nvenc -rc:v vbr_hq ${bitrateSettings} -bufsize 2M -spatial_aq:v 1 -c:a copy -c:s copy -max_muxing_queue_size 4096 ${extraArguments}`
   response.processFile = true

Community/Tdarr_Plugin_MC93_Migz1FFMPEG_CPU.js

@@ -53,6 +53,10 @@ function plugin(file, librarySettings, inputs) {
     } else {
 	  response.container = '.' + inputs.container
 	}
+	
+  if (inputs.container == "mkv") {
+	  extraArguments = "-map -0:d "
+  }
 
   if (file.fileMedium !== "video") {
       response.processFile = false
@@ -87,7 +91,7 @@ function plugin(file, librarySettings, inputs) {
           return response
 		} else {
 		  response.processFile = true
-		  response.preset += `, -c copy`
+		  response.preset += `, -c copy ${extraArguments}`
 		  response.infoLog += `☒Current bitrate is below configured bitrate cutoff of ${inputs.bitrate_cutoff} but is not in correct container. Remuxing to ${inputs.container} but not transcoding. \n`
 		  return response
 	    }
@@ -102,7 +106,7 @@ function plugin(file, librarySettings, inputs) {
 			  }
 		  if (file.ffProbeData.streams[i].codec_name == 'hevc' && file.container != '${inputs.container}') {
 			  response.infoLog += `☒File is hevc but is not in ${inputs.container} container. Remuxing. \n`
-			  response.preset = ', -map 0 -c copy'
+			  response.preset = `, -map 0 -c copy ${extraArguments}`
 			  response.processFile = true;
 			  return response
 			  }
@@ -112,9 +116,6 @@ function plugin(file, librarySettings, inputs) {
   bitrateSettings = `-b:v ${targetBitrate}k -minrate ${minimumBitrate}k -maxrate ${maximumBitrate}k`
   response.infoLog += `Container for output selected as ${inputs.container}. \n Current bitrate = ${~~(file.file_size / (duration * 0.0075))} \n Bitrate settings: \nTarget = ${targetBitrate} \nMinimum = ${minimumBitrate} \nMaximum = ${maximumBitrate} \n`
 
-  if (inputs.container == "mkv") {
-	  extraArguments = "-map -0:d "
-  }
 
   response.preset += `,-map 0 -c:v libx265 ${bitrateSettings} -bufsize 2M -spatial_aq:v 1 -c:a copy -c:s copy -max_muxing_queue_size 4096 ${extraArguments}`
   response.processFile = true

Community/Tdarr_Plugin_MC93_Migz2CleanTitle.js

@@ -5,14 +5,34 @@ function details() {
     Name: "Migz-Clean title metadata",
     Type: "Video",
 	Operation: "Clean",
-    Description: `This plugin removes title metadata from video/audio/subtitles, if it exists. \n\n`,
+    Description: `This plugin removes title metadata from video/audio/subtitles, if it exists. Video checking is mandatory, audio and subtitles are optional.\n\n`,
-    Version: "1.10",
+    Version: "1.20",
     Link: "https://github.com/HaveAGitGat/Tdarr_Plugins/blob/master/Community/Tdarr_Plugin_MC93_Migz2CleanTitle.js",
-    Tags:'pre-processing,ffmpeg',
+    Tags:'pre-processing,ffmpeg,configurable',
+    Inputs: [
+       {
+         name: 'clean_audio',
+         tooltip: `Specify if audio titles should be checked & cleaned. Optional.
+  	   \\nExample:\\n
+  	   true
+
+  	   \\nExample:\\n
+  	   false`
+       },
+  	 {
+         name: 'clean_subtitles',
+         tooltip: `Specify if subtitle titles should be checked & cleaned. Optional.
+  	   \\nExample:\\n
+  	   true
+
+  	   \\nExample:\\n
+  	   false`
+       },
+  	 ]
   }
 }
 
-function plugin(file) {
+function plugin(file, librarySettings, inputs) {
   var response = {
      processFile : false,
      preset : '',
@@ -23,7 +43,7 @@ function plugin(file) {
      infoLog : '',
 
   }
-  
+
   var ffmpegCommandInsert = ''
   var videoIdx = 0
   var audioIdx = 0
@@ -36,47 +56,43 @@ function plugin(file) {
     response.processFile = false;
     return response
   }
-  
+
-  try {
+    if (typeof file.meta.Title != 'undefined') try {
-    if (typeof file.meta.Title != 'undefined' ){
 	    ffmpegCommandInsert += ` -metadata title="" `
-		response.infoLog += "1"
 	    convert = true
-    }
+    } catch (err) { }
-  } catch (err) { }
+
-  
+  for (var i = 0; i < file.ffProbeData.streams.length; i++) try {
-  for (var i = 0; i < file.ffProbeData.streams.length; i++) {
         if (file.ffProbeData.streams[i].codec_type.toLowerCase() == "video") {
-		    try {
+		    if (typeof file.ffProbeData.streams[i].tags.title != 'undefined') {
-		         if (typeof file.ffProbeData.streams[i].tags.title != 'undefined') {
+			    response.infoLog += `☒Video stream title is not empty, most likely junk metadata. Removing title from stream ${i} \n`
-			     ffmpegCommandInsert += ` -metadata:s:v:${videoIdx} title="" `
+			    ffmpegCommandInsert += ` -metadata:s:v:${videoIdx} title="" `
-	  	         convert = true
+	  	        convert = true
-                }
+            }
-			} catch (err) { }
      		videoIdx++
 		}
-		        if (file.ffProbeData.streams[i].codec_type.toLowerCase() == "audio") {
+		
-		    try {
+		if (file.ffProbeData.streams[i].codec_type.toLowerCase() == "audio" && inputs.clean_audio.toLowerCase() == "true") {
-		         if (typeof file.ffProbeData.streams[i].tags.title != 'undefined') {
+			if (file.ffProbeData.streams[i].tags.title.split('.').length-1 > 3) {
-			     ffmpegCommandInsert += ` -metadata:s:a:${audioIdx} title="" `
+				response.infoLog += `☒More then 3 full stops detected in subtitle title, likely to be junk metadata. Removing title from stream ${i} \n`
-	  	         convert = true
+				ffmpegCommandInsert += ` -metadata:s:a:${audioIdx} title="" `
-                }
+	  	        convert = true
-			} catch (err) { }
+			}
      		audioIdx++
 		}
-		        if (file.ffProbeData.streams[i].codec_type.toLowerCase() == "subtitle") {
+		
-		    try {
+		if (file.ffProbeData.streams[i].codec_type.toLowerCase() == "subtitle" && inputs.clean_subtitles.toLowerCase() == "true") {
-		         if (typeof file.ffProbeData.streams[i].tags.title != 'undefined') {
+			if (file.ffProbeData.streams[i].tags.title.split('.').length-1 > 3) {
-			     ffmpegCommandInsert += ` -metadata:s:s:${subtitleIdx} title="" `
+				response.infoLog += `☒More then 3 full stops detected in subtitle title, likely to be junk metadata. Removing title from stream ${i} \n`
-	  	         convert = true
+				ffmpegCommandInsert += ` -metadata:s:s:${subtitleIdx} title="" `
-                }
+	  	        convert = true
-			} catch (err) { }
+		}
      		subtitleIdx++
 		}
-    }
+    } catch (err) { }
-  
+
-   if (convert == true){
+   if (convert == true) {
-    response.infoLog += "☒File has title metadata \n"
+    response.infoLog += "☒File has title metadata. Removing \n"
     response.preset = `,${ffmpegCommandInsert} -c copy`
     response.reQueueAfter = true;
     response.processFile = true;
@@ -87,4 +103,4 @@ function plugin(file) {
 }
 
 module.exports.details = details;
-module.exports.plugin = plugin;
+module.exports.plugin = plugin;