moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-24 16:58:51 -05:00
Code Issues Releases Wiki Activity

+ Subtitle Upload Support !!!

Browse Source
This commit is contained in:
Reinhard Pointner 2013-09-21 07:29:57 +00:00
parent fae437f780
commit 2fa1ca6dc2
18 changed files with 1876 additions and 1386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/net/sourceforge/filebot/media/MediaDetection.java
View File

@ -57,6 +57,7 @@ import net.sourceforge.filebot.web.Episode;
import net.sourceforge.filebot.web.Movie;
import net.sourceforge.filebot.web.MovieIdentificationService;
import net.sourceforge.filebot.web.SearchResult;
import net.sourceforge.filebot.web.TMDbClient.MovieInfo;
import net.sourceforge.filebot.web.TheTVDBClient.SeriesInfo;
import net.sourceforge.filebot.web.TheTVDBSearchResult;
@ -106,6 +107,10 @@ public class MediaDetection {
}
}
public static Locale guessLanguageFromSuffix(File file) {
return releaseInfo.getLanguageSuffix(getName(file));
}
public static boolean isEpisode(String name, boolean strict) {
return parseEpisodeNumber(name, strict) != null || parseDate(name) != null;
}
@ -965,6 +970,14 @@ public class MediaDetection {
return WebServices.TheTVDB.getSeriesInfoByID(grepTheTvdbId(new String(readFile(nfo), "UTF-8")).iterator().next(), locale);
}
public static Movie tmdb2imdb(Movie m) throws IOException {
if (m.getTmdbId() <= 0 && m.getImdbId() <= 0)
throw new IllegalArgumentException();
MovieInfo info = WebServices.TMDb.getMovieInfo(m, Locale.ENGLISH);
return new Movie(info.getName(), info.getReleased().getYear(), info.getImdbId(), info.getId());
}
/*
* Heavy-duty name matcher used for matching a file to or more movies (out of a list of ~50k)
*/

BIN
source/net/sourceforge/filebot/resources/file.subtitle.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 666 B

After

Width:  |  Height:  |  Size: 523 B

BIN
source/net/sourceforge/filebot/resources/file.unknown.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 630 B

After

Width:  |  Height:  |  Size: 684 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

41
source/net/sourceforge/filebot/ui/AbstractSearchPanel.java
View File

