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

* allow auto-select or auto-ignore in movie mode to make it possible to skip all user interaction

Browse Source
This commit is contained in:
Reinhard Pointner 2012-07-17 17:47:07 +00:00
parent 27e8ec1806
commit 0e2c1ecf36
5 changed files with 65 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
source/net/sourceforge/filebot/resources/button.repeat.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 422 B

BIN
source/net/sourceforge/filebot/resources/button.repeat.selected.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 750 B

6
source/net/sourceforge/filebot/ui/SelectDialog.java
View File

@ -65,13 +65,13 @@ public class SelectDialog<T> extends JDialog {
JComponent c = (JComponent) getContentPane(); JComponent c = (JComponent) getContentPane();
c.setLayout(new MigLayout("insets 1.5mm, nogrid, fill", "", "[pref!][fill][pref!]")); c.setLayout(new MigLayout("insets 1.5mm 1.5mm 2.7mm 1.5mm, nogrid, fill", "", "[pref!][fill][pref!]"));
c.add(headerLabel, "wrap"); c.add(headerLabel, "wrap");
c.add(new JScrollPane(list), "grow, wrap 2mm"); c.add(new JScrollPane(list), "grow, wrap 2mm");
c.add(new JButton(selectAction), "align center"); c.add(new JButton(selectAction), "align center, id select");
c.add(new JButton(cancelAction), "gap unrel, wrap 1.2mm"); c.add(new JButton(cancelAction), "gap unrel, id cancel");
// set default size and location // set default size and location
setSize(new Dimension(210, 210)); setSize(new Dimension(210, 210));

2
source/net/sourceforge/filebot/ui/rename/EpisodeListMatcher.java
View File

@ -171,7 +171,7 @@ class EpisodeListMatcher implements AutoCompleteMatcher {
return episodes; return episodes;
} finally { } finally {
// destroy background threads // destroy background threads
executor.shutdown(); executor.shutdownNow();
} }
} }

91
source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java
View File

