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

Browse Source
This commit is contained in:
Reinhard Pointner 2016-09-28 23:40:41 +08:00
parent 6094599436
commit 8efd30ab38
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/net/filebot/ui/rename/FilesListTransferablePolicy.java
View File

@ -10,10 +10,10 @@ import static net.filebot.util.RegularExpressions.*;
import java.awt.datatransfer.Transferable; import java.awt.datatransfer.Transferable;
import java.io.File; import java.io.File;
import java.util.Collection; import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.TreeSet;
import java.util.logging.Level; import java.util.logging.Level;
import net.filebot.media.MediaDetection; import net.filebot.media.MediaDetection;
@ -51,13 +51,13 @@ class FilesListTransferablePolicy extends BackgroundFileTransferablePolicy<File>
@Override @Override
protected void load(List<File> files, TransferAction action) { protected void load(List<File> files, TransferAction action) {
Set<File> fileset = new TreeSet<File>(CASE_INSENSITIVE_ORDER); Set<File> fileset = new LinkedHashSet<File>();
// load files recursively by default // load files recursively by default
load(files, action != TransferAction.LINK, fileset); load(files, action != TransferAction.LINK, fileset);
// use fast file to minimize system calls like length(), isDirectory(), isFile(), ... and list files in human order // use fast file to minimize system calls like length(), isDirectory(), isFile(), ... and list files in human order
publish(fileset.stream().sorted(HUMAN_ORDER).map(FastFile::new).toArray(File[]::new)); publish(fileset.stream().map(FastFile::new).toArray(File[]::new));
} }
private void load(List<File> files, boolean recursive, Collection<File> sink) { private void load(List<File> files, boolean recursive, Collection<File> sink) {
@ -92,7 +92,7 @@ class FilesListTransferablePolicy extends BackgroundFileTransferablePolicy<File>
// load folders recursively // load folders recursively
else if (f.isDirectory()) { else if (f.isDirectory()) {
load(getChildren(f, NOT_HIDDEN), true, sink); // FORCE NATURAL FILE ORDER load(getChildren(f, NOT_HIDDEN, HUMAN_ORDER), true, sink); // FORCE NATURAL FILE ORDER
} }
} }
} }