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

Use Wait Cursor when loading/filtering files (can take a while because of listing files or because of loading Groovy classes)

This commit is contained in:
Reinhard Pointner 2016-10-14 01:07:13 +08:00
parent 40f19f22b1
commit 372bbcd5be
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
source/net/filebot/ui/rename/RenamePanel.java
View File

@ -739,36 +739,40 @@ public class RenamePanel extends JComponent {
@Override
public void actionPerformed(ActionEvent evt) {
Window window = getWindow(RenamePanel.this);
try {
window.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
window.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
if (preset.getFormat() != null) {
switch (FormatDialog.Mode.getMode(preset.getDatasource())) {
case Episode:
renameModel.useFormatter(Episode.class, new ExpressionFormatter(preset.getFormat().getExpression(), EpisodeFormat.SeasonEpisode, Episode.class));
break;
case Movie:
renameModel.useFormatter(Movie.class, new ExpressionFormatter(preset.getFormat().getExpression(), MovieFormat.NameYear, Movie.class));
break;
case Music:
renameModel.useFormatter(AudioTrack.class, new ExpressionFormatter(preset.getFormat().getExpression(), new AudioTrackFormat(), AudioTrack.class));
break;
case File:
renameModel.useFormatter(File.class, new ExpressionFormatter(preset.getFormat().getExpression(), new FileNameFormat(), File.class));
break;
// Swing Bug Workaround: heavy-weight popup window blocks parent window from being updated (i.e. set wait cursor) unless we wait a little bit until the popup window is destroyed
invokeLater(200, () -> {
try {
if (preset.getFormat() != null) {
switch (FormatDialog.Mode.getMode(preset.getDatasource())) {
case Episode:
renameModel.useFormatter(Episode.class, new ExpressionFormatter(preset.getFormat().getExpression(), EpisodeFormat.SeasonEpisode, Episode.class));
break;
case Movie:
renameModel.useFormatter(Movie.class, new ExpressionFormatter(preset.getFormat().getExpression(), MovieFormat.NameYear, Movie.class));
break;
case Music:
renameModel.useFormatter(AudioTrack.class, new ExpressionFormatter(preset.getFormat().getExpression(), new AudioTrackFormat(), AudioTrack.class));
break;
case File:
renameModel.useFormatter(File.class, new ExpressionFormatter(preset.getFormat().getExpression(), new FileNameFormat(), File.class));
break;
}
}
}
if (preset.getRenameAction() != null) {
new SetRenameAction(preset.getRenameAction()).actionPerformed(evt);
}
if (preset.getRenameAction() != null) {
new SetRenameAction(preset.getRenameAction()).actionPerformed(evt);
}
super.actionPerformed(evt);
} catch (Exception e) {
log.info(e.getMessage());
} finally {
window.setCursor(Cursor.getDefaultCursor());
}
super.actionPerformed(evt);
} catch (Exception e) {
log.log(Level.INFO, e, e::getMessage);
} finally {
System.out.println("RenamePanel.ApplyPresetAction.actionPerformed()");
window.setCursor(Cursor.getDefaultCursor());
}
});
}
}

2
source/net/filebot/util/ui/SwingUI.java
View File

@ -283,7 +283,7 @@ public final class SwingUI {
return new Dimension(icon.getIconWidth(), icon.getIconHeight());
}
public static Timer invokeLater(int delay, final Runnable runnable) {
public static Timer invokeLater(int delay, Runnable runnable) {
Timer timer = new Timer(delay, (evt) -> {
runnable.run();
});