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-28 23:09:38 +08:00
parent aea553b154
commit 846e4166ed
17 changed files with 70 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/net/filebot/cli/ArgumentBean.java
View File

@ -160,9 +160,9 @@ public class ArgumentBean {
if (resolveFolders && file.isDirectory()) {
if (recursive) {
files.addAll(listFiles(file));
files.addAll(listFiles(file, FILES));
} else {
files.addAll(filter(getChildren(file, FILES), NOT_HIDDEN));
files.addAll(getChildren(file, FILES));
}
} else {
files.add(file);

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

@ -145,7 +145,7 @@ public abstract class FolderWatchService implements Closeable {
// start watching newly created folder
if (watchTree) {
try {
commitSet.addAll(listFiles(file));
commitSet.addAll(listFiles(file, FILES));
watchFolder(file);
} catch (IOException e) {
debug.log(Level.SEVERE, e.getMessage(), e);

16
source/net/filebot/cli/ScriptShellBaseClass.java
View File

@ -4,6 +4,7 @@ import static java.util.Arrays.*;
import static java.util.Collections.*;
import static net.filebot.Logging.*;
import static net.filebot.media.XattrMetaInfo.*;
import static net.filebot.util.FileUtilities.*;
import static net.filebot.util.StringUtilities.*;
import java.io.BufferedReader;
@ -46,7 +47,6 @@ import net.filebot.WebServices;
import net.filebot.format.AssociativeScriptObject;
import net.filebot.media.MediaDetection;
import net.filebot.similarity.SeasonEpisodeMatcher.SxE;
import net.filebot.util.FileUtilities;
import net.filebot.web.Movie;
public abstract class ScriptShellBaseClass extends Script {
@ -95,7 +95,7 @@ public abstract class ScriptShellBaseClass extends Script {
}
public Object executeScript(String input, Map<String, ?> bindings, Object... args) throws Throwable {
return executeScript(input, asList(getArgumentBean().getArray()), bindings, FileUtilities.asFileList(args));
return executeScript(input, asList(getArgumentBean().getArray()), bindings, asFileList(args));
}
public Object executeScript(String input, List<String> argv, Map<String, ?> bindings, List<File> args) throws Throwable {
@ -212,7 +212,7 @@ public abstract class ScriptShellBaseClass extends Script {
}
public String detectSeriesName(Object files, boolean anime) throws Exception {
List<File> input = FileUtilities.asFileList(files);
List<File> input = asFileList(files);
if (input.isEmpty())
return null;
@ -425,7 +425,7 @@ public abstract class ScriptShellBaseClass extends Script {
}
public List<String> getMediaInfo(Collection<?> files, String format) throws Exception {
return cli.getMediaInfo(FileUtilities.asFileList(files), format, null); // explicitly ignore the --filter option
return cli.getMediaInfo(asFileList(files), format, null); // explicitly ignore the --filter option
}
public Object getMediaInfo(Map<String, ?> parameters) throws Exception {
@ -453,12 +453,12 @@ public abstract class ScriptShellBaseClass extends Script {
private List<File> getInputFileList(Map<String, ?> parameters) {
Object file = parameters.get("file");
if (file != null) {
return FileUtilities.asFileList(file);
return asFileList(file);
}
Object folder = parameters.get("folder");
if (folder != null) {
return FileUtilities.listFiles(FileUtilities.asFileList(folder), 0, false, true, false);
return listFiles(asFileList(folder), 0, FILES, HUMAN_ORDER);
}
return emptyList();
@ -469,8 +469,8 @@ public abstract class ScriptShellBaseClass extends Script {
Map<File, File> files = new LinkedHashMap<File, File>();
if (map != null) {
for (Entry<?, ?> it : map.entrySet()) {
List<File> key = FileUtilities.asFileList(it.getKey());
List<File> value = FileUtilities.asFileList(it.getValue());
List<File> key = asFileList(it.getKey());
List<File> value = asFileList(it.getValue());
if (key.size() == 1 && value.size() == 1) {
files.put(key.get(0), value.get(0));
} else {

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

@ -6,6 +6,7 @@ import static java.util.Collections.*;
import static java.util.stream.Collectors.*;
import static net.filebot.MediaTypes.*;
import static net.filebot.media.XattrMetaInfo.*;
import static net.filebot.util.FileUtilities.*;
import java.io.File;
import java.io.IOException;
@ -117,7 +118,7 @@ public class ScriptShellMethods {
}
public static List<File> listTree(File self, int maxDepth) {
return FileUtilities.listFiles(singleton(self), maxDepth, false, true, true);
return FileUtilities.listFiles(singleton(self), maxDepth, FILES, HUMAN_ORDER);
}
public static List<File> getFiles(File self) {
@ -125,7 +126,7 @@ public class ScriptShellMethods {
}
public static List<File> getFiles(File self, Closure<?> closure) {
return getFiles(singletonList(self), closure);
return getFiles(singleton(self), closure);
}
public static List<File> getFiles(Collection<?> self) {
@ -133,14 +134,14 @@ public class ScriptShellMethods {
}
public static List<File> getFiles(Collection<?> self, Closure<?> closure) {
final List<File> roots = FileUtilities.asFileList(self.toArray());
List<File> roots = FileUtilities.asFileList(self.toArray());
List<File> files = FileUtilities.listFiles(roots);
List<File> files = FileUtilities.listFiles(roots, FILES, HUMAN_ORDER);
if (closure != null) {
files = DefaultGroovyMethods.findAll(files, closure);
}
return FileUtilities.sortByUniquePath(files);
return files;
}
public static List<File> getFolders(File self) {
@ -156,14 +157,14 @@ public class ScriptShellMethods {
}
public static List<File> getFolders(Collection<?> self, Closure<?> closure) {
final List<File> roots = FileUtilities.asFileList(self.toArray());
List<File> roots = FileUtilities.asFileList(self.toArray());
List<File> folders = FileUtilities.listFolders(roots);
List<File> folders = FileUtilities.listFolders(roots, HUMAN_ORDER);
if (closure != null) {
folders = DefaultGroovyMethods.findAll(folders, closure);
}
return FileUtilities.sortByUniquePath(folders);
return folders;
}
public static List<File> getMediaFolders(File self) throws IOException {

6
source/net/filebot/format/MediaBindingBean.java
View File

@ -34,8 +34,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Optional;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.regex.Pattern;
import com.cedarsoftware.util.io.JsonWriter;
@ -992,9 +990,9 @@ public class MediaBindingBean {
public File getInferredMediaFile() {
if (getMediaFile().isDirectory()) {
// just select the first video file in the folder as media sample
SortedSet<File> videos = new TreeSet<File>(filter(listFiles(getMediaFile()), VIDEO_FILES));
List<File> videos = listFiles(getMediaFile(), VIDEO_FILES, CASE_INSENSITIVE_ORDER);
if (videos.size() > 0) {
return videos.iterator().next();
return videos.get(0);
}
} else if (SUBTITLE_FILES.accept(getMediaFile()) || ((infoObject instanceof Episode || infoObject instanceof Movie) && !VIDEO_FILES.accept(getMediaFile()))) {
// prefer equal match from current context if possible

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

@ -1204,7 +1204,7 @@ public class MediaDetection {
Set<Integer> collection = new LinkedHashSet<Integer>();
List<File> nfoFiles = new ArrayList<File>();
if (file.isDirectory()) {
nfoFiles.addAll(filter(listFiles(file), NFO_FILES));
nfoFiles.addAll(listFiles(file, NFO_FILES));
} else if (file.getParentFile() != null && file.getParentFile().isDirectory()) {
nfoFiles.addAll(getChildren(file.getParentFile(), NFO_FILES));
}

3
source/net/filebot/ui/filter/AttributeTool.java
View File

@ -55,8 +55,7 @@ class AttributeTool extends Tool<TableModel> {
return model;
}
List<File> files = filter(listFiles(root), VIDEO_FILES, SUBTITLE_FILES);
files.sort(HUMAN_ORDER);
List<File> files = listFiles(root, filter(VIDEO_FILES, SUBTITLE_FILES), HUMAN_ORDER);
for (File file : files) {
Object metaObject = xattr.getMetaInfo(file);

4
source/net/filebot/ui/filter/ExtractTool.java
View File

@ -82,9 +82,7 @@ class ExtractTool extends Tool<TableModel> {
}
// ignore non-archives files and trailing multi-volume parts
List<File> files = filter(listFiles(root), Archive.VOLUME_ONE_FILTER);
files.sort(HUMAN_ORDER);
List<File> files = listFiles(root, Archive.VOLUME_ONE_FILTER, HUMAN_ORDER);
List<ArchiveEntry> entries = new ArrayList<ArchiveEntry>();
try {

4
source/net/filebot/ui/filter/MediaInfoTool.java
View File

@ -58,9 +58,7 @@ class MediaInfoTool extends Tool<TableModel> {
return new MediaInfoTableModel();
}
List<File> files = filter(listFiles(root), VIDEO_FILES, AUDIO_FILES);
files.sort(HUMAN_ORDER);
List<File> files = listFiles(root, filter(VIDEO_FILES, AUDIO_FILES), HUMAN_ORDER);
Map<MediaInfoKey, String[]> data = new TreeMap<MediaInfoKey, String[]>();
try (MediaInfo mi = new MediaInfo()) {

3
source/net/filebot/ui/filter/SplitTool.java
View File

@ -76,8 +76,7 @@ class SplitTool extends Tool<TreeModel> {
int nextPart = 1;
long splitSize = getSplitSize();
List<File> files = listFiles(root);
files.sort(HUMAN_ORDER);
List<File> files = listFiles(root, FILES, HUMAN_ORDER);
List<TreeNode> rootGroup = new ArrayList<TreeNode>();
List<File> currentPart = new ArrayList<File>();

2
source/net/filebot/ui/filter/Tool.java
View File

@ -101,7 +101,7 @@ abstract class Tool<M> extends JComponent {
long totalSize = 0;
for (File f : files) {
totalCount += FileUtilities.listFiles(f).size();
totalCount += FileUtilities.listFiles(f, FileUtilities.FILES).size();
totalSize += FileUtils.sizeOf(f);
}

6
source/net/filebot/ui/filter/TypeTool.java
View File

@ -45,7 +45,11 @@ class TypeTool extends Tool<TreeModel> {
@Override
protected TreeModel createModelInBackground(File root) throws InterruptedException {
List<File> filesAndFolders = (root != null) ? listFiles(singleton(root), FILE_WALK_MAX_DEPTH, true, true, true) : new ArrayList<File>();
if (root == null) {
return new DefaultTreeModel(new FolderNode("Types", emptyList()));
}
List<File> filesAndFolders = listFiles(root, f -> true, HUMAN_ORDER);
List<TreeNode> groups = new ArrayList<TreeNode>();
for (Entry<String, FileFilter> it : getMetaTypes().entrySet()) {

5
source/net/filebot/ui/list/FileListTransferablePolicy.java
View File

@ -82,12 +82,9 @@ class FileListTransferablePolicy extends FileTransferablePolicy {
title.accept(getFolderName(files.get(0)));
}
List<File> list = listFiles(files);
list.sort(HUMAN_ORDER);
// load all files from the given folders recursively up do a depth of 32
format.accept(ListPanel.DEFAULT_FILE_FORMAT);
model.accept(list);
model.accept(listFiles(files, FILES, HUMAN_ORDER));
}
}

2
source/net/filebot/ui/rename/NamesListTransferablePolicy.java
View File

@ -97,7 +97,7 @@ class NamesListTransferablePolicy extends FileTransferablePolicy {
loadTorrentFiles(files, values);
} else {
// load all files from the given folders recursively up do a depth of 32
listFiles(files).stream().sorted(HUMAN_ORDER).map(FastFile::new).forEach(values::add);
listFiles(files, FILES, HUMAN_ORDER).stream().map(FastFile::new).forEach(values::add);
}
model.addAll(values);

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

@ -84,13 +84,7 @@ public class Preset {
}
}
List<File> files = listFiles(getInputFolder());
if (filter != null) {
files = filter(files, filter);
}
files.sort(HUMAN_ORDER);
return files;
return listFiles(getInputFolder(), f -> f.isFile() && filter.accept(f), HUMAN_ORDER);
}
public AutoCompleteMatcher getAutoCompleteMatcher() {

12
source/net/filebot/ui/subtitle/SubtitleDropTarget.java
View File

@ -19,13 +19,11 @@ import java.awt.dnd.DropTargetEvent;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.TreeSet;
import java.util.function.Function;
import java.util.logging.Level;
@ -162,7 +160,7 @@ abstract class SubtitleDropTarget extends JButton {
@Override
protected DropAction getDropAction(List<File> selection) {
// accept video files and folders
return filter(input, VIDEO_FILES, FOLDERS).size() > 0 ? DropAction.Accept : DropAction.Cancel;
return filter(selection, VIDEO_FILES, FOLDERS).size() > 0 ? DropAction.Accept : DropAction.Cancel;
}
@Override
@ -177,8 +175,7 @@ abstract class SubtitleDropTarget extends JButton {
return false;
}
List<File> files = filter(listFiles(selection), VIDEO_FILES);
files.sort(HUMAN_ORDER);
List<File> files = listFiles(selection, VIDEO_FILES, HUMAN_ORDER);
if (files.size() > 0) {
handleDownload(files);
@ -252,13 +249,10 @@ abstract class SubtitleDropTarget extends JButton {
}
// perform a drop action depending on the given files
List<File> files = listFiles(selection);
List<File> files = listFiles(selection, FILES, HUMAN_ORDER);
List<File> videos = filter(files, VIDEO_FILES);
videos.sort(HUMAN_ORDER);
List<File> subtitles = filter(files, SUBTITLE_FILES);
subtitles.sort(HUMAN_ORDER);
Map<File, File> uploadPlan = new LinkedHashMap<File, File>();

62
source/net/filebot/util/FileUtilities.java
View File

@ -390,6 +390,10 @@ public final class FileUtilities {
return f -> !filter.accept(f);
}
public static FileFilter filter(FileFilter... filters) {
return f -> stream(filters).anyMatch(it -> it.accept(f));
}
public static List<File> listPath(File file) {
return listPathTail(file, Integer.MAX_VALUE, false);
}
@ -455,54 +459,50 @@ public final class FileUtilities {
public static final int FILE_WALK_MAX_DEPTH = 32;
public static List<File> listFiles(File... folders) {
return listFiles(asList(folders));
public static List<File> listFiles(File folder, FileFilter filter) {
return listFiles(singleton(folder), FILE_WALK_MAX_DEPTH, filter, null);
}
public static List<File> listFiles(Iterable<File> folders) {
return listFiles(folders, FILE_WALK_MAX_DEPTH, false, true, false);
public static List<File> listFiles(File folder, FileFilter filter, Comparator<File> order) {
return listFiles(singleton(folder), FILE_WALK_MAX_DEPTH, filter, order);
}
public static List<File> listFolders(Iterable<File> folders) {
return listFiles(folders, FILE_WALK_MAX_DEPTH, false, false, true);
public static List<File> listFiles(Iterable<File> folders, FileFilter filter, Comparator<File> order) {
return listFiles(folders, FILE_WALK_MAX_DEPTH, filter, order);
}
public static List<File> listFiles(Iterable<File> folders, int maxDepth, boolean addHidden, boolean addFiles, boolean addFolders) {
List<File> files = new ArrayList<File>();
public static List<File> listFolders(Iterable<File> folders, Comparator<File> order) {
return listFiles(folders, FILE_WALK_MAX_DEPTH, FOLDERS, order);
}
public static List<File> listFiles(Iterable<File> folders, int maxDepth, FileFilter filter, Comparator<File> order) {
List<File> sink = new ArrayList<File>();
// collect files from directory tree
for (File it : folders) {
if (!addHidden && it.isHidden()) // ignore hidden files
continue;
if (it.isDirectory()) {
if (addFolders) {
files.add(it);
listFiles(it, sink, 0, maxDepth, filter, order);
}
listFiles(it, files, 0, maxDepth, addHidden, addFiles, addFolders);
} else if (addFiles && it.isFile()) {
files.add(it);
if (filter.accept(it)) {
sink.add(it);
}
}
return files;
return sink;
}
private static void listFiles(File folder, List<File> files, int depth, int maxDepth, boolean addHidden, boolean addFiles, boolean addFolders) {
if (depth > maxDepth)
private static void listFiles(File folder, List<File> sink, int depth, int maxDepth, FileFilter filter, Comparator<File> order) {
if (depth > maxDepth) {
return;
for (File it : getChildren(folder)) {
if (!addHidden && it.isHidden()) // ignore hidden files
continue;
if (it.isDirectory()) {
if (addFolders) {
files.add(it);
}
listFiles(it, files, depth + 1, maxDepth, addHidden, addFiles, addFolders);
} else if (addFiles) {
files.add(it);
for (File it : getChildren(folder, NOT_HIDDEN, order)) {
if (it.isDirectory()) {
listFiles(it, sink, depth + 1, maxDepth, filter, order);
}
if (filter.accept(it)) {
sink.add(it);
}
}
}