@ -1,7 +1,5 @@
package net.sourceforge.filebot.ui;
import static javax.swing.ScrollPaneConstants.*;
import static net.sourceforge.filebot.ui.NotificationLogging.*;
import static net.sourceforge.tuned.ui.TunedUtilities.*;
@ -44,7 +42,6 @@ import ca.odell.glazedlists.EventList;
import ca.odell.glazedlists.matchers.TextMatcherEditor;
import ca.odell.glazedlists.swing.AutoCompleteSupport;
public abstract class AbstractSearchPanel<S, E> extends JComponent {
protected final JPanel tabbedPaneGroup = new JPanel(new MigLayout("nogrid, fill, insets 0", "align center", "[fill]8px[pref!]4px"));
@ -57,7 +54,6 @@ public abstract class AbstractSearchPanel<S, E> extends JComponent {
protected final EventList<String> searchHistory = createSearchHistory();
public AbstractSearchPanel() {
historyPanel.setColumnHeader(2, "Duration");
@ -68,10 +64,10 @@ public abstract class AbstractSearchPanel<S, E> extends JComponent {
tabbedPaneGroup.setBorder(BorderFactory.createTitledBorder("Search Results"));
tabbedPaneGroup.add(tabbedPane, "grow, wrap");
setLayout(new MigLayout("nogrid, fill, insets 10px 10px 15px 10px", "align center", "[pref!]10px[fill]"));
setLayout(new MigLayout("nogrid, fill, insets 10px 10px 15px 10px", "align 45%", "[pref!]10px[fill]"));
add(searchTextField);
add(new JButton(searchAction), "gap 18px, id search");
add(new JButton(searchAction), "gap 16px, id search, sgy button");
add(tabbedPaneGroup, "newline, grow");
searchTextField.getEditor().setAction(searchAction);
@ -99,19 +95,14 @@ public abstract class AbstractSearchPanel<S, E> extends JComponent {
installAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), searchAction);
}
protected abstract S[] getSearchEngines();
protected abstract LabelProvider<S> getSearchEngineLabelProvider();
protected abstract Settings getSettings();
protected abstract RequestProcessor<?, E> createRequestProcessor();
private void search(RequestProcessor<?, E> requestProcessor) {
FileBotTab<?> tab = requestProcessor.tab;
@ -127,7 +118,6 @@ public abstract class AbstractSearchPanel<S, E> extends JComponent {
new SearchTask(requestProcessor).execute();
}
protected EventList<String> createSearchHistory() {
// create in-memory history
BasicEventList<String> history = new BasicEventList<String>();
@ -158,17 +148,14 @@ public abstract class AbstractSearchPanel<S, E> extends JComponent {
}
};
private class SearchTask extends SwingWorker<Collection<? extends SearchResult>, Void> {
private final RequestProcessor<?, E> requestProcessor;
public SearchTask(RequestProcessor<?, E> requestProcessor) {
this.requestProcessor = requestProcessor;
}
@Override
protected Collection<? extends SearchResult> doInBackground() throws Exception {
long start = System.currentTimeMillis();
@ -180,7 +167,6 @@ public abstract class AbstractSearchPanel<S, E> extends JComponent {
}
}
@Override
public void done() {
FileBotTab<?> tab = requestProcessor.tab;
@ -232,17 +218,14 @@ public abstract class AbstractSearchPanel<S, E> extends JComponent {
}
}
private class FetchTask extends SwingWorker<Collection<E>, Void> {
private final RequestProcessor<?, E> requestProcessor;
public FetchTask(RequestProcessor<?, E> requestProcessor) {
this.requestProcessor = requestProcessor;
}
@Override
protected final Collection<E> doInBackground() throws Exception {
long start = System.currentTimeMillis();
@ -254,7 +237,6 @@ public abstract class AbstractSearchPanel<S, E> extends JComponent {
}
}
@Override
public void done() {
FileBotTab<?> tab = requestProcessor.tab;
@ -288,24 +270,20 @@ public abstract class AbstractSearchPanel<S, E> extends JComponent {
}
}
protected static class Request {
private final String searchText;
public Request(String searchText) {
this.searchText = searchText;
}
public String getSearchText() {
return searchText;
}
}
protected abstract static class RequestProcessor<R extends Request, E> {
protected final R request;
@ -316,45 +294,35 @@ public abstract class AbstractSearchPanel<S, E> extends JComponent {
private long duration = 0;
public RequestProcessor(R request, JComponent component) {
this.request = request;
this.tab = new FileBotTab<JComponent>(component);
}
public abstract Collection<? extends SearchResult> search() throws Exception;
public abstract Collection<E> fetch() throws Exception;
public abstract void process(Collection<E> elements);
public abstract URI getLink();
public JComponent getComponent() {
return tab.getComponent();
}
public SearchResult getSearchResult() {
return searchResult;
}
public void setSearchResult(SearchResult searchResult) {
this.searchResult = searchResult;
}
public String getStatusMessage(Collection<E> result) {
return String.format("%d elements found", result.size());
}
public String getTitle() {
if (searchResult != null)
return searchResult.getName();
@ -362,7 +330,6 @@ public abstract class AbstractSearchPanel<S, E> extends JComponent {
return request.getSearchText();
}
public String getHistoryEntry() {
SeriesNameMatcher nameMatcher = new SeriesNameMatcher();
@ -371,12 +338,10 @@ public abstract class AbstractSearchPanel<S, E> extends JComponent {
return nameMatcher.matchByFirstCommonWordSequence(searchResult.getName(), request.getSearchText());
}
public Icon getIcon() {
return null;
}
protected SearchResult selectSearchResult(Collection<? extends SearchResult> searchResults, Window window) throws Exception {
// multiple results have been found, user must select one
SelectDialog<SearchResult> selectDialog = new SelectDialog<SearchResult>(window, searchResults);
@ -388,14 +353,12 @@ public abstract class AbstractSearchPanel<S, E> extends JComponent {
return selectDialog.getSelectedValue();
}
protected void configureSelectDialog(SelectDialog<SearchResult> selectDialog) {
selectDialog.setLocation(getOffsetLocation(selectDialog.getOwner()));
selectDialog.setIconImage(getImage(getIcon()));
selectDialog.setMinimumSize(new Dimension(250, 150));
}
public long getDuration() {
return duration;
}

19
source/net/sourceforge/filebot/ui/Language.java
View File

@ -1,7 +1,5 @@
package net.sourceforge.filebot.ui;
import static java.util.Arrays.*;
import static java.util.Collections.*;
@ -12,46 +10,38 @@ import java.util.Locale;
import java.util.ResourceBundle;
import java.util.Set;
public class Language {
private final String code;
private final String name;
public Language(String code, String name) {
this.code = code;
this.name = name;
}
public String getCode() {
return code;
}
public String getName() {
return name;
}
@Override
public String toString() {
return name;
}
public Locale toLocale() {
return new Locale(getCode());
}
@Override
public Language clone() {
return new Language(code, name);
}
public static final Comparator<Language> ALPHABETIC_ORDER = new Comparator<Language>() {
@Override
@ -60,7 +50,6 @@ public class Language {
}
};
public static Language getLanguage(String code) {
ResourceBundle bundle = ResourceBundle.getBundle(Language.class.getName());
@ -74,7 +63,6 @@ public class Language {
}
}
public static List<Language> getLanguages(String... codes) {
Language[] languages = new Language[codes.length];
@ -85,6 +73,9 @@ public class Language {
return asList(languages);
}
public static Language getLanguage(Locale locale) {
return locale == null ? null : getLanguageByName(locale.getDisplayLanguage(Locale.ENGLISH));
}
public static Language getLanguageByName(String name) {
for (Language it : availableLanguages()) {
@ -95,7 +86,6 @@ public class Language {
return null;
}
public static String getISO3LanguageCodeByName(String languageName) {
Language language = Language.getLanguageByName(languageName);
if (language != null) {
@ -109,19 +99,16 @@ public class Language {
return null;
}
public static List<Language> availableLanguages() {
ResourceBundle bundle = ResourceBundle.getBundle(Language.class.getName());
return getLanguages(bundle.getString("languages.all").split(","));
}
public static List<Language> commonLanguages() {
ResourceBundle bundle = ResourceBundle.getBundle(Language.class.getName());
return getLanguages(bundle.getString("languages.common").split(","));
}
public static List<Language> preferredLanguages() {
Set<String> codes = new LinkedHashSet<String>();

39
source/net/sourceforge/filebot/ui/LanguageComboBox.java
View File

@ -1,38 +1,39 @@
package net.sourceforge.filebot.ui;
import static java.awt.event.ItemEvent.*;
import static net.sourceforge.filebot.ui.Language.*;
import static net.sourceforge.filebot.ui.LanguageComboBoxModel.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.AbstractList;
import java.util.AbstractMap.SimpleEntry;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map.Entry;
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.event.PopupMenuEvent;
import javax.swing.event.PopupMenuListener;
import net.sourceforge.filebot.Settings;
import net.sourceforge.tuned.PreferencesList;
import net.sourceforge.tuned.PreferencesMap.PreferencesEntry;
public class LanguageComboBox extends JComboBox {
private final PreferencesEntry<String> persistentSelectedLanguage;
private final PreferencesList<String> persistentFavoriteLanguages;
private Entry<String, String> persistentSelectedLanguage;
private List<String> persistentFavoriteLanguages;
public LanguageComboBox(JComponent parent, Language initialSelection) {
super(new LanguageComboBoxModel(initialSelection != ALL_LANGUAGES, initialSelection));
public LanguageComboBox(Language initialSelection, Settings settings) {
super(new LanguageComboBoxModel(initialSelection, initialSelection));
setRenderer(new LanguageComboBoxCellRenderer(super.getRenderer()));
persistentSelectedLanguage = Settings.forPackage(parent.getClass()).entry("language.selected");
persistentFavoriteLanguages = Settings.forPackage(parent.getClass()).node("language.favorites").asList();
if (settings != null) {
persistentSelectedLanguage = settings.entry("language.selected");
persistentFavoriteLanguages = settings.node("language.favorites").asList();
} else {
persistentSelectedLanguage = new SimpleEntry<String, String>(null, null);
persistentFavoriteLanguages = new ArrayList<String>();
}
// restore selected language
getModel().setSelectedItem(Language.getLanguage(persistentSelectedLanguage.getValue()));
@ -57,14 +58,14 @@ public class LanguageComboBox extends JComboBox {
Language language = (Language) e.getItem();
if (getModel().favorites().add(language)) {
persistentFavoriteLanguages.set(new AbstractList<String>() {
persistentFavoriteLanguages.clear();
persistentFavoriteLanguages.addAll(new AbstractList<String>() {
@Override
public String get(int index) {
return getModel().favorites().get(index).getCode();
}
@Override
public int size() {
return getModel().favorites().size();
@ -77,18 +78,15 @@ public class LanguageComboBox extends JComboBox {
});
}
@Override
public LanguageComboBoxModel getModel() {
return (LanguageComboBoxModel) super.getModel();
}
private static class PopupSelectionListener implements PopupMenuListener, ItemListener {
private Object selected = null;
@Override
public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
JComboBox comboBox = (JComboBox) e.getSource();
@ -97,7 +95,6 @@ public class LanguageComboBox extends JComboBox {
selected = comboBox.getSelectedItem();
}
@Override
public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
JComboBox comboBox = (JComboBox) e.getSource();
@ -110,13 +107,11 @@ public class LanguageComboBox extends JComboBox {
selected = null;
}
@Override
public void popupMenuCanceled(PopupMenuEvent e) {
selected = null;
}
@Override
public void itemStateChanged(ItemEvent e) {

37
source/net/sourceforge/filebot/ui/LanguageComboBoxModel.java
View File

@ -1,7 +1,5 @@
package net.sourceforge.filebot.ui;
import static net.sourceforge.filebot.ui.Language.*;
import java.util.AbstractList;
@ -12,35 +10,30 @@ import java.util.Set;
import javax.swing.AbstractListModel;
import javax.swing.ComboBoxModel;
public class LanguageComboBoxModel extends AbstractListModel implements ComboBoxModel {
public static final Language ALL_LANGUAGES = new Language("undefined", "All Languages");
private boolean requireSpecificLanguage;
private Language defaultLanguage;
private Language selection;
private List<Language> favorites = new Favorites(2);
private List<Language> values = availableLanguages();
public LanguageComboBoxModel(boolean requireSpecificLanguage, Language initialSelection) {
this.requireSpecificLanguage = requireSpecificLanguage;
public LanguageComboBoxModel(Language defaultLanguage, Language initialSelection) {
this.defaultLanguage = defaultLanguage;
this.selection = initialSelection;
}
@Override
public Language getElementAt(int index) {
// "All Languages"
if (!requireSpecificLanguage) {
if (index == 0)
return ALL_LANGUAGES;
return defaultLanguage;
// "All Languages" offset
index -= 1;
}
if (index < favorites.size()) {
return favorites.get(index);
@ -52,25 +45,21 @@ public class LanguageComboBoxModel extends AbstractListModel implements ComboBox
return values.get(index);
}
@Override
public int getSize() {
// "All Languages" : favorites[] : values[]
return (requireSpecificLanguage ? 0 : 1) + favorites.size() + values.size();
return 1 + favorites.size() + values.size();
}
public List<Language> favorites() {
return favorites;
}
@Override
public Language getSelectedItem() {
return selection;
}
@Override
public void setSelectedItem(Object value) {
if (value instanceof Language) {
@ -79,58 +68,49 @@ public class LanguageComboBoxModel extends AbstractListModel implements ComboBox
}
}
protected int convertFavoriteIndexToModel(int favoriteIndex) {
return (requireSpecificLanguage ? 0 : 1) + favoriteIndex;
return 1 + favoriteIndex;
}
protected void fireFavoritesAdded(int from, int to) {
fireIntervalAdded(this, convertFavoriteIndexToModel(from), convertFavoriteIndexToModel(to));
}
protected void fireFavoritesRemoved(int from, int to) {
fireIntervalRemoved(this, convertFavoriteIndexToModel(from), convertFavoriteIndexToModel(to));
}
private class Favorites extends AbstractList<Language> implements Set<Language> {
private final List<Language> data;
private final int capacity;
public Favorites(int capacity) {
this.data = new ArrayList<Language>(capacity);
this.capacity = capacity;
}
@Override
public Language get(int index) {
return data.get(index);
}
public boolean add(Language element) {
// add first
return addIfAbsent(0, element);
}
public void add(int index, Language element) {
addIfAbsent(index, element);
}
public boolean addIfAbsent(int index, Language element) {
// 1. ignore null values
// 2. ignore ALL_LANGUAGES
// 3. make sure there are no duplicates
// 4. limit size to capacity
if (element == null || element == ALL_LANGUAGES || contains(element) || index >= capacity) {
if (element == null || element == ALL_LANGUAGES || element.getCode().equals(defaultLanguage.getCode()) || contains(element) || index >= capacity) {
return false;
}
@ -150,7 +130,6 @@ public class LanguageComboBoxModel extends AbstractListModel implements ComboBox
return true;
}
@Override
public boolean contains(Object obj) {
// check via language code, because data consists of clones
@ -166,7 +145,6 @@ public class LanguageComboBoxModel extends AbstractListModel implements ComboBox
return false;
}
@Override
public Language remove(int index) {
Language old = data.remove(index);
@ -177,7 +155,6 @@ public class LanguageComboBoxModel extends AbstractListModel implements ComboBox
return old;
}
@Override
public int size() {
return data.size();

38
source/net/sourceforge/filebot/ui/episodelist/EpisodeListPanel.java
View File

@ -1,7 +1,5 @@
package net.sourceforge.filebot.ui.episodelist;
import static net.sourceforge.filebot.ui.episodelist.SeasonSpinnerModel.*;
import static net.sourceforge.filebot.web.EpisodeUtilities.*;
@ -54,14 +52,12 @@ import net.sourceforge.tuned.ui.SelectButton;
import net.sourceforge.tuned.ui.SimpleLabelProvider;
import net.sourceforge.tuned.ui.TunedUtilities;
public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, Episode> {
private SeasonSpinnerModel seasonSpinnerModel = new SeasonSpinnerModel();
private LanguageComboBox languageComboBox = new LanguageComboBox(this, Language.getLanguage("en"));
private LanguageComboBox languageComboBox = new LanguageComboBox(Language.getLanguage("en"), getSettings());
private JComboBox sortOrderComboBox = new JComboBox(SortOrder.values());
public EpisodeListPanel() {
historyPanel.setColumnHeader(0, "Show");
historyPanel.setColumnHeader(1, "Number of Episodes");
@ -73,9 +69,9 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
seasonSpinner.setMinimumSize(seasonSpinner.getPreferredSize());
// add after text field
add(seasonSpinner, "sgy combo, gap indent", 1);
add(sortOrderComboBox, "sgy combo, gap rel", 2);
add(languageComboBox, "sgy combo, gap indent+5", 3);
add(seasonSpinner, "sgy button, gap indent", 1);
add(sortOrderComboBox, "sgy button, gap rel", 2);
add(languageComboBox, "sgy button, gap indent+5", 3);
// add after tabbed pane
tabbedPaneGroup.add(new JButton(new SaveAction(new SelectedTabExportHandler())));
@ -86,25 +82,21 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
TunedUtilities.installAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, KeyEvent.SHIFT_MASK), new SpinSeasonAction(-1));
}
@Override
protected EpisodeListProvider[] getSearchEngines() {
return WebServices.getEpisodeListProviders();
}
@Override
protected LabelProvider<EpisodeListProvider> getSearchEngineLabelProvider() {
return SimpleLabelProvider.forClass(EpisodeListProvider.class);
}
@Override
protected Settings getSettings() {
return Settings.forPackage(EpisodeListPanel.class);
}
@Override
protected EpisodeListRequestProcessor createRequestProcessor() {
EpisodeListProvider provider = searchTextField.getSelectButton().getSelectedValue();
@ -131,7 +123,6 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
}
};
private class SpinSeasonAction extends AbstractAction {
public SpinSeasonAction(int spin) {
@ -139,14 +130,12 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
putValue("spin", spin);
}
@Override
public void actionPerformed(ActionEvent e) {
seasonSpinnerModel.spin((Integer) getValue("spin"));
}
}
private class SelectedTabExportHandler implements FileExportHandler {
/**
@ -163,7 +152,6 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
}
}
@Override
public boolean canExport() {
FileExportHandler handler = getExportHandler();
@ -174,13 +162,11 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
return handler.canExport();
}
@Override
public void export(File file) throws IOException {
getExportHandler().export(file);
}
@Override
public String getDefaultFileName() {
return getExportHandler().getDefaultFileName();
@ -188,7 +174,6 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
}
protected static class EpisodeListRequest extends Request {
public final EpisodeListProvider provider;
@ -196,7 +181,6 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
public final SortOrder order;
public final Locale language;
public EpisodeListRequest(EpisodeListProvider provider, String searchText, int season, SortOrder order, Locale language) {
super(searchText);
this.provider = provider;
@ -206,20 +190,17 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
}
}
protected static class EpisodeListRequestProcessor extends RequestProcessor<EpisodeListRequest, Episode> {
public EpisodeListRequestProcessor(EpisodeListRequest request) {
super(request, new EpisodeListTab());
}
@Override
public Collection<SearchResult> search() throws Exception {
return request.provider.search(request.getSearchText(), request.language);
}
@Override
public Collection<Episode> fetch() throws Exception {
List<Episode> episodes = request.provider.getEpisodeList(getSearchResult(), request.order, request.language);
@ -236,13 +217,11 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
return episodes;
}
@Override
public URI getLink() {
return request.provider.getEpisodeListLink(getSearchResult());
}
@Override
public void process(Collection<Episode> episodes) {
// set a proper title for the export handler before adding episodes
@ -251,19 +230,16 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
getComponent().getModel().addAll(episodes);
}
@Override
public String getStatusMessage(Collection<Episode> result) {
return (result.isEmpty()) ? "No episodes found" : String.format("%d episodes", result.size());
}
@Override
public EpisodeListTab getComponent() {
return (EpisodeListTab) super.getComponent();
}
@Override
public String getTitle() {
if (request.season == ALL_SEASONS)
@ -273,13 +249,11 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
return String.format("%s - Season %d", super.getTitle(), request.season);
}
@Override
public Icon getIcon() {
return request.provider.getIcon();
}
@Override
protected void configureSelectDialog(SelectDialog<SearchResult> selectDialog) {
super.configureSelectDialog(selectDialog);
@ -288,7 +262,6 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
}
protected static class EpisodeListTab extends FileBotList<Episode> {
public EpisodeListTab() {
@ -306,14 +279,12 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
}
protected static class EpisodeListExportHandler extends FileBotListExportHandler implements ClipboardHandler {
public EpisodeListExportHandler(FileBotList<Episode> list) {
super(list);
}
@Override
public Transferable createTransferable(JComponent c) {
Transferable episodeArray = new ArrayTransferable<Episode>(list.getModel().toArray(new Episode[0]));
@ -322,7 +293,6 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
return new CompositeTranserable(episodeArray, textFile);
}
@Override
public void exportToClipboard(JComponent c, Clipboard clipboard, int action) throws IllegalStateException {
Object[] selection = list.getListComponent().getSelectedValues();

85
source/net/sourceforge/filebot/ui/subtitle/SubtitleAutoMatchDialog.java
View File

@ -1,7 +1,5 @@
package net.sourceforge.filebot.ui.subtitle;
import static javax.swing.BorderFactory.*;
import static javax.swing.JOptionPane.*;
import static net.sourceforge.filebot.media.MediaDetection.*;
@ -74,7 +72,6 @@ import net.sourceforge.tuned.ui.EmptySelectionModel;
import net.sourceforge.tuned.ui.LinkButton;
import net.sourceforge.tuned.ui.RoundBorder;
class SubtitleAutoMatchDialog extends JDialog {
private static final Color hashMatchColor = new Color(0xFAFAD2); // LightGoldenRodYellow
@ -88,7 +85,6 @@ class SubtitleAutoMatchDialog extends JDialog {
private ExecutorService queryService;
private ExecutorService downloadService;
public SubtitleAutoMatchDialog(Window owner) {
super(owner, "Download Subtitles", ModalityType.DOCUMENT_MODAL);
@ -103,7 +99,6 @@ class SubtitleAutoMatchDialog extends JDialog {
content.add(new JButton(finishAction), "tag cancel");
}
protected JPanel createServicePanel(Color color) {
JPanel panel = new JPanel(new MigLayout("hidemode 3"));
panel.setBorder(new RoundBorder());
@ -113,7 +108,6 @@ class SubtitleAutoMatchDialog extends JDialog {
return panel;
}
protected JTable createTable() {
JTable table = new JTable(new SubtitleMappingTableModel());
table.setDefaultRenderer(SubtitleMapping.class, new SubtitleMappingOptionRenderer());
@ -149,22 +143,18 @@ class SubtitleAutoMatchDialog extends JDialog {
return table;
}
public void setVideoFiles(File[] videoFiles) {
subtitleMappingTable.setModel(new SubtitleMappingTableModel(videoFiles));
}
public void addSubtitleService(VideoHashSubtitleService service) {
addSubtitleService(new VideoHashSubtitleServiceBean(service), hashMatcherServicePanel);
}
public void addSubtitleService(SubtitleProvider service) {
addSubtitleService(new SubtitleProviderBean(service, this), nameMatcherServicePanel);
}
protected void addSubtitleService(final SubtitleServiceBean service, final JPanel servicePanel) {
final LinkButton component = new LinkButton(service.getName(), ResourceManager.getIcon("database"), service.getLink());
component.setVisible(false);
@ -193,7 +183,6 @@ class SubtitleAutoMatchDialog extends JDialog {
// remember last user input
private List<String> userQuery = new ArrayList<String>();
protected List<String> getUserQuery(String suggestion, String title, Component parent) throws Exception {
synchronized (userQuery) {
if (userQuery.isEmpty()) {
@ -203,7 +192,6 @@ class SubtitleAutoMatchDialog extends JDialog {
}
}
public void startQuery(String languageName) {
final SubtitleMappingTableModel mappingModel = (SubtitleMappingTableModel) subtitleMappingTable.getModel();
QueryTask queryTask = new QueryTask(services, mappingModel.getVideoFiles(), languageName, SubtitleAutoMatchDialog.this) {
@ -232,7 +220,6 @@ class SubtitleAutoMatchDialog extends JDialog {
queryService.submit(queryTask);
}
private Boolean showConfirmReplaceDialog(List<?> files) {
JList existingFilesComponent = new JList(files.toArray()) {
@ -268,7 +255,7 @@ class SubtitleAutoMatchDialog extends JDialog {
public void actionPerformed(ActionEvent evt) {
// disable any active cell editor
if (subtitleMappingTable.getCellEditor() != null) {
subtitleMappingTable.getCellEditor().cancelCellEditing();
subtitleMappingTable.getCellEditor().stopCellEditing();
}
// don't allow restart of download as long as there are still unfinished download tasks
@ -360,17 +347,14 @@ class SubtitleAutoMatchDialog extends JDialog {
}
};
private static class SubtitleMappingOptionRenderer extends DefaultTableCellRenderer {
private final JComboBox optionComboBox = new SimpleComboBox();
public SubtitleMappingOptionRenderer() {
optionComboBox.setRenderer(new SubtitleOptionRenderer());
}
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
SubtitleMapping mapping = (SubtitleMapping) value;
@ -412,12 +396,10 @@ class SubtitleAutoMatchDialog extends JDialog {
}
}
private static class SubtitleOptionRenderer extends DefaultListCellRenderer {
private final Border padding = createEmptyBorder(3, 3, 3, 3);
@Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
super.getListCellRendererComponent(list, null, index, isSelected, cellHasFocus);
@ -443,14 +425,12 @@ class SubtitleAutoMatchDialog extends JDialog {
}
}
private static class SubtitleMappingTableModel extends AbstractTableModel implements Iterable<SubtitleMapping> {
private final SubtitleMapping[] data;
private boolean optionColumnVisible = false;
public SubtitleMappingTableModel(File... videoFiles) {
data = new SubtitleMapping[videoFiles.length];
@ -460,7 +440,6 @@ class SubtitleAutoMatchDialog extends JDialog {
}
}
public List<File> getVideoFiles() {
return new AbstractList<File>() {
@ -469,7 +448,6 @@ class SubtitleAutoMatchDialog extends JDialog {
return data[index].getVideoFile();
}
@Override
public int size() {
return data.length;
@ -477,13 +455,11 @@ class SubtitleAutoMatchDialog extends JDialog {
};
}
@Override
public Iterator<SubtitleMapping> iterator() {
return Arrays.asList(data).iterator();
}
public void setOptionColumnVisible(boolean optionColumnVisible) {
if (this.optionColumnVisible == optionColumnVisible)
return;
@ -494,13 +470,11 @@ class SubtitleAutoMatchDialog extends JDialog {
fireTableStructureChanged();
}
@Override
public int getColumnCount() {
return optionColumnVisible ? 2 : 1;
}
@Override
public String getColumnName(int column) {
switch (column) {
@ -513,13 +487,11 @@ class SubtitleAutoMatchDialog extends JDialog {
return null;
}
@Override
public int getRowCount() {
return data.length;
}
@Override
public Object getValueAt(int row, int column) {
switch (column) {
@ -532,19 +504,16 @@ class SubtitleAutoMatchDialog extends JDialog {
return null;
}
@Override
public void setValueAt(Object value, int row, int column) {
data[row].setSelectedOption((SubtitleDescriptorBean) value);
}
@Override
public boolean isCellEditable(int row, int column) {
return column == 1 && data[row].isEditable();
}
@Override
public Class<?> getColumnClass(int column) {
switch (column) {
@ -557,17 +526,14 @@ class SubtitleAutoMatchDialog extends JDialog {
return null;
}
private class SubtitleMappingListener implements PropertyChangeListener {
private final int index;
public SubtitleMappingListener(int index) {
this.index = index;
}
@Override
public void propertyChange(PropertyChangeEvent evt) {
// update state and subtitle options
@ -576,7 +542,6 @@ class SubtitleAutoMatchDialog extends JDialog {
}
}
private static class SubtitleMapping extends AbstractBean {
private File videoFile;
@ -585,38 +550,31 @@ class SubtitleAutoMatchDialog extends JDialog {
private SubtitleDescriptorBean selectedOption;
private List<SubtitleDescriptorBean> options = new ArrayList<SubtitleDescriptorBean>();
public SubtitleMapping(File videoFile) {
this.videoFile = videoFile;
}
public File getVideoFile() {
return videoFile;
}
public File getSubtitleFile() {
return subtitleFile;
}
public void setSubtitleFile(File subtitleFile) {
this.subtitleFile = subtitleFile;
firePropertyChange("subtitleFile", null, this.subtitleFile);
}
public boolean isEditable() {
return subtitleFile == null && selectedOption != null && (selectedOption.getState() == null || selectedOption.getError() != null);
}
public SubtitleDescriptorBean getSelectedOption() {
return selectedOption;
}
public void setSelectedOption(SubtitleDescriptorBean selectedOption) {
if (this.selectedOption != null) {
this.selectedOption.removePropertyChangeListener(selectedOptionListener);
@ -628,12 +586,10 @@ class SubtitleAutoMatchDialog extends JDialog {
firePropertyChange("selectedOption", null, this.selectedOption);
}
public SubtitleDescriptorBean[] getOptions() {
return options.toArray(new SubtitleDescriptorBean[0]);
}
public void addOptions(List<SubtitleDescriptorBean> options) {
this.options.addAll(options);
@ -651,7 +607,6 @@ class SubtitleAutoMatchDialog extends JDialog {
};
}
private static class SubtitleDescriptorBean extends AbstractBean {
private final File videoFile;
@ -661,39 +616,32 @@ class SubtitleAutoMatchDialog extends JDialog {
private StateValue state;
private Exception error;
public SubtitleDescriptorBean(File videoFile, SubtitleDescriptor descriptor, SubtitleServiceBean service) {
this.videoFile = videoFile;
this.descriptor = descriptor;
this.service = service;
}
public float getMatchProbability() {
return service.getMatchProbabilty(videoFile, descriptor);
}
public String getText() {
return formatSubtitle(descriptor.getName(), getLanguageName(), getType());
}
public Icon getIcon() {
return service.getIcon();
}
public String getLanguageName() {
return descriptor.getLanguageName();
}
public String getType() {
return descriptor.getType();
}
public MemoryFile fetch() throws Exception {
setState(StateValue.STARTED);
@ -713,30 +661,25 @@ class SubtitleAutoMatchDialog extends JDialog {
}
}
public Exception getError() {
return error;
}
public StateValue getState() {
return state;
}
public void setState(StateValue state) {
this.state = state;
firePropertyChange("state", null, this.state);
}
@Override
public String toString() {
return getText();
}
}
private static class QueryTask extends SwingWorker<Collection<File>, Map<File, List<SubtitleDescriptorBean>>> {
private final Component parent;
@ -745,7 +688,6 @@ class SubtitleAutoMatchDialog extends JDialog {
private final Collection<File> remainingVideos;
private final String languageName;
public QueryTask(Collection<SubtitleServiceBean> services, Collection<File> videoFiles, String languageName, Component parent) {
this.parent = parent;
this.services = services;
@ -753,7 +695,6 @@ class SubtitleAutoMatchDialog extends JDialog {
this.languageName = languageName;
}
@Override
protected Collection<File> doInBackground() throws Exception {
for (SubtitleServiceBean service : services) {
@ -802,24 +743,20 @@ class SubtitleAutoMatchDialog extends JDialog {
}
}
private static class DownloadTask extends SwingWorker<File, Void> {
private final File video;
private final SubtitleDescriptorBean descriptor;
public DownloadTask(File video, SubtitleDescriptorBean descriptor) {
this.video = video;
this.descriptor = descriptor;
}
public SubtitleDescriptorBean getSubtitleBean() {
return descriptor;
}
public File getDestination(MemoryFile subtitle) {
if (descriptor.getType() == null && subtitle == null)
return null;
@ -830,7 +767,6 @@ class SubtitleAutoMatchDialog extends JDialog {
return new File(video.getParentFile(), formatSubtitle(base, descriptor.getLanguageName(), ext));
}
@Override
protected File doInBackground() {
try {
@ -853,7 +789,6 @@ class SubtitleAutoMatchDialog extends JDialog {
}
}
protected static abstract class SubtitleServiceBean extends AbstractBean {
private final String name;
@ -863,35 +798,28 @@ class SubtitleAutoMatchDialog extends JDialog {
private StateValue state = StateValue.PENDING;
private Throwable error = null;
public SubtitleServiceBean(String name, Icon icon, URI link) {
this.name = name;
this.icon = icon;
this.link = link;
}
public String getName() {
return name;
}
public Icon getIcon() {
return icon;
}
public URI getLink() {
return link;
}
public abstract float getMatchProbabilty(File videoFile, SubtitleDescriptor descriptor);
protected abstract Map<File, List<SubtitleDescriptor>> getSubtitleList(Collection<File> files, String languageName, Component parent) throws Exception;
public final Map<File, List<SubtitleDescriptor>> lookupSubtitles(Collection<File> files, String languageName, Component parent) throws Exception {
setState(StateValue.STARTED);
@ -908,61 +836,51 @@ class SubtitleAutoMatchDialog extends JDialog {
}
}
private void setState(StateValue state) {
this.state = state;
firePropertyChange("state", null, this.state);
}
public StateValue getState() {
return state;
}
public Throwable getError() {
return error;
}
}
protected static class VideoHashSubtitleServiceBean extends SubtitleServiceBean {
private VideoHashSubtitleService service;
public VideoHashSubtitleServiceBean(VideoHashSubtitleService service) {
super(service.getName(), service.getIcon(), service.getLink());
this.service = service;
}
@Override
protected Map<File, List<SubtitleDescriptor>> getSubtitleList(Collection<File> files, String languageName, Component parent) throws Exception {
return service.getSubtitleList(files.toArray(new File[0]), languageName);
}
@Override
public float getMatchProbabilty(File videoFile, SubtitleDescriptor descriptor) {
return 1;
}
}
protected static class SubtitleProviderBean extends SubtitleServiceBean {
private SubtitleAutoMatchDialog inputProvider;
private SubtitleProvider service;
public SubtitleProviderBean(SubtitleProvider service, SubtitleAutoMatchDialog inputProvider) {
super(service.getName(), service.getIcon(), service.getLink());
this.service = service;
this.inputProvider = inputProvider;
}
@Override
protected Map<File, List<SubtitleDescriptor>> getSubtitleList(Collection<File> files, String languageName, Component parent) throws Exception {
// ignore clutter files from processing
@ -1028,7 +946,6 @@ class SubtitleAutoMatchDialog extends JDialog {
return subtitlesByFile;
}
@Override
public float getMatchProbabilty(File videoFile, SubtitleDescriptor descriptor) {
SimilarityMetric metric = new MetricCascade(EpisodeMetrics.SeasonEpisode, EpisodeMetrics.AirDate, EpisodeMetrics.Name);

323
source/net/sourceforge/filebot/ui/subtitle/SubtitleDropTarget.java
View File

@ -1,8 +1,7 @@
package net.sourceforge.filebot.ui.subtitle;
import static net.sourceforge.filebot.MediaTypes.*;
import static net.sourceforge.filebot.media.MediaDetection.*;
import static net.sourceforge.filebot.ui.NotificationLogging.*;
import static net.sourceforge.filebot.ui.transfer.FileTransferable.*;
import static net.sourceforge.tuned.FileUtilities.*;
@ -21,9 +20,12 @@ import java.awt.event.ActionListener;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
import java.util.logging.Level;
import javax.swing.Icon;
@ -33,19 +35,18 @@ import javax.swing.JFileChooser;
import javax.swing.filechooser.FileNameExtensionFilter;
import net.sourceforge.filebot.ResourceManager;
import net.sourceforge.filebot.web.OpenSubtitlesClient;
import net.sourceforge.filebot.web.SubtitleProvider;
import net.sourceforge.filebot.web.VideoHashSubtitleService;
import net.sourceforge.tuned.FileUtilities;
import net.sourceforge.tuned.FileUtilities.ParentFilter;
abstract class SubtitleDropTarget extends JButton {
private enum DropAction {
Download,
Upload,
Cancel
Accept, Cancel
}
public SubtitleDropTarget() {
setHorizontalAlignment(CENTER);
@ -58,7 +59,7 @@ abstract class SubtitleDropTarget extends JButton {
setOpaque(false);
// initialize with default mode
setDropAction(DropAction.Download);
setDropAction(DropAction.Accept);
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
// install mouse listener
@ -68,143 +69,21 @@ abstract class SubtitleDropTarget extends JButton {
new DropTarget(this, dropHandler);
}
private void setDropAction(DropAction dropAction) {
protected void setDropAction(DropAction dropAction) {
setIcon(getIcon(dropAction));
}
protected abstract boolean handleDrop(List<File> files);
private Icon getIcon(DropAction dropAction) {
switch (dropAction) {
case Download:
return ResourceManager.getIcon("subtitle.exact.download");
case Upload:
return ResourceManager.getIcon("subtitle.exact.upload");
default:
return ResourceManager.getIcon("message.error");
}
}
protected abstract DropAction getDropAction(List<File> files);
public abstract VideoHashSubtitleService[] getVideoHashSubtitleServices();
public abstract SubtitleProvider[] getSubtitleProviders();
public abstract String getQueryLanguage();
private boolean handleDownload(List<File> videoFiles) {
SubtitleAutoMatchDialog dialog = new SubtitleAutoMatchDialog(getWindow(this));
// initialize download parameters
dialog.setVideoFiles(videoFiles.toArray(new File[0]));
for (VideoHashSubtitleService service : getVideoHashSubtitleServices()) {
dialog.addSubtitleService(service);
}
for (SubtitleProvider service : getSubtitleProviders()) {
dialog.addSubtitleService(service);
}
// start looking for subtitles
dialog.startQuery(getQueryLanguage());
// initialize window properties
dialog.setIconImage(getImage(getIcon(DropAction.Download)));
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
dialog.setSize(820, 575);
// show dialog
dialog.setLocation(getOffsetLocation(dialog.getOwner()));
dialog.setVisible(true);
return true;
}
private boolean handleUpload(Map<File, File> videosMappedBySubtitle) {
// TODO implement upload
throw new UnsupportedOperationException("Not implemented yet");
}
private boolean handleDrop(List<File> files) {
// perform a drop action depending on the given files
if (containsOnly(files, VIDEO_FILES)) {
return handleDownloadLater(files);
}
if (containsOnly(files, FOLDERS)) {
// collect all video files from the dropped folders
List<File> videoFiles = filter(listFiles(files, 5, false), VIDEO_FILES);
if (videoFiles.size() > 0) {
return handleDownloadLater(videoFiles);
}
}
if (containsOnly(files, SUBTITLE_FILES)) {
// TODO implement upload
throw new UnsupportedOperationException("Not implemented yet");
}
if (containsOnlyVideoSubtitleMatches(files)) {
// TODO implement upload
throw new UnsupportedOperationException("Not implemented yet");
}
return false;
}
private boolean handleDownloadLater(final List<File> videoFiles) {
// invoke later so we don't block the DnD operation with the download dialog
invokeLater(0, new Runnable() {
@Override
public void run() {
handleDownload(videoFiles);
}
});
return true;
}
private boolean containsOnlyVideoSubtitleMatches(List<File> files) {
List<File> subtitles = filter(files, SUBTITLE_FILES);
if (subtitles.isEmpty())
return false;
// number of subtitle files must match the number of video files
return subtitles.size() == filter(files, VIDEO_FILES).size();
}
private DropAction getDropAction(List<File> files) {
// video files only, or any folder, containing video files
if (containsOnly(files, VIDEO_FILES) || (containsOnly(files, FOLDERS))) {
return DropAction.Download;
}
// subtitle files only, or video/subtitle matches
if (containsOnly(files, SUBTITLE_FILES) || containsOnlyVideoSubtitleMatches(files)) {
return DropAction.Upload;
}
// unknown input
return DropAction.Cancel;
}
protected abstract Icon getIcon(DropAction dropAction);
private final DropTargetAdapter dropHandler = new DropTargetAdapter() {
@Override
public void dragEnter(DropTargetDragEvent dtde) {
DropAction dropAction = DropAction.Download;
DropAction dropAction = DropAction.Accept;
try {
dropAction = getDropAction(getFilesFromTransferable(dtde.getTransferable()));
@ -225,14 +104,12 @@ abstract class SubtitleDropTarget extends JButton {
}
}
@Override
public void dragExit(DropTargetEvent dte) {
// reset to default state
setDropAction(DropAction.Download);
setDropAction(DropAction.Accept);
};
@Override
public void drop(DropTargetDropEvent dtde) {
dtde.acceptDrop(DnDConstants.ACTION_REFERENCE);
@ -273,4 +150,174 @@ abstract class SubtitleDropTarget extends JButton {
}
};
public static abstract class Download extends SubtitleDropTarget {
public abstract VideoHashSubtitleService[] getVideoHashSubtitleServices();
public abstract SubtitleProvider[] getSubtitleProviders();
public abstract String getQueryLanguage();
@Override
protected DropAction getDropAction(List<File> input) {
// accept video files and folders
return filter(input, VIDEO_FILES, FOLDERS).size() > 0 ? DropAction.Accept : DropAction.Cancel;
}
@Override
protected boolean handleDrop(List<File> input) {
// perform a drop action depending on the given files
final Collection<File> videoFiles = new TreeSet<File>();
// video files only
videoFiles.addAll(filter(input, VIDEO_FILES));
videoFiles.addAll(filter(listFiles(filter(input, FOLDERS), 5, false), VIDEO_FILES));
if (videoFiles.size() > 0) {
// invoke later so we don't block the DnD operation with the download dialog
invokeLater(0, new Runnable() {
@Override
public void run() {
handleDownload(videoFiles);
}
});
return true;
}
return false;
}
protected boolean handleDownload(Collection<File> videoFiles) {
SubtitleAutoMatchDialog dialog = new SubtitleAutoMatchDialog(getWindow(this));
// initialize download parameters
dialog.setVideoFiles(videoFiles.toArray(new File[0]));
for (VideoHashSubtitleService service : getVideoHashSubtitleServices()) {
dialog.addSubtitleService(service);
}
for (SubtitleProvider service : getSubtitleProviders()) {
dialog.addSubtitleService(service);
}
// start looking for subtitles
dialog.startQuery(getQueryLanguage());
// initialize window properties
dialog.setIconImage(getImage(getIcon(DropAction.Accept)));
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
dialog.setSize(820, 575);
// show dialog
dialog.setLocation(getOffsetLocation(dialog.getOwner()));
dialog.setVisible(true);
return true;
}
protected Icon getIcon(DropAction dropAction) {
switch (dropAction) {
case Accept:
return ResourceManager.getIcon("subtitle.exact.download");
default:
return ResourceManager.getIcon("message.error");
}
}
}
public static abstract class Upload extends SubtitleDropTarget {
public abstract OpenSubtitlesClient getSubtitleService();
@Override
protected DropAction getDropAction(List<File> input) {
if (getSubtitleService().isAnonymous())
return DropAction.Cancel;
// accept video files and folders
return (filter(input, VIDEO_FILES).size() > 0 && filter(input, SUBTITLE_FILES).size() > 0) || filter(input, FOLDERS).size() > 0 ? DropAction.Accept : DropAction.Cancel;
}
@Override
protected boolean handleDrop(List<File> input) {
setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
// perform a drop action depending on the given files
final Collection<File> files = new TreeSet<File>();
// video files only
files.addAll(filter(input, FILES));
files.addAll(listFiles(filter(input, FOLDERS), 5, false));
final List<File> videos = filter(files, VIDEO_FILES);
final List<File> subtitles = filter(files, SUBTITLE_FILES);
final Map<File, File> uploadPlan = new LinkedHashMap<File, File>();
for (File subtitle : subtitles) {
File video = getVideoForSubtitle(subtitle, filter(videos, new ParentFilter(subtitle.getParentFile())));
uploadPlan.put(subtitle, video);
}
setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
if (uploadPlan.size() > 0) {
// invoke later so we don't block the DnD operation with the download dialog
invokeLater(0, new Runnable() {
@Override
public void run() {
handleUpload(uploadPlan);
}
});
return true;
}
return false;
}
protected void handleUpload(Map<File, File> uploadPlan) {
SubtitleUploadDialog dialog = new SubtitleUploadDialog(getSubtitleService(), getWindow(this));
// initialize window properties
dialog.setIconImage(getImage(getIcon(DropAction.Accept)));
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
dialog.setSize(820, 575);
// show dialog
dialog.setLocation(getOffsetLocation(dialog.getOwner()));
// start processing
dialog.setUploadPlan(uploadPlan);
dialog.startChecking();
// show dialog
dialog.setVisible(true);
}
protected File getVideoForSubtitle(File subtitle, List<File> videos) {
String baseName = stripReleaseInfo(FileUtilities.getName(subtitle)).toLowerCase();
// find corresponding movie file
for (File it : videos) {
if (!baseName.isEmpty() && stripReleaseInfo(FileUtilities.getName(it)).toLowerCase().startsWith(baseName)) {
return it;
}
}
return null;
}
protected Icon getIcon(DropAction dropAction) {
switch (dropAction) {
case Accept:
return ResourceManager.getIcon("subtitle.exact.upload");
default:
return ResourceManager.getIcon("message.error");
}
}
}
}

101
source/net/sourceforge/filebot/ui/subtitle/SubtitlePanel.java
View File

@ -1,7 +1,5 @@
package net.sourceforge.filebot.ui.subtitle;
import static net.sourceforge.filebot.Settings.*;
import static net.sourceforge.filebot.ui.LanguageComboBoxModel.*;
import static net.sourceforge.filebot.ui.NotificationLogging.*;
@ -49,44 +47,28 @@ import net.sourceforge.filebot.web.VideoHashSubtitleService;
import net.sourceforge.tuned.ui.LabelProvider;
import net.sourceforge.tuned.ui.SimpleLabelProvider;
public class SubtitlePanel extends AbstractSearchPanel<SubtitleProvider, SubtitlePackage> {
private LanguageComboBox languageComboBox = new LanguageComboBox(this, ALL_LANGUAGES);
private LanguageComboBox languageComboBox = new LanguageComboBox(ALL_LANGUAGES, getSettings());
public SubtitlePanel() {
historyPanel.setColumnHeader(0, "Show / Movie");
historyPanel.setColumnHeader(1, "Number of Subtitles");
// add after text field
add(languageComboBox, "gap indent", 1);
add(createImageButton(setUserAction), "width 26px!, height 26px!, gap rel", 2);
add(languageComboBox, "gap indent, sgy button", 1);
add(createImageButton(setUserAction), "width 26px!, height 26px!, gap rel, sgy button", 2);
// add at the top right corner
add(dropTarget, "width 1.6cm!, height 1.2cm!, pos n 0% 100% n", 0);
add(uploadDropTarget, "width 1.45cm!, height 1.2cm!, pos n 0% 100%-1.8cm n", 0);
add(downloadDropTarget, "width 1.45cm!, height 1.2cm!, pos n 0% 100%-0.15cm n", 0);
}
private final SubtitleDropTarget dropTarget = new SubtitleDropTarget() {
@Override
public VideoHashSubtitleService[] getVideoHashSubtitleServices() {
return WebServices.getVideoHashSubtitleServices();
}
@Override
public SubtitleProvider[] getSubtitleProviders() {
return WebServices.getSubtitleProviders();
}
@Override
public String getQueryLanguage() {
// use currently selected language for drop target
return languageComboBox.getModel().getSelectedItem() == ALL_LANGUAGES ? null : languageComboBox.getModel().getSelectedItem().getName();
}
private final SubtitleDropTarget uploadDropTarget = new SubtitleDropTarget.Upload() {
public OpenSubtitlesClient getSubtitleService() {
return WebServices.OpenSubtitles;
};
@Override
protected void paintComponent(Graphics g) {
@ -96,9 +78,10 @@ public class SubtitlePanel extends AbstractSearchPanel<SubtitleProvider, Subtitl
Path2D path = new Path2D.Float();
path.moveTo(0, 0);
path.lineTo(0, getHeight() - 1 - 12);
path.quadTo(0, getHeight() - 1, 12, getHeight() - 1);
path.lineTo(getWidth(), getHeight() - 1);
path.lineTo(getWidth(), 0);
path.lineTo(12, getHeight() - 1);
path.lineTo(getWidth() - 1 - 12, getHeight() - 1);
path.lineTo(getWidth() - 1, getHeight() - 1 - 12);
path.lineTo(getWidth() - 1, 0);
g2d.setPaint(getBackground());
g2d.fill(path);
@ -112,25 +95,64 @@ public class SubtitlePanel extends AbstractSearchPanel<SubtitleProvider, Subtitl
}
};
private final SubtitleDropTarget downloadDropTarget = new SubtitleDropTarget.Download() {
@Override
public VideoHashSubtitleService[] getVideoHashSubtitleServices() {
return WebServices.getVideoHashSubtitleServices();
}
@Override
public SubtitleProvider[] getSubtitleProviders() {
return WebServices.getSubtitleProviders();
}
@Override
public String getQueryLanguage() {
// use currently selected language for drop target
return languageComboBox.getModel().getSelectedItem() == ALL_LANGUAGES ? null : languageComboBox.getModel().getSelectedItem().getName();
}
@Override
protected void paintComponent(Graphics g) {
Graphics2D g2d = (Graphics2D) g.create();
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
Path2D path = new Path2D.Float();
path.moveTo(0, 0);
path.lineTo(0, getHeight() - 1 - 12);
path.lineTo(12, getHeight() - 1);
path.lineTo(getWidth() - 1 - 12, getHeight() - 1);
path.lineTo(getWidth() - 1, getHeight() - 1 - 12);
path.lineTo(getWidth() - 1, 0);
g2d.setPaint(getBackground());
g2d.fill(path);
g2d.setPaint(Color.gray);
g2d.draw(path);
g2d.translate(2, 0);
super.paintComponent(g2d);
g2d.dispose();
}
};
@Override
protected SubtitleProvider[] getSearchEngines() {
return WebServices.getSubtitleProviders();
}
@Override
protected LabelProvider<SubtitleProvider> getSearchEngineLabelProvider() {
return SimpleLabelProvider.forClass(SubtitleProvider.class);
}
@Override
protected Settings getSettings() {
return Settings.forPackage(SubtitlePanel.class);
}
@Override
protected SubtitleRequestProcessor createRequestProcessor() {
SubtitleProvider provider = searchTextField.getSelectButton().getSelectedValue();
@ -140,13 +162,11 @@ public class SubtitlePanel extends AbstractSearchPanel<SubtitleProvider, Subtitl
return new SubtitleRequestProcessor(new SubtitleRequest(provider, text, language));
}
protected static class SubtitleRequest extends Request {
private final SubtitleProvider provider;
private final Language language;
public SubtitleRequest(SubtitleProvider provider, String searchText, Language language) {
super(searchText);
@ -154,32 +174,27 @@ public class SubtitlePanel extends AbstractSearchPanel<SubtitleProvider, Subtitl
this.language = language;
}
public SubtitleProvider getProvider() {
return provider;
}
public String getLanguageName() {
return language == ALL_LANGUAGES ? null : language.getName();
}
}
protected static class SubtitleRequestProcessor extends RequestProcessor<SubtitleRequest, SubtitlePackage> {
public SubtitleRequestProcessor(SubtitleRequest request) {
super(request, new SubtitleDownloadComponent());
}
@Override
public Collection<SearchResult> search() throws Exception {
return request.getProvider().search(request.getSearchText());
}
@Override
public Collection<SubtitlePackage> fetch() throws Exception {
List<SubtitlePackage> packages = new ArrayList<SubtitlePackage>();
@ -191,38 +206,32 @@ public class SubtitlePanel extends AbstractSearchPanel<SubtitleProvider, Subtitl
return packages;
}
@Override
public URI getLink() {
return request.getProvider().getSubtitleListLink(getSearchResult(), request.getLanguageName());
}
@Override
public void process(Collection<SubtitlePackage> subtitles) {
getComponent().setLanguageVisible(request.getLanguageName() == null);
getComponent().getPackageModel().addAll(subtitles);
}
@Override
public SubtitleDownloadComponent getComponent() {
return (SubtitleDownloadComponent) super.getComponent();
}
@Override
public String getStatusMessage(Collection<SubtitlePackage> result) {
return (result.isEmpty()) ? "No subtitles found" : String.format("%d subtitles", result.size());
}
@Override
public Icon getIcon() {
return request.provider.getIcon();
}
@Override
protected void configureSelectDialog(SelectDialog<SearchResult> selectDialog) {
super.configureSelectDialog(selectDialog);

666
source/net/sourceforge/filebot/ui/subtitle/SubtitleUploadDialog.java Normal file
View File

@ -0,0 +1,666 @@
package net.sourceforge.filebot.ui.subtitle;
import static net.sourceforge.filebot.MediaTypes.*;
import static net.sourceforge.filebot.media.MediaDetection.*;
import static net.sourceforge.tuned.ui.TunedUtilities.*;
import java.awt.Color;
import java.awt.Component;
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.EnumSet;
import java.util.EventObject;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.DefaultCellEditor;
import javax.swing.DefaultListCellRenderer;
import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.ListCellRenderer;
import javax.swing.SwingWorker;
import javax.swing.event.CellEditorListener;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
import net.miginfocom.swing.MigLayout;
import net.sourceforge.filebot.ResourceManager;
import net.sourceforge.filebot.media.MediaDetection;
import net.sourceforge.filebot.ui.Language;
import net.sourceforge.filebot.ui.LanguageComboBox;
import net.sourceforge.filebot.ui.SelectDialog;
import net.sourceforge.filebot.web.Movie;
import net.sourceforge.filebot.web.OpenSubtitlesClient;
import net.sourceforge.filebot.web.VideoHashSubtitleService.CheckResult;
import net.sourceforge.tuned.FileUtilities;
import net.sourceforge.tuned.ui.AbstractBean;
import net.sourceforge.tuned.ui.EmptySelectionModel;
public class SubtitleUploadDialog extends JDialog {
private final JTable subtitleMappingTable = createTable();
private final OpenSubtitlesClient database;
private ExecutorService checkExecutorService;
private ExecutorService uploadExecutorService;
public SubtitleUploadDialog(OpenSubtitlesClient database, Window owner) {
super(owner, "Upload Subtitles", ModalityType.DOCUMENT_MODAL);
this.database = database;
JComponent content = (JComponent) getContentPane();
content.setLayout(new MigLayout("fill, insets dialog, nogrid", "", "[fill][pref!]"));
content.add(new JScrollPane(subtitleMappingTable), "grow, wrap");
content.add(new JButton(uploadAction), "tag ok");
content.add(new JButton(finishAction), "tag cancel");
}
protected JTable createTable() {
JTable table = new JTable(new SubtitleMappingTableModel());
table.setDefaultRenderer(Movie.class, new MovieRenderer());
table.setDefaultRenderer(File.class, new FileRenderer());
table.setDefaultRenderer(Language.class, new LanguageRenderer());
table.setDefaultRenderer(SubtitleMapping.Status.class, new StatusRenderer());
table.setRowHeight(28);
table.setIntercellSpacing(new Dimension(5, 5));
table.setBackground(Color.white);
table.setAutoCreateRowSorter(true);
table.setFillsViewportHeight(true);
LanguageComboBox languageEditor = new LanguageComboBox(Language.getLanguage("en"), null);
// disable selection
table.setSelectionModel(new EmptySelectionModel());
languageEditor.setFocusable(false);
table.setDefaultEditor(Language.class, new DefaultCellEditor(languageEditor) {
@Override
public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
LanguageComboBox editor = (LanguageComboBox) super.getTableCellEditorComponent(table, value, isSelected, row, column);
editor.getModel().setSelectedItem(value);
return editor;
}
});
table.setDefaultEditor(Movie.class, new TableCellEditor() {
@Override
public boolean stopCellEditing() {
return true;
}
@Override
public boolean shouldSelectCell(EventObject evt) {
return false;
}
@Override
public void removeCellEditorListener(CellEditorListener listener) {
}
@Override
public boolean isCellEditable(EventObject evt) {
return true;
}
@Override
public Object getCellEditorValue() {
return null;
}
@Override
public void cancelCellEditing() {
}
@Override
public void addCellEditorListener(CellEditorListener evt) {
}
@Override
public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
table.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
try {
SubtitleMappingTableModel model = (SubtitleMappingTableModel) table.getModel();
SubtitleMapping mapping = model.getData()[table.convertRowIndexToModel(row)];
Object originalIdentity = mapping.getIdentity();
File video = mapping.getVideo();
String input = showInputDialog("Enter movie / series name:", stripReleaseInfo(FileUtilities.getName(video)), String.format("%s/%s", video.getParentFile().getName(), video.getName()), SubtitleUploadDialog.this);
if (input != null && input.length() > 0) {
List<Movie> options = database.searchMovie(input, Locale.ENGLISH);
if (options.size() > 0) {
SelectDialog<Movie> dialog = new SelectDialog<Movie>(SubtitleUploadDialog.this, options);
dialog.setLocation(getOffsetLocation(dialog.getOwner()));
dialog.setVisible(true);
Movie selectedValue = dialog.getSelectedValue();
if (selectedValue != null) {
for (SubtitleMapping it : model.getData()) {
if (originalIdentity == it.getIdentity() || (originalIdentity != null && originalIdentity.equals(it.getIdentity()))) {
if (model.isCellEditable(table.convertRowIndexToModel(row), table.convertColumnIndexToModel(column))) {
it.setIdentity(selectedValue);
}
}
}
if (mapping.getIdentity() != null && mapping.getLanguage() != null) {
mapping.setState(SubtitleMapping.Status.UploadReady);
}
}
}
}
} catch (Exception e) {
Logger.getLogger(SubtitleUploadDialog.class.getClass().getName()).log(Level.WARNING, e.getMessage(), e);
}
table.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
return null;
}
});
return table;
}
public void setUploadPlan(Map<File, File> uploadPlan) {
List<SubtitleMapping> mappings = new ArrayList<SubtitleMapping>(uploadPlan.size());
for (Entry<File, File> entry : uploadPlan.entrySet()) {
File subtitle = entry.getKey();
File video = entry.getValue();
Locale locale = MediaDetection.guessLanguageFromSuffix(subtitle);
Language language = Language.getLanguage(locale);
mappings.add(new SubtitleMapping(subtitle, video, language));
}
subtitleMappingTable.setModel(new SubtitleMappingTableModel(mappings.toArray(new SubtitleMapping[0])));
}
public void startChecking() {
checkExecutorService = Executors.newFixedThreadPool(2);
SubtitleMapping[] data = ((SubtitleMappingTableModel) subtitleMappingTable.getModel()).getData();
for (SubtitleMapping it : data) {
if (it.getSubtitle() != null && it.getVideo() != null) {
checkExecutorService.submit(new CheckTask(it));
} else {
it.setState(SubtitleMapping.Status.IllegalInput);
}
}
checkExecutorService.shutdown();
}
private final Action uploadAction = new AbstractAction("Upload", ResourceManager.getIcon("dialog.continue")) {
@Override
public void actionPerformed(ActionEvent evt) {
// disable any active cell editor
if (subtitleMappingTable.getCellEditor() != null) {
subtitleMappingTable.getCellEditor().stopCellEditing();
}
// don't allow restart of upload as long as there are still unfinished download tasks
if (uploadExecutorService != null && !uploadExecutorService.isTerminated()) {
return;
}
uploadExecutorService = Executors.newFixedThreadPool(1);
SubtitleMapping[] data = ((SubtitleMappingTableModel) subtitleMappingTable.getModel()).getData();
for (final SubtitleMapping it : data) {
if (it.getStatus() == SubtitleMapping.Status.UploadReady) {
uploadExecutorService.submit(new UploadTask(it));
}
}
// terminate after all uploads have been completed
uploadExecutorService.shutdown();
}
};
private final Action finishAction = new AbstractAction("Close", ResourceManager.getIcon("dialog.cancel")) {
@Override
public void actionPerformed(ActionEvent evt) {
if (checkExecutorService != null) {
checkExecutorService.shutdownNow();
}
if (uploadExecutorService != null) {
uploadExecutorService.shutdownNow();
}
setVisible(false);
dispose();
}
};
private class MovieRenderer extends DefaultTableCellRenderer {
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
String text = null;
String tooltip = null;
Icon icon = null;
Movie movie = (Movie) value;
if (movie != null) {
text = movie.toString();
tooltip = String.format("%s [tt%07d]", movie.toString(), movie.getImdbId());
icon = database.getIcon();
}
setText(text);
setToolTipText(tooltip);
setIcon(icon);
return this;
}
}
private class FileRenderer extends DefaultTableCellRenderer {
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
String text = null;
String tooltip = null;
Icon icon = null;
if (value != null) {
File file = (File) value;
text = file.getName();
tooltip = file.getPath();
if (SUBTITLE_FILES.accept(file)) {
icon = ResourceManager.getIcon("file.subtitle");
} else if (VIDEO_FILES.accept(file)) {
icon = ResourceManager.getIcon("file.video");
}
}
setText(text);
setToolTipText(text);
setIcon(icon);
return this;
}
}
private class LanguageRenderer implements TableCellRenderer, ListCellRenderer {
private DefaultTableCellRenderer tableCell = new DefaultTableCellRenderer();
private DefaultListCellRenderer listCell = new DefaultListCellRenderer();
private Component configure(JLabel c, Object value, boolean isSelected, boolean hasFocus) {
String text = null;
Icon icon = null;
if (value != null) {
Language language = (Language) value;
text = language.getName();
icon = ResourceManager.getFlagIcon(language.getCode());
}
c.setText(text);
c.setIcon(icon);
return c;
}
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
return configure((DefaultTableCellRenderer) tableCell.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column), value, isSelected, hasFocus);
}
@Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
return configure((DefaultListCellRenderer) listCell.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus), value, isSelected, cellHasFocus);
}
}
private class StatusRenderer extends DefaultTableCellRenderer {
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
String text = null;
Icon icon = null;
// CheckPending, Checking, CheckFailed, AlreadyExists, Identifying, IdentificationRequired, UploadPending, Uploading, UploadComplete, UploadFailed;
switch ((SubtitleMapping.Status) value) {
case IllegalInput:
text = "No video/subtitle pair";
icon = ResourceManager.getIcon("status.error");
break;
case CheckPending:
text = "Pending...";
icon = ResourceManager.getIcon("worker.pending");
break;
case Checking:
text = "Checking database...";
icon = ResourceManager.getIcon("database.go");
break;
case CheckFailed:
text = "Failed to check database";
icon = ResourceManager.getIcon("database.error");
break;
case AlreadyExists:
text = "Subtitle already exists in database";
icon = ResourceManager.getIcon("database.ok");
break;
case Identifying:
text = "Auto-detect missing information";
icon = ResourceManager.getIcon("action.export");
break;
case IdentificationRequired:
text = "Unable to auto-detect movie / series info";
icon = ResourceManager.getIcon("dialog.continue.invalid");
break;
case UploadReady:
text = "Ready for upload";
icon = ResourceManager.getIcon("dialog.continue");
break;
case Uploading:
text = "Uploading...";
icon = ResourceManager.getIcon("database.go");
break;
case UploadComplete:
text = "Upload successful";
icon = ResourceManager.getIcon("database.ok");
break;
case UploadFailed:
text = "Upload failed";
icon = ResourceManager.getIcon("database.error");
break;
}
setText(text);
setIcon(icon);
return this;
}
}
private static class SubtitleMappingTableModel extends AbstractTableModel {
private final SubtitleMapping[] data;
public SubtitleMappingTableModel(SubtitleMapping... mappings) {
this.data = mappings.clone();
for (int i = 0; i < data.length; i++) {
data[i].addPropertyChangeListener(new SubtitleMappingListener(i));
}
}
public SubtitleMapping[] getData() {
return data.clone();
}
@Override
public int getColumnCount() {
return 5;
}
@Override
public String getColumnName(int column) {
switch (column) {
case 0:
return "Movie / Series";
case 1:
return "Video";
case 2:
return "Subtitle";
case 3:
return "Language";
case 4:
return "Status";
}
return null;
}
@Override
public int getRowCount() {
return data.length;
}
@Override
public Object getValueAt(int row, int column) {
switch (column) {
case 0:
return data[row].getIdentity();
case 1:
return data[row].getVideo();
case 2:
return data[row].getSubtitle();
case 3:
return data[row].getLanguage();
case 4:
return data[row].getStatus();
}
return null;
}
@Override
public void setValueAt(Object value, int row, int column) {
if (getColumnClass(column) == Language.class && value instanceof Language) {
data[row].setLanguage((Language) value);
}
}
@Override
public boolean isCellEditable(int row, int column) {
return (EnumSet.of(SubtitleMapping.Status.IdentificationRequired, SubtitleMapping.Status.UploadReady).contains(data[row].getStatus())) && (getColumnClass(column) == Movie.class || getColumnClass(column) == Language.class);
}
@Override
public Class<?> getColumnClass(int column) {
switch (column) {
case 0:
return Movie.class;
case 1:
return File.class;
case 2:
return File.class;
case 3:
return Language.class;
case 4:
return SubtitleMapping.Status.class;
}
return null;
}
private class SubtitleMappingListener implements PropertyChangeListener {
private final int index;
public SubtitleMappingListener(int index) {
this.index = index;
}
@Override
public void propertyChange(PropertyChangeEvent evt) {
// update state and subtitle options
fireTableRowsUpdated(index, index);
}
}
}
private static class SubtitleMapping extends AbstractBean {
enum Status {
IllegalInput, CheckPending, Checking, CheckFailed, AlreadyExists, Identifying, IdentificationRequired, UploadReady, Uploading, UploadComplete, UploadFailed;
}
private Object identity;
private File subtitle;
private File video;
private Language language;
private Status status = Status.CheckPending;
private String message = null;
public SubtitleMapping(File subtitle, File video, Language language) {
this.subtitle = subtitle;
this.video = video;
this.language = language;
}
public Object getIdentity() {
return identity;
}
public File getSubtitle() {
return subtitle;
}
public File getVideo() {
return video;
}
public Language getLanguage() {
return language;
}
public Status getStatus() {
return status;
}
public void setIdentity(Object identity) {
this.identity = identity;
firePropertyChange("identity", null, this.identity);
}
public void setLanguage(Language language) {
this.language = language;
firePropertyChange("language", null, this.language);
}
public void setState(Status status) {
this.status = status;
firePropertyChange("status", null, this.status);
}
}
private class CheckTask extends SwingWorker<Object, Void> {
private final SubtitleMapping mapping;
public CheckTask(SubtitleMapping mapping) {
this.mapping = mapping;
}
@Override
protected Object doInBackground() throws Exception {
try {
mapping.setState(SubtitleMapping.Status.Checking);
CheckResult checkResult = database.checkSubtitle(mapping.getVideo(), mapping.getSubtitle());
// accept identity hint from search result
mapping.setIdentity(checkResult.identity);
if (checkResult.exists) {
mapping.setLanguage(Language.getLanguage(checkResult.language)); // trust language hint only if upload not required
mapping.setState(SubtitleMapping.Status.AlreadyExists);
return checkResult;
}
if (mapping.getLanguage() == null) {
mapping.setState(SubtitleMapping.Status.Identifying);
try {
Locale locale = database.detectLanguage(FileUtilities.readFile(mapping.getSubtitle()));
mapping.setLanguage(Language.getLanguage(locale));
} catch (Exception e) {
Logger.getLogger(CheckTask.class.getClass().getName()).log(Level.WARNING, "Failed to auto-detect language: " + e.getMessage());
}
}
// default to English
if (mapping.getLanguage() == null) {
mapping.setLanguage(Language.getLanguage("en"));
}
if (mapping.getIdentity() == null) {
mapping.setState(SubtitleMapping.Status.Identifying);
try {
Collection<Movie> identity = MediaDetection.detectMovie(mapping.getVideo(), database, database, Locale.ENGLISH, true);
for (Movie it : identity) {
if (it.getImdbId() <= 0 && it.getTmdbId() > 0) {
it = MediaDetection.tmdb2imdb(it);
}
if (it != null && it.getImdbId() > 0) {
mapping.setIdentity(it);
break;
}
}
} catch (Exception e) {
Logger.getLogger(CheckTask.class.getClass().getName()).log(Level.WARNING, "Failed to auto-detect movie: " + e.getMessage());
}
}
if (mapping.getIdentity() == null) {
mapping.setState(SubtitleMapping.Status.IdentificationRequired);
} else {
mapping.setState(SubtitleMapping.Status.UploadReady);
}
return checkResult;
} catch (Exception e) {
Logger.getLogger(CheckTask.class.getClass().getName()).log(Level.SEVERE, e.getMessage(), e);
mapping.setState(SubtitleMapping.Status.CheckFailed);
}
return null;
}
}
private class UploadTask extends SwingWorker<Object, Void> {
private final SubtitleMapping mapping;
public UploadTask(SubtitleMapping mapping) {
this.mapping = mapping;
}
@Override
protected Object doInBackground() {
try {
mapping.setState(SubtitleMapping.Status.Uploading);
if (true)
throw new RuntimeException();
database.uploadSubtitle(mapping.getIdentity(), mapping.getLanguage().toLocale(), mapping.getVideo(), mapping.getSubtitle());
mapping.setState(SubtitleMapping.Status.UploadComplete);
} catch (Exception e) {
Logger.getLogger(UploadTask.class.getClass().getName()).log(Level.SEVERE, e.getMessage(), e);
mapping.setState(SubtitleMapping.Status.UploadFailed);
}
return null;
}
}
}

125
source/net/sourceforge/filebot/web/OpenSubtitlesClient.java
View File

@ -1,7 +1,5 @@
package net.sourceforge.filebot.web;
import static java.lang.Math.*;
import static java.util.Arrays.*;
import static java.util.Collections.*;
@ -43,52 +41,51 @@ import net.sourceforge.filebot.web.OpenSubtitlesXmlRpc.TryUploadResponse;
import net.sourceforge.tuned.Timer;
import redstone.xmlrpc.XmlRpcException;
/**
* SubtitleClient for OpenSubtitles.
*/
public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleService, MovieIdentificationService {
private final OpenSubtitlesXmlRpc xmlrpc;
public final OpenSubtitlesXmlRpc xmlrpc;
private String username = "";
private String password = "";
public OpenSubtitlesClient(String useragent) {
this.xmlrpc = new OpenSubtitlesXmlRpc(useragent);
}
public synchronized void setUser(String username, String password) {
// cancel previous session
this.logout();
public void setUser(String username, String password) {
this.username = username;
this.password = password;
}
public boolean isAnonymous() {
return username.isEmpty();
}
@Override
public String getName() {
return "OpenSubtitles";
}
@Override
public URI getLink() {
return URI.create("http://www.opensubtitles.org");
}
@Override
public Icon getIcon() {
return ResourceManager.getIcon("search.opensubtitles");
}
public ResultCache getCache() {
return new ResultCache("opensubtitles.org", Cache.getCache("web-datasource"));
}
@Override
public List<SearchResult> search(String query) throws Exception {
List<SearchResult> result = getCache().getSearchResult("search", query, null);
@ -112,7 +109,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return result;
}
@Override
public List<SubtitleDescriptor> getSubtitleList(SearchResult searchResult, String languageName) throws Exception {
List<SubtitleDescriptor> subtitles = getCache().getSubtitleDescriptorList(searchResult, languageName);
@ -134,7 +130,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return subtitles;
}
@Override
public Map<File, List<SubtitleDescriptor>> getSubtitleList(File[] files, String languageName) throws Exception {
// singleton array with or empty array
@ -196,56 +191,85 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return resultMap;
}
@Override
public boolean publishSubtitle(int imdbid, String languageName, File[] videoFile, File[] subtitleFile) throws Exception {
SubFile[] subs = new SubFile[subtitleFile.length];
// subhash (md5 of subtitles), subfilename, moviehash, moviebytesize, moviefilename.
for (int i = 0; i < subtitleFile.length; i++) {
public CheckResult checkSubtitle(File videoFile, File subtitleFile) throws Exception {
// subhash (md5 of subtitles), subfilename, moviehash, moviebytesize, moviefilename
SubFile sub = new SubFile();
sub.setSubHash(md5(subtitleFile[i]));
sub.setSubFileName(subtitleFile[i].getName());
sub.setMovieHash(computeHash(videoFile[i]));
sub.setMovieByteSize(videoFile[i].length());
sub.setMovieFileName(videoFile[i].getName());
subs[i] = sub;
}
sub.setSubHash(md5(subtitleFile));
sub.setSubFileName(subtitleFile.getName());
sub.setMovieHash(computeHash(videoFile));
sub.setMovieByteSize(videoFile.length());
sub.setMovieFileName(videoFile.getName());
// require login
login();
// check if subs already exist in db
TryUploadResponse response = xmlrpc.tryUploadSubtitles(subs);
System.out.println(response); // TODO only upload if necessary OR return false
// check if subs already exist in DB
TryUploadResponse response = xmlrpc.tryUploadSubtitles(sub);
// TryUploadResponse: false => [{HashWasAlreadyInDb=1, MovieKind=movie, IDSubtitle=3167446, MoviefilenameWasAlreadyInDb=1, ISO639=en, MovieYear=2007, SubLanguageID=eng, MovieName=Blades of Glory, MovieNameEng=, IDMovieImdb=445934}]
boolean exists = !response.isUploadRequired();
Movie identity = null;
Locale language = null;
if (response.getSubtitleData().size() > 0) {
try {
Map<String, String> fields = response.getSubtitleData().get(0);
String lang = fields.get("SubLanguageID");
language = new Locale(lang);
String imdb = fields.get("IDMovieImdb");
String name = fields.get("MovieName");
String year = fields.get("MovieYear");
identity = new Movie(name, Integer.parseInt(year), Integer.parseInt(imdb), -1);
} catch (Exception e) {
Logger.getLogger(getClass().getName()).log(Level.WARNING, e.getMessage());
}
}
return new CheckResult(exists, identity, language);
}
@Override
public void uploadSubtitle(Object identity, Locale language, File videoFile, File subtitleFile) throws Exception {
if (!(identity instanceof Movie && ((Movie) identity).getImdbId() > 0)) {
throw new IllegalArgumentException("Illegal Movie ID: " + identity);
}
int imdbid = ((Movie) identity).getImdbId();
String languageName = getSubLanguageID(language.getDisplayName(Locale.ENGLISH));
// subhash (md5 of subtitles), subfilename, moviehash, moviebytesize, moviefilename
SubFile sub = new SubFile();
sub.setSubHash(md5(subtitleFile));
sub.setSubFileName(subtitleFile.getName());
sub.setMovieHash(computeHash(videoFile));
sub.setMovieByteSize(videoFile.length());
sub.setMovieFileName(videoFile.getName());
BaseInfo info = new BaseInfo();
info.setIDMovieImdb(imdbid);
info.setSubLanguageID(getSubLanguageID(languageName));
info.setSubLanguageID(languageName);
// encode subtitle contents
for (int i = 0; i < subtitleFile.length; i++) {
// grab subtitle content
subs[i].setSubContent(readFile(subtitleFile[i]));
sub.setSubContent(readFile(subtitleFile));
try {
// grab media info
MediaInfo mi = new MediaInfo();
mi.open(videoFile[i]);
subs[i].setMovieFPS(mi.get(StreamKind.Video, 0, "FrameRate"));
subs[i].setMovieTimeMS(mi.get(StreamKind.General, 0, "Duration"));
mi.open(videoFile);
sub.setMovieFPS(mi.get(StreamKind.Video, 0, "FrameRate"));
sub.setMovieTimeMS(mi.get(StreamKind.General, 0, "Duration"));
mi.close();
} catch (Throwable e) {
Logger.getLogger(getClass().getName()).log(Level.WARNING, e.getMessage(), e);
}
}
URI resource = xmlrpc.uploadSubtitles(info, subs);
URI resource = xmlrpc.uploadSubtitles(info, sub);
System.out.println(resource);
return false;
}
/**
* Calculate MD5 hash.
*/
@ -259,7 +283,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
}
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public List<Movie> searchMovie(String query, Locale locale) throws Exception {
@ -277,7 +300,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return movies;
}
@Override
public Movie getMovieDescriptor(int imdbid, Locale locale) throws Exception {
Movie result = getCache().getData("getMovieDescriptor", imdbid, locale, Movie.class);
@ -294,12 +316,10 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return movie;
}
public Movie getMovieDescriptor(File movieFile, Locale locale) throws Exception {
return getMovieDescriptors(singleton(movieFile), locale).get(movieFile);
}
@Override
public Map<File, Movie> getMovieDescriptors(Collection<File> movieFiles, Locale locale) throws Exception {
// create result array
@ -354,7 +374,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return result;
}
@Override
public URI getSubtitleListLink(SearchResult searchResult, String languageName) {
Movie movie = (Movie) searchResult;
@ -371,7 +390,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return URI.create(String.format("http://www.opensubtitles.org/en/search/imdbid-%d/sublanguageid-%s", movie.getImdbId(), sublanguageid));
}
public Locale detectLanguage(byte[] data) throws Exception {
// require login
login();
@ -383,7 +401,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return languages.size() > 0 ? new Locale(languages.get(0)) : null;
}
public synchronized void login() throws Exception {
if (!xmlrpc.isLoggedOn()) {
xmlrpc.login(username, password, "en");
@ -392,7 +409,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
logoutTimer.set(10, TimeUnit.MINUTES, true);
}
protected synchronized void logout() {
if (xmlrpc.isLoggedOn()) {
try {
@ -401,7 +417,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
Logger.getLogger(getClass().getName()).log(Level.WARNING, "Logout failed", e);
}
}
logoutTimer.cancel();
}
@ -413,7 +428,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
}
};
/**
* SubLanguageID by English language name
*/
@ -443,7 +457,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return subLanguageMap;
}
protected String getSubLanguageID(String languageName) throws Exception {
Map<String, String> subLanguageMap = getSubLanguageMap();
String key = languageName.toLowerCase();
@ -455,7 +468,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return subLanguageMap.get(key);
}
protected String getLanguageName(String subLanguageID) throws Exception {
for (Entry<String, String> it : getSubLanguageMap().entrySet()) {
if (it.getValue().equals(subLanguageID.toLowerCase()))
@ -465,24 +477,20 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return null;
}
protected static class ResultCache {
private final String id;
private final Cache cache;
public ResultCache(String id, Cache cache) {
this.id = id;
this.cache = cache;
}
protected String normalize(String query) {
return query == null ? null : query.trim().toLowerCase();
}
public <T extends SearchResult> List<T> putSearchResult(String method, String query, Locale locale, List<T> value) {
try {
cache.put(new Key(id, normalize(query)), value.toArray(new SearchResult[0]));
@ -493,7 +501,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return value;
}
@SuppressWarnings("unchecked")
public List<SearchResult> getSearchResult(String method, String query, Locale locale) {
try {
@ -508,7 +515,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return null;
}
public List<SubtitleDescriptor> putSubtitleDescriptorList(Object key, String locale, List<SubtitleDescriptor> subtitles) {
try {
cache.put(new Key(id, key, locale), subtitles.toArray(new SubtitleDescriptor[0]));
@ -519,7 +525,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return subtitles;
}
public List<SubtitleDescriptor> getSubtitleDescriptorList(Object key, String locale) {
try {
SubtitleDescriptor[] descriptors = cache.get(new Key(id, key, locale), SubtitleDescriptor[].class);
@ -533,7 +538,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return null;
}
public void putData(Object category, Object key, Locale locale, Object object) {
try {
cache.put(new Key(id, category, locale, key), object);
@ -542,7 +546,6 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
}
}
public <T> T getData(Object category, Object key, Locale locale, Class<T> type) {
try {
T value = cache.get(new Key(id, category, locale, key), type);

69
source/net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java
View File

@ -1,7 +1,5 @@
package net.sourceforge.filebot.web;
import static java.util.Collections.*;
import static net.sourceforge.tuned.StringUtilities.*;
@ -32,19 +30,16 @@ import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcFault;
import redstone.xmlrpc.util.Base64;
public class OpenSubtitlesXmlRpc {
private final String useragent;
private String token;
public OpenSubtitlesXmlRpc(String useragent) {
this.useragent = useragent;
}
/**
* Login as anonymous user
*/
@ -52,15 +47,15 @@ public class OpenSubtitlesXmlRpc {
login("", "", "en");
}
/**
* This will login user. This method should be called always when starting talking with
* server.
* This will login user. This method should be called always when starting talking with server.
*
* @param username username (blank for anonymous user)
* @param password password (blank for anonymous user)
* @param language ISO639 2-letter codes as language and later communication will be done in this language if
* applicable (error codes and so on).
* @param username
* username (blank for anonymous user)
* @param password
* password (blank for anonymous user)
* @param language
* ISO639 2-letter codes as language and later communication will be done in this language if applicable (error codes and so on).
*/
public synchronized void login(String username, String password, String language) throws XmlRpcFault {
Map<?, ?> response = invoke("LogIn", username, password, language, useragent);
@ -69,7 +64,6 @@ public class OpenSubtitlesXmlRpc {
token = response.get("token").toString();
}
/**
* This will logout user (ends session id). Call this function is before closing the client program.
*/
@ -84,23 +78,19 @@ public class OpenSubtitlesXmlRpc {
}
}
public boolean isLoggedOn() {
return token != null;
}
@SuppressWarnings("unchecked")
public Map<String, String> getServerInfo() throws XmlRpcFault {
return (Map<String, String>) invoke("ServerInfo", token);
}
public List<OpenSubtitlesSubtitleDescriptor> searchSubtitles(int imdbid, String... sublanguageids) throws XmlRpcFault {
return searchSubtitles(singleton(Query.forImdbId(imdbid, sublanguageids)));
}
@SuppressWarnings("unchecked")
public List<OpenSubtitlesSubtitleDescriptor> searchSubtitles(Collection<Query> queryList) throws XmlRpcFault {
List<OpenSubtitlesSubtitleDescriptor> subtitles = new ArrayList<OpenSubtitlesSubtitleDescriptor>();
@ -119,7 +109,6 @@ public class OpenSubtitlesXmlRpc {
return subtitles;
}
@SuppressWarnings("unchecked")
public List<Movie> searchMoviesOnIMDB(String query) throws XmlRpcFault {
Map<?, ?> response = invoke("SearchMoviesOnIMDB", token, query);
@ -153,7 +142,6 @@ public class OpenSubtitlesXmlRpc {
return movies;
}
@SuppressWarnings("unchecked")
public TryUploadResponse tryUploadSubtitles(SubFile... subtitles) throws XmlRpcFault {
Map<String, SubFile> struct = new HashMap<String, SubFile>();
@ -165,7 +153,7 @@ public class OpenSubtitlesXmlRpc {
Map<?, ?> response = invoke("TryUploadSubtitles", token, struct);
boolean uploadRequired = response.get("alreadyindb").equals("0");
boolean uploadRequired = response.get("alreadyindb").toString().equals("0");
List<Map<String, String>> subtitleData = new ArrayList<Map<String, String>>();
if (response.get("data") instanceof Map) {
@ -177,7 +165,6 @@ public class OpenSubtitlesXmlRpc {
return new TryUploadResponse(uploadRequired, subtitleData);
}
public URI uploadSubtitles(BaseInfo baseInfo, SubFile... subtitles) throws XmlRpcFault {
Map<String, Object> struct = new HashMap<String, Object>();
@ -195,7 +182,6 @@ public class OpenSubtitlesXmlRpc {
return URI.create(response.get("data").toString());
}
@SuppressWarnings("unchecked")
public List<String> detectLanguage(byte[] data) throws XmlRpcFault {
// compress and base64 encode
@ -211,7 +197,6 @@ public class OpenSubtitlesXmlRpc {
return languages;
}
@SuppressWarnings("unchecked")
public Map<String, Integer> checkSubHash(Collection<String> hashes) throws XmlRpcFault {
Map<?, ?> response = invoke("CheckSubHash", token, hashes);
@ -227,7 +212,6 @@ public class OpenSubtitlesXmlRpc {
return subHashMap;
}
@SuppressWarnings("unchecked")
public Map<String, Movie> checkMovieHash(Collection<String> hashes, int minSeenCount) throws XmlRpcFault {
Map<String, Movie> movieHashMap = new HashMap<String, Movie>();
@ -274,12 +258,10 @@ public class OpenSubtitlesXmlRpc {
return movieHashMap;
}
public Map<String, String> getSubLanguages() throws XmlRpcFault {
return getSubLanguages("en");
}
@SuppressWarnings("unchecked")
public Movie getIMDBMovieDetails(int imdbid) throws XmlRpcFault {
Map<?, ?> response = invoke("GetIMDBMovieDetails", token, imdbid);
@ -299,7 +281,6 @@ public class OpenSubtitlesXmlRpc {
return null;
}
@SuppressWarnings("unchecked")
public Map<String, String> getSubLanguages(String languageCode) throws XmlRpcFault {
Map<String, List<Map<String, String>>> response = (Map<String, List<Map<String, String>>>) invoke("GetSubLanguages", languageCode);
@ -313,12 +294,10 @@ public class OpenSubtitlesXmlRpc {
return subLanguageMap;
}
public void noOperation() throws XmlRpcFault {
invoke("NoOperation", token);
}
protected Map<?, ?> invoke(String method, Object... arguments) throws XmlRpcFault {
try {
XmlRpcClient rpc = new XmlRpcClient(getXmlRpcUrl(), false);
@ -337,7 +316,6 @@ public class OpenSubtitlesXmlRpc {
}
}
protected URL getXmlRpcUrl() {
try {
return new URL("http://api.opensubtitles.org/xml-rpc");
@ -347,7 +325,6 @@ public class OpenSubtitlesXmlRpc {
}
}
protected static String encodeData(byte[] data) {
try {
DeflaterInputStream compressedDataStream = new DeflaterInputStream(new ByteArrayInputStream(data));
@ -364,12 +341,13 @@ public class OpenSubtitlesXmlRpc {
}
}
/**
* Check whether status is OK or not
*
* @param status status code and message (e.g. 200 OK, 401 Unauthorized, ...)
* @throws XmlRpcFault thrown if status code is not OK
* @param status
* status code and message (e.g. 200 OK, 401 Unauthorized, ...)
* @throws XmlRpcFault
* thrown if status code is not OK
*/
protected void checkResponse(Map<?, ?> response) throws XmlRpcFault {
String status = (String) response.get("status");
@ -386,7 +364,6 @@ public class OpenSubtitlesXmlRpc {
}
}
public static final class Query extends HashMap<String, Object> implements Serializable {
private Query(String imdbid, String... sublanguageids) {
@ -394,99 +371,82 @@ public class OpenSubtitlesXmlRpc {
put("sublanguageid", join(sublanguageids, ","));
}
private Query(String moviehash, String moviebytesize, String... sublanguageids) {
put("moviehash", moviehash);
put("moviebytesize", moviebytesize);
put("sublanguageid", join(sublanguageids, ","));
}
public static Query forHash(String moviehash, long moviebytesize, String... sublanguageids) {
return new Query(moviehash, Long.toString(moviebytesize), sublanguageids);
}
public static Query forImdbId(int imdbid, String... sublanguageids) {
return new Query(Integer.toString(imdbid), sublanguageids);
}
}
public static final class BaseInfo extends HashMap<String, Object> {
public void setIDMovieImdb(int imdb) {
put("idmovieimdb", Integer.toString(imdb));
}
public void setSubLanguageID(String sublanguageid) {
put("sublanguageid", sublanguageid);
}
public void setMovieReleaseName(String moviereleasename) {
put("moviereleasename", moviereleasename);
}
public void setMovieAka(String movieaka) {
put("movieaka", movieaka);
}
public void setSubAuthorComment(String subauthorcomment) {
put("subauthorcomment", subauthorcomment);
}
}
public static final class SubFile extends HashMap<String, Object> {
public void setSubHash(String subhash) {
put("subhash", subhash);
}
public void setSubFileName(String subfilename) {
put("subfilename", subfilename);
}
public void setMovieHash(String moviehash) {
put("moviehash", moviehash);
}
public void setMovieByteSize(long moviebytesize) {
put("moviebytesize", Long.toString(moviebytesize));
}
public void setMovieFileName(String moviefilename) {
put("moviefilename", moviefilename);
}
public void setSubContent(byte[] data) {
put("subcontent", encodeData(data));
}
public void setMovieTimeMS(String movietimems) {
if (movietimems.length() > 0) {
put("movietimems", movietimems);
}
}
public void setMovieFPS(String moviefps) {
if (moviefps.length() > 0) {
put("moviefps", moviefps);
}
}
public void setMovieFrames(String movieframes) {
if (movieframes.length() > 0) {
put("movieframes", movieframes);
@ -495,30 +455,25 @@ public class OpenSubtitlesXmlRpc {
}
public static final class TryUploadResponse {
private final boolean uploadRequired;
private final List<Map<String, String>> subtitleData;
private TryUploadResponse(boolean uploadRequired, List<Map<String, String>> subtitleData) {
this.uploadRequired = uploadRequired;
this.subtitleData = subtitleData;
}
public boolean isUploadRequired() {
return uploadRequired;
}
public List<Map<String, String>> getSubtitleData() {
return subtitleData;
}
@Override
public String toString() {
return String.format("TryUploadResponse: %s => %s", uploadRequired, subtitleData);

31
source/net/sourceforge/filebot/web/VideoHashSubtitleService.java
View File

@ -1,29 +1,42 @@
package net.sourceforge.filebot.web;
import java.io.File;
import java.net.URI;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.swing.Icon;
public interface VideoHashSubtitleService {
public Map<File, List<SubtitleDescriptor>> getSubtitleList(File[] videoFiles, String languageName) throws Exception;
public boolean publishSubtitle(int imdbid, String languageName, File[] videoFile, File[] subtitleFile) throws Exception;
public String getName();
public URI getLink();
public Icon getIcon();
public CheckResult checkSubtitle(File videoFile, File subtitleFile) throws Exception;
public void uploadSubtitle(Object identity, Locale locale, File videoFile, File subtitleFile) throws Exception;
public static class CheckResult {
public final boolean exists;
public final Object identity;
public final Locale language;
public CheckResult(boolean exists, Object identity, Locale language) {
this.exists = exists;
this.identity = identity;
this.language = language;
}
@Override
public String toString() {
return String.format("%s [%s] => %s", identity, language, exists);
}
}
}

11
source/net/sourceforge/tuned/Timer.java
View File

@ -1,7 +1,5 @@
package net.sourceforge.tuned;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
@ -9,7 +7,6 @@ import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
public abstract class Timer implements Runnable {
private final ThreadFactory threadFactory = new DefaultThreadFactory("Timer", Thread.NORM_PRIORITY, true);
@ -18,7 +15,6 @@ public abstract class Timer implements Runnable {
private ScheduledFuture<?> scheduledFuture;
private Thread shutdownHook;
public synchronized void set(long delay, TimeUnit unit, boolean runBeforeShutdown) {
// create executor if necessary
if (executor == null) {
@ -65,18 +61,16 @@ public abstract class Timer implements Runnable {
scheduledFuture = executor.schedule(runnable, delay, unit);
}
public synchronized void cancel() {
removeShutdownHook();
// stop executor
if (executor != null) {
executor.shutdownNow();
}
scheduledFuture = null;
executor = null;
}
private synchronized void addShutdownHook() {
if (shutdownHook == null) {
shutdownHook = new Thread(this);
@ -84,7 +78,6 @@ public abstract class Timer implements Runnable {
}
}
private synchronized void removeShutdownHook() {
if (shutdownHook != null) {
try {

34
source/net/sourceforge/tuned/ui/TunedUtilities.java
View File

@ -1,7 +1,5 @@
package net.sourceforge.tuned.ui;
import static java.util.Collections.*;
import static javax.swing.JOptionPane.*;
@ -39,19 +37,16 @@ import javax.swing.plaf.basic.BasicTableUI;
import javax.swing.text.JTextComponent;
import javax.swing.undo.UndoManager;
public final class TunedUtilities {
public static final Color TRANSLUCENT = new Color(255, 255, 255, 0);
public static void checkEventDispatchThread() {
if (!SwingUtilities.isEventDispatchThread()) {
throw new IllegalStateException("Method must be accessed from the Swing Event Dispatch Thread, but was called on Thread \"" + Thread.currentThread().getName() + "\"");
}
}
public static Color interpolateHSB(Color c1, Color c2, float f) {
float[] hsb1 = Color.RGBtoHSB(c1.getRed(), c1.getGreen(), c1.getBlue(), null);
float[] hsb2 = Color.RGBtoHSB(c2.getRed(), c2.getGreen(), c2.getBlue(), null);
@ -64,7 +59,6 @@ public final class TunedUtilities {
return Color.getHSBColor(hsb[0], hsb[1], hsb[2]);
}
public static String escapeHTML(String s) {
char[] sc = new char[] { '&', '<', '>', '"', '\'' };
for (char c : sc) {
@ -73,22 +67,18 @@ public final class TunedUtilities {
return s;
}
public static Color derive(Color color, float alpha) {
return new Color(((int) ((alpha * 255)) << 24) | (color.getRGB() & 0x00FFFFFF), true);
}
public static boolean isShiftOrAltDown(ActionEvent evt) {
return checkModifiers(evt.getModifiers(), ActionEvent.SHIFT_MASK) || checkModifiers(evt.getModifiers(), ActionEvent.ALT_MASK);
}
public static boolean checkModifiers(int modifiers, int mask) {
return ((modifiers & mask) == mask);
}
public static JButton createImageButton(Action action) {
JButton button = new JButton(action);
button.setHideActionText(true);
@ -97,7 +87,6 @@ public final class TunedUtilities {
return button;
}
public static void installAction(JComponent component, KeyStroke keystroke, Action action) {
Object key = action.getValue(Action.NAME);
@ -108,7 +97,6 @@ public final class TunedUtilities {
component.getActionMap().put(key, action);
}
public static UndoManager installUndoSupport(JTextComponent component) {
final UndoManager undoSupport = new UndoManager();
@ -138,12 +126,10 @@ public final class TunedUtilities {
return undoSupport;
}
public static boolean isMaximized(Frame frame) {
return (frame.getExtendedState() & Frame.MAXIMIZED_BOTH) != 0;
}
public static List<String> showMultiValueInputDialog(final String text, final String initialValue, final String title, final Component parent) throws InvocationTargetException, InterruptedException {
String input = showInputDialog(text, initialValue, title, parent);
if (input == null || input.isEmpty()) {
@ -168,25 +154,28 @@ public final class TunedUtilities {
return singletonList(input);
}
public static String showInputDialog(final String text, final String initialValue, final String title, final Component parent) throws InvocationTargetException, InterruptedException {
final StringBuilder buffer = new StringBuilder();
SwingUtilities.invokeAndWait(new Runnable() {
Runnable runnable = new Runnable() {
@Override
public void run() {
Object value = JOptionPane.showInputDialog(parent, text, title, PLAIN_MESSAGE, null, null, initialValue);
if (value != null) {
buffer.append(value);
}
}
});
};
if (SwingUtilities.isEventDispatchThread()) {
runnable.run();
} else {
SwingUtilities.invokeAndWait(runnable);
}
return buffer.length() == 0 ? null : buffer.toString();
}
public static Window getWindow(Object component) {
if (component instanceof Window)
return (Window) component;
@ -197,7 +186,6 @@ public final class TunedUtilities {
return null;
}
public static Point getOffsetLocation(Window owner) {
if (owner == null) {
Window[] toplevel = Window.getOwnerlessWindows();
@ -215,7 +203,6 @@ public final class TunedUtilities {
return new Point(p.x + d.width / 4, p.y + d.height / 7);
}
public static Image getImage(Icon icon) {
if (icon == null)
return null;
@ -233,12 +220,10 @@ public final class TunedUtilities {
return image;
}
public static Dimension getDimension(Icon icon) {
return new Dimension(icon.getIconWidth(), icon.getIconHeight());
}
public static Timer invokeLater(int delay, final Runnable runnable) {
Timer timer = new Timer(delay, new ActionListener() {
@ -254,7 +239,6 @@ public final class TunedUtilities {
return timer;
}
/**
* When trying to drag a row of a multi-select JTable, it will start selecting rows instead of initiating a drag. This TableUI will give the JTable proper dnd behaviour.
*/
@ -265,7 +249,6 @@ public final class TunedUtilities {
return new DragDropRowMouseInputHandler();
}
protected class DragDropRowMouseInputHandler extends MouseInputHandler {
@Override
@ -280,7 +263,6 @@ public final class TunedUtilities {
}
}
/**
* Dummy constructor to prevent instantiation.
*/