mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* extract: make --output path relative to archive file

This commit is contained in:
Reinhard Pointner 2012-05-01 16:33:55 +00:00
parent 36a7eb5e5a
commit 1f10c59364
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/net/sourceforge/filebot/cli/CmdlineOperations.java
View File

@ -942,7 +942,10 @@ public class CmdlineOperations implements CmdlineInterface {
for (File file : archiveFiles) { for (File file : archiveFiles) {
Archive archive = new Archive(file); Archive archive = new Archive(file);
try { try {
File outputFolder = (output != null) ? new File(output).getAbsoluteFile() : new File(file.getParentFile(), getNameWithoutExtension(file.getName())); File outputFolder = new File(output != null ? output : getName(file));
if (!outputFolder.isAbsolute()) {
outputFolder = new File(file.getParentFile(), outputFolder.getPath());
}
CLILogger.info(String.format("Extract archive [%s] to [%s]", file.getName(), outputFolder)); CLILogger.info(String.format("Extract archive [%s] to [%s]", file.getName(), outputFolder));
FileMapper outputMapper = new FileMapper(outputFolder, false); FileMapper outputMapper = new FileMapper(outputFolder, false);

4
website/scripts/utorrent-postprocess.groovy
View File

@ -11,7 +11,7 @@ if (ut_kind == "multi") {
} }
// extract archives if necessary // extract archives if necessary
input += extract(file:input) input += extract(file:input, output:".", conflict:"override")
// process only media files // process only media files
input = input.findAll{ it.isVideo() || it.isSubtitle() } input = input.findAll{ it.isVideo() || it.isSubtitle() }
@ -79,6 +79,6 @@ groups.each{ group, files ->
// make XBMC scan for new content // make XBMC scan for new content
xbmc.split(/[\s,|]+/).each{ xbmc.split(/[\s,|]+/).each{
println "Notify XMBC: $it" println "Notify XBMC: $it"
invokeScanVideoLibrary(it) invokeScanVideoLibrary(it)
} }