X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fjexer%2FTDirectoryList.java;h=322ff5c4e5cb493f93cf356716117d2274156d26;hp=642366b7e23c42f11bf1baedacb8363c15fa1e00;hb=HEAD;hpb=a2018e9964f6c58742cd1e6dd0a0c63e244a89d6 diff --git a/src/jexer/TDirectoryList.java b/src/jexer/TDirectoryList.java index 642366b..322ff5c 100644 --- a/src/jexer/TDirectoryList.java +++ b/src/jexer/TDirectoryList.java @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (C) 2017 Kevin Lamonte + * Copyright (C) 2019 Kevin Lamonte * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -30,23 +30,131 @@ package jexer; import java.io.File; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; + +import jexer.bits.StringUtils; /** * TDirectoryList shows the files within a directory. */ -public final class TDirectoryList extends TList { +public class TDirectoryList extends TList { + + // ------------------------------------------------------------------------ + // Variables -------------------------------------------------------------- + // ------------------------------------------------------------------------ /** * Files in the directory. */ - private List files; + private Map files; /** * Root path containing files to display. */ private File path; + /** + * The list of filters that a file must match in order to be displayed. + */ + private List filters; + + // ------------------------------------------------------------------------ + // Constructors ----------------------------------------------------------- + // ------------------------------------------------------------------------ + + /** + * Public constructor. + * + * @param parent parent widget + * @param path directory path, must be a directory + * @param x column relative to parent + * @param y row relative to parent + * @param width width of text area + * @param height height of text area + */ + public TDirectoryList(final TWidget parent, final String path, final int x, + final int y, final int width, final int height) { + + this(parent, path, x, y, width, height, null, null, null); + } + + /** + * Public constructor. + * + * @param parent parent widget + * @param path directory path, must be a directory + * @param x column relative to parent + * @param y row relative to parent + * @param width width of text area + * @param height height of text area + * @param action action to perform when an item is selected (enter or + * double-click) + */ + public TDirectoryList(final TWidget parent, final String path, final int x, + final int y, final int width, final int height, final TAction action) { + + this(parent, path, x, y, width, height, action, null, null); + } + + /** + * Public constructor. + * + * @param parent parent widget + * @param path directory path, must be a directory + * @param x column relative to parent + * @param y row relative to parent + * @param width width of text area + * @param height height of text area + * @param action action to perform when an item is selected (enter or + * double-click) + * @param singleClickAction action to perform when an item is selected + * (single-click) + */ + public TDirectoryList(final TWidget parent, final String path, final int x, + final int y, final int width, final int height, final TAction action, + final TAction singleClickAction) { + + this(parent, path, x, y, width, height, action, singleClickAction, + null); + } + + /** + * Public constructor. + * + * @param parent parent widget + * @param path directory path, must be a directory + * @param x column relative to parent + * @param y row relative to parent + * @param width width of text area + * @param height height of text area + * @param action action to perform when an item is selected (enter or + * double-click) + * @param singleClickAction action to perform when an item is selected + * (single-click) + * @param filters a list of strings that files must match to be displayed + */ + public TDirectoryList(final TWidget parent, final String path, final int x, + final int y, final int width, final int height, final TAction action, + final TAction singleClickAction, final List filters) { + + super(parent, null, x, y, width, height, action); + files = new HashMap(); + this.filters = filters; + this.singleClickAction = singleClickAction; + + setPath(path); + } + + // ------------------------------------------------------------------------ + // TList ------------------------------------------------------------------ + // ------------------------------------------------------------------------ + + // ------------------------------------------------------------------------ + // TDirectoryList --------------------------------------------------------- + // ------------------------------------------------------------------------ + /** * Set the new path to display. * @@ -68,11 +176,35 @@ public final class TDirectoryList extends TList { if (newFiles[i].isDirectory()) { continue; } - files.add(newFiles[i]); - newStrings.add(renderFile(files.size() - 1)); + if (filters != null) { + for (String pattern: filters) { + + /* + System.err.println("newFiles[i] " + + newFiles[i].getName() + " " + pattern + + " " + newFiles[i].getName().matches(pattern)); + */ + + if (newFiles[i].getName().matches(pattern)) { + String key = renderFile(newFiles[i]); + files.put(key, newFiles[i]); + newStrings.add(key); + break; + } + } + } else { + String key = renderFile(newFiles[i]); + files.put(key, newFiles[i]); + newStrings.add(key); + } } } setList(newStrings); + + // Select the first entry + if (getMaxSelectedIndex() >= 0) { + setSelectedIndex(0); + } } /** @@ -81,58 +213,22 @@ public final class TDirectoryList extends TList { * @return the path */ public File getPath() { - path = files.get(getSelectedIndex()); + path = files.get(getSelected()); return path; } /** * Format one of the entries for drawing on the screen. * - * @param index index into files + * @param file the File * @return the line to draw */ - private String renderFile(final int index) { - File file = files.get(index); + private String renderFile(final File file) { String name = file.getName(); - if (name.length() > 20) { + if (StringUtils.width(name) > 20) { name = name.substring(0, 17) + "..."; } return String.format("%-20s %5dk", name, (file.length() / 1024)); } - /** - * Public constructor. - * - * @param parent parent widget - * @param path directory path, must be a directory - * @param x column relative to parent - * @param y row relative to parent - * @param width width of text area - * @param height height of text area - */ - public TDirectoryList(final TWidget parent, final String path, final int x, - final int y, final int width, final int height) { - - this(parent, path, x, y, width, height, null); - } - - /** - * Public constructor. - * - * @param parent parent widget - * @param path directory path, must be a directory - * @param x column relative to parent - * @param y row relative to parent - * @param width width of text area - * @param height height of text area - * @param action action to perform when an item is selected - */ - public TDirectoryList(final TWidget parent, final String path, final int x, - final int y, final int width, final int height, final TAction action) { - - super(parent, null, x, y, width, height, action); - files = new ArrayList(); - setPath(path); - } - }