moparisthebest
/
filebot
mirror of https://github.com/mitb-archive/filebot
1
0
Fork 0
Code Issues Releases Wiki Activity

* fix local file script call 

* stop any unnecessary scraping of subscene
This commit is contained in:
Reinhard Pointner 2012-04-09 14:37:16 +00:00
parent 32b2d35e0c
commit ec796fc478
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
@ -145,8 +146,8 @@ public class ArgumentBean {
public URI getScriptLocation() {
try {
return new URI(script);
} catch (URISyntaxException eu) {
return new URL(script).toURI();
} catch (Exception eu) {
if (script.startsWith("script://")) {
try {
return new URI("script", script.substring(9), null, null, null);

2
source/net/sourceforge/filebot/web/SubsceneSubtitleDescriptor.java
View File

@ -87,7 +87,7 @@ public class SubsceneSubtitleDescriptor implements SubtitleDescriptor {
@Override
public String getPath() {
return String.format("%s.%s", getName(), getSubtitleInfo().get("typeId"));
return String.format("%s.%s", getName(), subtitleInfo == null ? null : subtitleInfo.get("typeId"));
}