mirror of
https://github.com/mitb-archive/filebot
synced 2024-12-24 00:38:52 -05:00
Use human sort order for all paths loaded into the UI
This commit is contained in:
parent
1743884c17
commit
56316af826
@ -56,7 +56,7 @@ public class CacheManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void clearDiskStore(File cache) {
|
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 {
|
try {
|
||||||
delete(f);
|
delete(f);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
@ -180,7 +180,7 @@ public class ScriptShellMethods {
|
|||||||
return FileVisitResult.SKIP_SUBTREE;
|
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);
|
mediaFolders.add(folder);
|
||||||
return FileVisitResult.SKIP_SUBTREE;
|
return FileVisitResult.SKIP_SUBTREE;
|
||||||
}
|
}
|
||||||
|
@ -300,7 +300,7 @@ public class AutoDetection {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean commonNumberPattern() {
|
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);
|
return find(dn, snm) || find(normalize(it.getName()), snm);
|
||||||
}).map(it -> {
|
}).map(it -> {
|
||||||
return streamMatches(it.getName(), EPISODE_NUMBERS).map(Integer::new).collect(toSet());
|
return streamMatches(it.getName(), EPISODE_NUMBERS).map(Integer::new).collect(toSet());
|
||||||
|
Loading…
Reference in New Issue
Block a user