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

Use human sort order for all paths loaded into the UI

This commit is contained in:
Reinhard Pointner 2016-09-29 02:12:29 +08:00
parent 1743884c17
commit 56316af826
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/net/filebot/CacheManager.java
View File

@ -56,7 +56,7 @@ public class CacheManager {
}
private void clearDiskStore(File cache) {
getChildren(cache).stream().filter(f -> f.isFile() && !f.getName().startsWith(".")).forEach(f -> {
getChildren(cache, FILES).stream().filter(f -> !f.getName().startsWith(".")).forEach(f -> {
try {
delete(f);
} catch (Exception e) {

2
source/net/filebot/cli/ScriptShellMethods.java
View File

@ -180,7 +180,7 @@ public class ScriptShellMethods {
return FileVisitResult.SKIP_SUBTREE;
}
if (FileUtilities.filter(FileUtilities.getChildren(folder), VIDEO_FILES).size() > 0 || MediaDetection.isDiskFolder(folder)) {
if (FileUtilities.getChildren(folder, VIDEO_FILES).size() > 0 || MediaDetection.isDiskFolder(folder)) {
mediaFolders.add(folder);
return FileVisitResult.SKIP_SUBTREE;
}

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

@ -300,7 +300,7 @@ public class AutoDetection {
}
public boolean commonNumberPattern() {
return getChildren(f.getParentFile()).stream().filter(VIDEO_FILES::accept).filter(it -> {
return getChildren(f.getParentFile(), VIDEO_FILES, HUMAN_ORDER).stream().filter(it -> {
return find(dn, snm) || find(normalize(it.getName()), snm);
}).map(it -> {
return streamMatches(it.getName(), EPISODE_NUMBERS).map(Integer::new).collect(toSet());