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

* fix problems with files not being cleared after rename/copy via native integration

This commit is contained in:
Reinhard Pointner 2012-08-13 05:58:27 +00:00
parent 19240e3a6f
commit 2834fa76d5
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/net/sourceforge/filebot/ui/rename/RenameAction.java
View File

@ -6,6 +6,7 @@ import static java.util.Collections.*;
import static net.sourceforge.filebot.Settings.*; import static net.sourceforge.filebot.Settings.*;
import static net.sourceforge.filebot.ui.NotificationLogging.*; import static net.sourceforge.filebot.ui.NotificationLogging.*;
import static net.sourceforge.tuned.ExceptionUtilities.*; import static net.sourceforge.tuned.ExceptionUtilities.*;
import static net.sourceforge.tuned.FileUtilities.*;
import static net.sourceforge.tuned.ui.TunedUtilities.*; import static net.sourceforge.tuned.ui.TunedUtilities.*;
import java.awt.Cursor; import java.awt.Cursor;
@ -24,10 +25,12 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Semaphore; import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.AbstractAction; import javax.swing.AbstractAction;
import javax.swing.Icon; import javax.swing.Icon;
@ -65,12 +68,12 @@ class RenameAction extends AbstractAction {
@Override @Override
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
Window window = getWindow(evt.getSource());
try {
if (model.getRenameMap().isEmpty()) { if (model.getRenameMap().isEmpty()) {
return; return;
} }
Window window = getWindow(evt.getSource());
try {
Map<File, File> renameMap = checkRenamePlan(validate(model.getRenameMap(), window)); Map<File, File> renameMap = checkRenamePlan(validate(model.getRenameMap(), window));
StandardRenameAction action = (StandardRenameAction) getValue(RENAME_ACTION); StandardRenameAction action = (StandardRenameAction) getValue(RENAME_ACTION);
@ -103,8 +106,9 @@ class RenameAction extends AbstractAction {
dialog.setVisible(true); dialog.setVisible(true);
} }
} }
} catch (ExecutionException e) {
// ignore, handled in rename worker
} catch (Throwable e) { } catch (Throwable e) {
// could not rename one of the files, revert all changes
UILogger.log(Level.WARNING, e.getMessage(), e); UILogger.log(Level.WARNING, e.getMessage(), e);
} }
@ -273,7 +277,11 @@ class RenameAction extends AbstractAction {
postprocess.acquire(); postprocess.acquire();
this.get(); // grab exception if any this.get(); // grab exception if any
} catch (Exception e) { } catch (Exception e) {
if (!isCancelled()) {
UILogger.log(Level.SEVERE, String.format("%s: %s", getRootCause(e).getClass().getSimpleName(), getRootCauseMessage(e)), e); UILogger.log(Level.SEVERE, String.format("%s: %s", getRootCause(e).getClass().getSimpleName(), getRootCauseMessage(e)), e);
} else {
Logger.getLogger(RenameAction.class.getName()).log(Level.SEVERE, e.getMessage(), e);
}
} }
// collect renamed types // collect renamed types
@ -329,7 +337,7 @@ class RenameAction extends AbstractAction {
} finally { } finally {
// check status of renamed files // check status of renamed files
for (Entry<File, File> it : renameMap.entrySet()) { for (Entry<File, File> it : renameMap.entrySet()) {
if (it.getValue().exists()) { if (resolveDestination(it.getKey(), it.getValue(), false).exists()) {
renameLog.put(it.getKey(), it.getValue()); renameLog.put(it.getKey(), it.getValue());
} }
} }