moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-03-10 06:20:27 -04:00
Code Issues Releases Wiki Activity

Refactor warning messages

Browse Source
This commit is contained in:
Reinhard Pointner 2017-02-01 16:10:01 +08:00
parent ae8f7e0846
commit 343f6de4db
5 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/net/filebot/Logging.java
View File

@ -1,6 +1,7 @@
package net.filebot; package net.filebot;
import static java.nio.channels.Channels.*; import static java.nio.channels.Channels.*;
import static net.filebot.util.ExceptionUtilities.*;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@ -95,6 +96,15 @@ public final class Logging {
}; };
} }
public static Supplier<String> cause(Throwable t) {
return () -> {
StringBuilder s = new StringBuilder();
s.append(t.getClass().getSimpleName()).append(": ");
s.append(t.getMessage());
return s.toString();
};
}
public static class ConsoleFormatter extends Formatter { public static class ConsoleFormatter extends Formatter {
private final Pattern anonymize; private final Pattern anonymize;

2
source/net/filebot/cli/ScriptShellBaseClass.java
View File

@ -153,7 +153,7 @@ public abstract class ScriptShellBaseClass extends Script {
if (severe) { if (severe) {
log.log(Level.SEVERE, trace(t)); log.log(Level.SEVERE, trace(t));
} else { } else {
log.log(Level.WARNING, format("%s: %s", t.getClass().getSimpleName(), t.getMessage())); log.log(Level.WARNING, cause(t));
} }
} }

2
source/net/filebot/ui/rename/RenameAction.java
View File

@ -93,7 +93,7 @@ class RenameAction extends AbstractAction {
} catch (CancellationException e) { } catch (CancellationException e) {
debug.finest(e::toString); debug.finest(e::toString);
} catch (Throwable e) { } catch (Throwable e) {
log.log(Level.SEVERE, String.format("%s: %s", getRootCause(e).getClass().getSimpleName(), getRootCauseMessage(e)), e); log.log(Level.SEVERE, e, cause(getRootCause(e)));
} }
// abort if nothing happened // abort if nothing happened

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

@ -643,7 +643,7 @@ public class RenamePanel extends JComponent {
// show and block // show and block
dialog.setVisible(true); dialog.setVisible(true);
} catch (Exception e) { } catch (Exception e) {
log.log(Level.WARNING, String.format("%s: %s", getRootCause(e).getClass().getSimpleName(), getRootCauseMessage(e)), e); log.log(Level.WARNING, e, cause(getRootCause(e)));
} }
}); });
@ -917,10 +917,7 @@ public class RenamePanel extends JComponent {
} }
// generic error message // generic error message
if (findCause(e, CancellationException.class) == null) { log.log(Level.WARNING, e, cause(getRootCause(e)));
log.log(Level.WARNING, String.format("%s: %s", getRootCause(e).getClass().getSimpleName(), getRootCauseMessage(e)), e);
return;
}
} finally { } finally {
// auto-match finished // auto-match finished
namesList.firePropertyChange(LOADING_PROPERTY, true, false); namesList.firePropertyChange(LOADING_PROPERTY, true, false);

6
source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java
View File

@ -173,10 +173,7 @@ class SubtitleAutoMatchDialog extends JDialog {
component.setBorder(BorderFactory.createEmptyBorder()); component.setBorder(BorderFactory.createEmptyBorder());
component.setVisible(false); component.setVisible(false);
service.addPropertyChangeListener(new PropertyChangeListener() { service.addPropertyChangeListener(evt -> {
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (service.getState() == StateValue.STARTED) { if (service.getState() == StateValue.STARTED) {
component.setIcon(ResourceManager.getIcon("database.go")); component.setIcon(ResourceManager.getIcon("database.go"));
} else { } else {
@ -187,7 +184,6 @@ class SubtitleAutoMatchDialog extends JDialog {
component.setToolTipText(String.format("%s: %s", service.getName(), service.getError() == null ? service.getState().toString().toLowerCase() : service.getError().getMessage())); component.setToolTipText(String.format("%s: %s", service.getName(), service.getError() == null ? service.getState().toString().toLowerCase() : service.getError().getMessage()));
servicePanel.setVisible(true); servicePanel.setVisible(true);
servicePanel.getParent().revalidate(); servicePanel.getParent().revalidate();
}
}); });
services.add(service); services.add(service);