@ -2,6 +2,7 @@
package net.sourceforge.filebot.ui.rename; package net.sourceforge.filebot.ui.rename;
import static java.awt.Cursor.*;
import static java.util.Collections.*; import static java.util.Collections.*;
import static net.sourceforge.filebot.MediaTypes.*; import static net.sourceforge.filebot.MediaTypes.*;
import static net.sourceforge.filebot.Settings.*; import static net.sourceforge.filebot.Settings.*;
@ -38,10 +39,13 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.swing.Action; import javax.swing.Action;
import javax.swing.JCheckBox;
import javax.swing.JComponent;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import net.sourceforge.filebot.Analytics; import net.sourceforge.filebot.Analytics;
import net.sourceforge.filebot.MediaTypes; import net.sourceforge.filebot.MediaTypes;
import net.sourceforge.filebot.ResourceManager;
import net.sourceforge.filebot.similarity.Match; import net.sourceforge.filebot.similarity.Match;
import net.sourceforge.filebot.similarity.NameSimilarityMetric; import net.sourceforge.filebot.similarity.NameSimilarityMetric;
import net.sourceforge.filebot.similarity.SimilarityMetric; import net.sourceforge.filebot.similarity.SimilarityMetric;
@ -150,18 +154,21 @@ class MovieHashMatcher implements AutoCompleteMatcher {
} }
// remember user decisions and only bother user once // remember user decisions and only bother user once
Map<String, Movie> selectionMemory = new TreeMap<String, Movie>(getLenientCollator(locale)); Map<String, Object> memory = new HashMap<String, Object>();
Map<String, String> inputMemory = new TreeMap<String, String>(getLenientCollator(locale)); memory.put("input", new TreeMap<String, String>(getLenientCollator(locale)));
memory.put("selection", new TreeMap<String, String>(getLenientCollator(locale)));
try { try {
for (Future<Entry<File, Collection<Movie>>> it : grabMovieJobs) { for (Future<Entry<File, Collection<Movie>>> it : grabMovieJobs) {
// auto-select movie or ask user // auto-select movie or ask user
File movieFile = it.get().getKey(); File movieFile = it.get().getKey();
Movie movie = grabMovieName(movieFile, it.get().getValue(), locale, autodetect, selectionMemory, inputMemory, parent); Movie movie = grabMovieName(movieFile, it.get().getValue(), locale, autodetect, memory, parent);
movieByFile.put(movieFile, movie); if (movie != null) {
movieByFile.put(movieFile, movie);
}
} }
} finally { } finally {
executor.shutdown(); executor.shutdownNow();
} }
// map movies to (possibly multiple) files (in natural order) // map movies to (possibly multiple) files (in natural order)
@ -215,20 +222,23 @@ class MovieHashMatcher implements AutoCompleteMatcher {
} }
protected Movie grabMovieName(File movieFile, Collection<Movie> options, Locale locale, boolean autodetect, Map<String, Movie> selectionMemory, Map<String, String> inputMemory, Component parent) throws Exception { protected Movie grabMovieName(File movieFile, Collection<Movie> options, Locale locale, boolean autodetect, Map<String, Object> memory, Component parent) throws Exception {
// allow manual user input // allow manual user input
if (options.isEmpty() || !autodetect) { if (!autodetect || options.isEmpty()) {
if (autodetect && memory.containsKey("repeat")) {
return null;
}
String suggestion = options.isEmpty() ? stripReleaseInfo(getName(movieFile)) : options.iterator().next().getName(); String suggestion = options.isEmpty() ? stripReleaseInfo(getName(movieFile)) : options.iterator().next().getName();
String input = null; @SuppressWarnings("unchecked")
synchronized (inputMemory) { Map<String, String> inputMemory = (Map<String, String>) memory.get("input");
synchronized (this) {
input = inputMemory.get(suggestion); String input = inputMemory.get(suggestion);
if (input == null || suggestion == null || suggestion.isEmpty()) { if (input == null || suggestion == null || suggestion.isEmpty()) {
input = showInputDialog("Enter movie name:", suggestion, String.format("%s/%s", movieFile.getParentFile().getName(), movieFile.getName()), parent); File movieFolder = guessMovieFolder(movieFile);
inputMemory.put(suggestion, input); input = showInputDialog("Enter movie name:", suggestion, movieFolder == null ? movieFile.getName() : String.format("%s/%s", movieFolder.getName(), movieFile.getName()), parent);
} inputMemory.put(suggestion, input);
}
} }
if (input != null) { if (input != null) {
@ -236,11 +246,11 @@ class MovieHashMatcher implements AutoCompleteMatcher {
} }
} }
return options.isEmpty() ? null : selectMovie(movieFile, options, selectionMemory, parent); return options.isEmpty() ? null : selectMovie(movieFile, options, memory, parent);
} }
protected Movie selectMovie(final File movieFile, final Collection<Movie> options, final Map<String, Movie> selectionMemory, final Component parent) throws Exception { protected Movie selectMovie(final File movieFile, final Collection<Movie> options, final Map<String, Object> memory, final Component parent) throws Exception {
// 1. movie by filename // 1. movie by filename
final String fileQuery = stripReleaseInfo(getName(movieFile)); final String fileQuery = stripReleaseInfo(getName(movieFile));
@ -296,28 +306,49 @@ class MovieHashMatcher implements AutoCompleteMatcher {
selectDialog.setMinimumSize(new Dimension(280, 300)); selectDialog.setMinimumSize(new Dimension(280, 300));
selectDialog.pack(); selectDialog.pack();
// add repeat button
JCheckBox checkBox = new JCheckBox();
checkBox.setCursor(getPredefinedCursor(HAND_CURSOR));
checkBox.setIcon(ResourceManager.getIcon("button.repeat"));
checkBox.setSelectedIcon(ResourceManager.getIcon("button.repeat.selected"));
JComponent c = (JComponent) selectDialog.getContentPane();
c.add(checkBox, "pos 1al select.y n select.y2");
// show dialog // show dialog
selectDialog.setLocation(getOffsetLocation(selectDialog.getOwner())); selectDialog.setLocation(getOffsetLocation(selectDialog.getOwner()));
selectDialog.setVisible(true); selectDialog.setVisible(true);
// remember if we should auto-repeat the chosen action in the future
if (checkBox.isSelected()) {
memory.put("repeat", selectDialog.getSelectedValue() != null ? "select" : "ignore");
}
// selected value or null if the dialog was canceled by the user // selected value or null if the dialog was canceled by the user
return selectDialog.getSelectedValue(); return selectDialog.getSelectedValue();
} }
}); });
// allow only one select dialog at a time // allow only one select dialog at a time
synchronized (selectionMemory) { @SuppressWarnings("unchecked")
synchronized (this) { Map<String, Movie> selectionMemory = (Map<String, Movie>) memory.get("selection");
if (selectionMemory.containsKey(fileQuery)) {
return selectionMemory.get(fileQuery); if (selectionMemory.containsKey(fileQuery)) {
} return selectionMemory.get(fileQuery);
SwingUtilities.invokeAndWait(showSelectDialog);
// cache selected value
selectionMemory.put(fileQuery, showSelectDialog.get());
return showSelectDialog.get();
}
} }
// check auto-selection settings
if ("select".equals(memory.get("repeat"))) {
return options.iterator().next();
}
if ("ignore".equals(memory.get("repeat"))) {
return null;
}
// ask for user input
SwingUtilities.invokeAndWait(showSelectDialog);
// cache selected value
selectionMemory.put(fileQuery, showSelectDialog.get());
return showSelectDialog.get();
} }
} }