* fixes for better handling of oddly named archives and help auto-detection along by putting the original folder ahead of the archive name

@see
http://www.filebot.net/forums/viewtopic.php?f=8&t=666&p=4443#p4443
This commit is contained in:
Reinhard Pointner 2013-04-13 06:47:28 +00:00
parent 17d1b6c4af
commit 0e8bd858c3
1 changed files with 2 additions and 2 deletions

View File

@ -86,8 +86,8 @@ input = input.flatten()
def tempFiles = []
input = input.flatten{ f ->
if (f.isArchive() || f.hasExtension('001')) {
def extractDir = new File(f.parentFile, f.nameWithoutExtension)
def extractFiles = extract(file: f, output: extractDir, conflict: 'override', filter: { it.isArchive() || it.isVideo() || it.isSubtitle() || (music && it.isAudio()) }, forceExtractAll: true) ?: []
def extractDir = new File(f.dir, f.nameWithoutExtension)
def extractFiles = extract(file: f, output: new File(extractDir, f.dir.name), conflict: 'override', filter: { it.isArchive() || it.isVideo() || it.isSubtitle() || (music && it.isAudio()) }, forceExtractAll: true) ?: []
tempFiles += extractDir
tempFiles += extractFiles
return extractFiles