From b4e9e67f6c19f0418419768a5c57e4ef9446533e Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Tue, 10 Jan 2017 00:45:12 +0800 Subject: [PATCH] Allow only one binding preview evaluator thread to make sure we don't hit online resources more than once (i.e. 2 threads requesting the same data at the same time) --- source/net/filebot/ui/rename/BindingDialog.java | 2 +- source/net/filebot/ui/rename/FormatDialog.java | 3 +-- source/net/filebot/ui/rename/FormatDialog.properties | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/source/net/filebot/ui/rename/BindingDialog.java b/source/net/filebot/ui/rename/BindingDialog.java index 2dc45135..d857d72a 100644 --- a/source/net/filebot/ui/rename/BindingDialog.java +++ b/source/net/filebot/ui/rename/BindingDialog.java @@ -356,7 +356,7 @@ class BindingDialog extends JDialog { private final List model = new ArrayList(); - private final ExecutorService executor = Executors.newFixedThreadPool(2, new DefaultThreadFactory("Evaluator", Thread.MIN_PRIORITY)); + private final ExecutorService executor = Executors.newFixedThreadPool(1, new DefaultThreadFactory("Evaluator", Thread.MIN_PRIORITY)); public void setModel(Collection expressions, Object bindingBean) { // cancel old workers and clear model diff --git a/source/net/filebot/ui/rename/FormatDialog.java b/source/net/filebot/ui/rename/FormatDialog.java index 3568cc6d..b95827f9 100644 --- a/source/net/filebot/ui/rename/FormatDialog.java +++ b/source/net/filebot/ui/rename/FormatDialog.java @@ -72,7 +72,6 @@ import net.filebot.util.ui.GradientStyle; import net.filebot.util.ui.LazyDocumentListener; import net.filebot.util.ui.LinkButton; import net.filebot.util.ui.ProgressIndicator; -import net.filebot.util.ui.SwingUI; import net.filebot.util.ui.notification.SeparatorBorder; import net.filebot.util.ui.notification.SeparatorBorder.Position; import net.filebot.web.AudioTrackFormat; @@ -443,7 +442,7 @@ public class FormatDialog extends JDialog { ExpressionFormat format = new ExpressionFormat(editor.getText().trim()); // activate delayed to avoid flickering when formatting takes only a couple of milliseconds - Timer progressIndicatorTimer = SwingUI.invokeLater(400, () -> progressIndicator.setVisible(true)); + Timer progressIndicatorTimer = invokeLater(400, () -> progressIndicator.setVisible(true)); // cancel old worker later Future obsoletePreviewFuture = currentPreviewFuture; diff --git a/source/net/filebot/ui/rename/FormatDialog.properties b/source/net/filebot/ui/rename/FormatDialog.properties index 616663ab..ee028200 100644 --- a/source/net/filebot/ui/rename/FormatDialog.properties +++ b/source/net/filebot/ui/rename/FormatDialog.properties @@ -39,7 +39,7 @@ movie.example[5]: {home}/Media/{plex} music.example[0]: {artist} - {t} # simple artist - album - title music.example[1]: {[y]} {artist} - {t} -# artist - title [crc32] +# artist - title [48.0 kHz] music.example[2]: {n} - {t} {[audio.SamplingRateString]} # artist - title [2ch, 128000] music.example[3]: {pi.pad(2)} {n} - {t} {[af, audio.BitRate]}