make write limit more responsive, bump tika to 2.8.0

tballison · Jun 16, 2023 · a3e4f8e · a3e4f8e
1 parent 4d2a57d
commit a3e4f8e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -52,7 +52,7 @@
       <dependency>
         <groupId>org.apache.tika</groupId>
         <artifactId>tika-core</artifactId>
-        <version>2.7.0</version>
+        <version>28.0</version>
       </dependency>
       <dependency>
         <groupId>commons-io</groupId>

diff --git a/tika-gui-app/src/main/java/org/tallison/tika/app/fx/AdvancedBatchController.java b/tika-gui-app/src/main/java/org/tallison/tika/app/fx/AdvancedBatchController.java
@@ -88,22 +88,14 @@ public void initialize(URL fxmlFileLocation, ResourceBundle resources) {
         if (batchProcessConfig.getWriteLimit() > -1) {
             writeLimit.setText(Long.toString(batchProcessConfig.getWriteLimit()));
         }
+        writeLimit.focusedProperty().addListener((ov, oldV, newV) -> {
+            if (! newV) {
+                setWriteLimit();
+            }
+        });
     }
 
-
-    public void showConfig(MouseEvent mouseEvent) {
-        //NO-OP for now
-    }
-
-    public void configureParsers(ActionEvent actionEvent) {
-        //NO-OP for now
-    }
-
-    public void configurePipesIterator(ActionEvent actionEvent) {
-        //NO-OP for now
-    }
-
-    public void setWriteLimit(ActionEvent actionEvent) {
+    public void setWriteLimit() {
         long writeLimitVal = -1l;
         if (! StringUtils.isBlank(writeLimit.getText())) {
             try {
@@ -116,13 +108,11 @@ public void setWriteLimit(ActionEvent actionEvent) {
                 alert("Value needs to be a number", "Not a number",
                         ">" + writeLimit.getText() + "< is not parseable as number");
                 writeLimit.setText("");
-                actionEvent.consume();
                 return;
             } catch (ArithmeticException e) {
                 alert("Value out of range", "Value out of range",
                         "\"" + writeLimit.getText() +
                                 "\" must be less than 9,223,372,036,854,775,807");
-                actionEvent.consume();
                 return;
             }
         }

diff --git a/tika-gui-app/src/main/java/org/tallison/tika/app/fx/config/TikaConfigWriter.java b/tika-gui-app/src/main/java/org/tallison/tika/app/fx/config/TikaConfigWriter.java
@@ -355,7 +355,8 @@ private void appendFSPipesIterator(BatchProcessConfig batchProcessConfig,
         writer.appendTextElement(params, "emitterName", "emitter");
         writer.appendTextElement(params, "basePath", pipesIterator.getAttributes().get(BASE_PATH));
         writer.appendTextElement(params, "countTotal", "true");
-        if (batchProcessConfig.getWriteLimit() > 0) {
+
+        if (batchProcessConfig.getWriteLimit() >= 0) {
             writer.appendTextElement(params, "writeLimit", Long.toString(batchProcessConfig.getWriteLimit()));
         }
     }