diff --git a/Community/Tdarr_Plugin_078d_Output_embedded_subs_to_SRT_and_remove.js b/Community/Tdarr_Plugin_078d_Output_embedded_subs_to_SRT_and_remove.js index abc42db..41e4122 100644 --- a/Community/Tdarr_Plugin_078d_Output_embedded_subs_to_SRT_and_remove.js +++ b/Community/Tdarr_Plugin_078d_Output_embedded_subs_to_SRT_and_remove.js @@ -43,11 +43,21 @@ module.exports.plugin = function plugin(file, librarySettings, inputs, otherArgu lang = subStream.tags.language } - let subsFile = file.file - subsFile = subsFile.split('.') - subsFile[subsFile.length - 2] += `.${lang}` - subsFile[subsFile.length - 1] = 'srt' - subsFile = subsFile.join('.') + const { originalLibraryFile } = otherArguments; + + let subsFile = ''; + + // for Tdarr V2 (2.00.05+) + if (originalLibraryFile && originalLibraryFile.file) { + subsFile = originalLibraryFile.file; + } else { + // for Tdarr V1 + subsFile = file.file; + } + subsFile = subsFile.split('.'); + subsFile[subsFile.length - 2] += `.${lang}`; + subsFile[subsFile.length - 1] = 'srt'; + subsFile = subsFile.join('.'); let index = subStream.index let command = `${ffmpegPath} -i "${file.file}" -map 0:${index} "${subsFile}"` diff --git a/Community/Tdarr_Plugin_rr01_drpeppershaker_extract_subs_to_SRT.js b/Community/Tdarr_Plugin_rr01_drpeppershaker_extract_subs_to_SRT.js index 88eced3..5076e26 100644 --- a/Community/Tdarr_Plugin_rr01_drpeppershaker_extract_subs_to_SRT.js +++ b/Community/Tdarr_Plugin_rr01_drpeppershaker_extract_subs_to_SRT.js @@ -34,9 +34,8 @@ module.exports.details = function details() { }; }; -module.exports.plugin = function plugin(file, librarySettings, inputs) { +module.exports.plugin = function plugin(file, librarySettings, inputs, otherArguments) { // Must return this object at some point in the function else plugin will fail. - const response = { processFile: true, preset: '', @@ -76,7 +75,17 @@ module.exports.plugin = function plugin(file, librarySettings, inputs) { title = subStream.tags.title; } - let subsFile = file.file; + const { originalLibraryFile } = otherArguments; + + let subsFile = ''; + + // for Tdarr V2 (2.00.05+) + if (originalLibraryFile && originalLibraryFile.file) { + subsFile = originalLibraryFile.file; + } else { + // for Tdarr V1 + subsFile = file.file; + } subsFile = subsFile.split('.'); subsFile[subsFile.length - 2] += `.${lang}`; subsFile[subsFile.length - 1] = 'srt';