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

Fix --conflict auto issue (PROPER/REPACK) 

@see https://www.filebot.net/forums/viewtopic.php?f=10&t=4131
This commit is contained in:
Reinhard Pointner 2016-09-16 13:28:02 +08:00
parent 17775e477f
commit 536a8c3a3a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/net/filebot/media/VideoQuality.java
View File

@ -30,7 +30,7 @@ public class VideoQuality implements Comparator<File> {
try { try {
return comparingDouble(c).compare(f1, f2); return comparingDouble(c).compare(f1, f2);
} catch (Throwable e) { } catch (Throwable e) {
debug.warning(format("Failed to read media info: %s", e.getMessage())); debug.warning(format("Failed to read media info: %s", e));
return 0; return 0;
} }
}).filter(i -> i != 0).findFirst().orElse(0); }).filter(i -> i != 0).findFirst().orElse(0);

4
source/net/filebot/util/StringUtilities.java
View File

@ -63,6 +63,10 @@ public final class StringUtilities {
} }
public static boolean find(String s, Pattern pattern) { public static boolean find(String s, Pattern pattern) {
if (s == null || s.length() == 0) {
return false;
}
return pattern.matcher(s).find(); return pattern.matcher(s).find();
} }