diff --git a/tika-gui-app/pom.xml b/tika-gui-app/pom.xml index 20b2a6e..ae75c2b 100644 --- a/tika-gui-app/pom.xml +++ b/tika-gui-app/pom.xml @@ -193,16 +193,16 @@ download-maven-plugin - tika-async-cli-3.0.0-20230916.113230-19 + tika-async-cli-3.0.0-20230929.180046-41 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-async-cli/3.0.0-SNAPSHOT/tika-async-cli-3.0.0-20230916.113230-19.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-async-cli/3.0.0-SNAPSHOT/tika-async-cli-3.0.0-20230929.180046-41.jar false ${project.build.directory}/lib/tika-core - 2162c7e9a3f4a93c0c5566323ad65cf7 + 8f23c6be86dc762e03c38a6e764b4a68 @@ -219,39 +219,39 @@ - tika-fetcher-s3-3.0.0-20230916.113250-19 + tika-fetcher-s3-3.0.0-20230929.180046-41 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-fetcher-s3/3.0.0-SNAPSHOT/tika-fetcher-s3-3.0.0-20230916.113250-19.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-fetcher-s3/3.0.0-SNAPSHOT/tika-fetcher-s3-3.0.0-20230929.180046-41.jar false ${project.build.directory}/lib/tika-fetcher-s3 - 902ba0eba30eb70f16603359285ec796 + adecfb8a8b09eefd453ab8a8b63fa15c - tika-parser-sqlite3-package-3.0.0-20230916.113313-19 + tika-parser-sqlite3-package-3.0.0-20230929.180046-41 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-parser-sqlite3-package/3.0.0-SNAPSHOT/tika-parser-sqlite3-package-3.0.0-20230916.113313-19.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-parser-sqlite3-package/3.0.0-SNAPSHOT/tika-parser-sqlite3-package-3.0.0-20230929.180046-41.jar false ${project.build.directory}/lib/tika-app 30c2565c8e051cb30da52f3d778e1078 - tika-pipes-reporter-fs-status-3.0.0-20230916.113325-19 + tika-pipes-reporter-fs-status-3.0.0-20230929.180046-41 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-reporter-fs-status/3.0.0-SNAPSHOT/tika-pipes-reporter-fs-status-3.0.0-20230916.113325-19.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-reporter-fs-status/3.0.0-SNAPSHOT/tika-pipes-reporter-fs-status-3.0.0-20230929.180046-41.jar false ${project.build.directory}/lib/tika-core 874b8819dec38cdd83a2258f195a1856 @@ -271,133 +271,133 @@ - tika-emitter-fs-3.0.0-20230916.113236-19 + tika-emitter-fs-3.0.0-20230929.180046-41 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-fs/3.0.0-SNAPSHOT/tika-emitter-fs-3.0.0-20230916.113236-19.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-fs/3.0.0-SNAPSHOT/tika-emitter-fs-3.0.0-20230929.180046-41.jar false ${project.build.directory}/lib/tika-emitter-fs 4ddc6102f326ef4905b8ec297f6930d7 - tika-emitter-jdbc-3.0.0-20230916.113239-19 + tika-emitter-jdbc-3.0.0-20230929.180046-41 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-jdbc/3.0.0-SNAPSHOT/tika-emitter-jdbc-3.0.0-20230916.113239-19.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-jdbc/3.0.0-SNAPSHOT/tika-emitter-jdbc-3.0.0-20230929.180046-41.jar false ${project.build.directory}/lib/tika-emitter-jdbc aef47a06adb481e5ed922695fe94ad3b - tika-pipes-reporter-jdbc-3.0.0-20230916.113326-19 + tika-pipes-reporter-jdbc-3.0.0-20230929.180046-41 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-reporter-jdbc/3.0.0-SNAPSHOT/tika-pipes-reporter-jdbc-3.0.0-20230916.113326-19.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-reporter-jdbc/3.0.0-SNAPSHOT/tika-pipes-reporter-jdbc-3.0.0-20230929.180046-41.jar false ${project.build.directory}/lib/tika-core f4e80ec1445287e000d2ad22a440764a - tika-eval-core-3.0.0-20230916.113245-19 + tika-eval-core-3.0.0-20230929.080223-40 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-eval-core/3.0.0-SNAPSHOT/tika-eval-core-3.0.0-20230916.113245-19.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-eval-core/3.0.0-SNAPSHOT/tika-eval-core-3.0.0-20230929.080223-40.jar false ${project.build.directory}/lib/tika-extras - a224e425b7bbc0f8e8d959e97734676b + 184c0ad313682f0fdbcb4513a85b52fa - tika-pipes-iterator-s3-3.0.0-20230916.113323-19 + tika-pipes-iterator-s3-3.0.0-20230929.180046-41 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-iterator-s3/3.0.0-SNAPSHOT/tika-pipes-iterator-s3-3.0.0-20230916.113323-19.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-iterator-s3/3.0.0-SNAPSHOT/tika-pipes-iterator-s3-3.0.0-20230929.180046-41.jar false ${project.build.directory}/lib/tika-pipes-iterator-s3 - 7ece173d822a4e639b7de850c1b8ff0a + 739fde29a4ce47baf52d5d5db6e9e223 - tika-serialization-3.0.0-20230916.113329-20 + tika-serialization-3.0.0-20230929.180046-42 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-serialization/3.0.0-SNAPSHOT/tika-serialization-3.0.0-20230916.113329-20.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-serialization/3.0.0-SNAPSHOT/tika-serialization-3.0.0-20230929.180046-42.jar false ${project.build.directory}/lib/tika-core 98384bcac2c450b613c6ffde5cbe43dd - tika-detector-siegfried-3.0.0-20230916.113234-19 + tika-detector-siegfried-3.0.0-20230929.080217-40 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-detector-siegfried/3.0.0-SNAPSHOT/tika-detector-siegfried-3.0.0-20230916.113234-19.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-detector-siegfried/3.0.0-SNAPSHOT/tika-detector-siegfried-3.0.0-20230929.080217-40.jar false ${project.build.directory}/lib/tika-extras 945a1fae320b3a89a1062701dc6c354b - tika-emitter-opensearch-3.0.0-20230916.113240-19 + tika-emitter-opensearch-3.0.0-20230929.180046-41 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-opensearch/3.0.0-SNAPSHOT/tika-emitter-opensearch-3.0.0-20230916.113240-19.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-opensearch/3.0.0-SNAPSHOT/tika-emitter-opensearch-3.0.0-20230929.180046-41.jar false ${project.build.directory}/lib/tika-emitter-opensearch 94920de26db8c229ee1dc4145d7b6df4 - tika-emitter-s3-3.0.0-20230916.113241-19 + tika-emitter-s3-3.0.0-20230929.180046-41 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-s3/3.0.0-SNAPSHOT/tika-emitter-s3-3.0.0-20230916.113241-19.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-s3/3.0.0-SNAPSHOT/tika-emitter-s3-3.0.0-20230929.180046-41.jar false ${project.build.directory}/lib/tika-emitter-s3 - d69e1cfef10e12626aad209efcb97691 + 68559a84f11bc599ee1b1a88cab841d8 - tika-app-3.0.0-20230916.113228-19 + tika-app-3.0.0-20230929.180046-41 prepare-package wget - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-app/3.0.0-SNAPSHOT/tika-app-3.0.0-20230916.113228-19.jar + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-app/3.0.0-SNAPSHOT/tika-app-3.0.0-20230929.180046-41.jar false ${project.build.directory}/lib/tika-app - 4af4bb225cdb80782aee65f1edee7000 + c8585b454722d835f885c0ef80bbd116 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 index ec447c7..80d7d44 100644 --- 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 @@ -24,6 +24,7 @@ import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.fxml.Initializable; +import javafx.scene.control.CheckBox; import javafx.scene.control.ComboBox; import javafx.scene.control.TextField; import org.apache.logging.log4j.LogManager; @@ -64,6 +65,9 @@ public class AdvancedBatchController extends ControllerBase implements Initializ @FXML private TextField writeLimit; + @FXML + private CheckBox throwOnWriteLimitReached; + @Override public void initialize(URL fxmlFileLocation, ResourceBundle resources) { @@ -87,11 +91,17 @@ public void initialize(URL fxmlFileLocation, ResourceBundle resources) { if (batchProcessConfig.getWriteLimit() > -1) { writeLimit.setText(Long.toString(batchProcessConfig.getWriteLimit())); } + //add a listener so that we can validate input + //when the user enters it writeLimit.focusedProperty().addListener((ov, oldV, newV) -> { if (! newV) { setWriteLimit(); } }); + + if (batchProcessConfig.isThrowOnWriteLimitReached()) { + throwOnWriteLimitReached.setSelected(true); + } } public void setWriteLimit() { @@ -164,6 +174,8 @@ public void saveState() { bpc.getEmitWithinMs()); bpc.setEmitWithinMs(emitWithin); + bpc.setThrowOnWriteLimitReached(throwOnWriteLimitReached.isSelected()); + APP_CONTEXT.saveState(); } diff --git a/tika-gui-app/src/main/java/org/tallison/tika/app/fx/batch/BatchProcessConfig.java b/tika-gui-app/src/main/java/org/tallison/tika/app/fx/batch/BatchProcessConfig.java index 7f15377..636de5b 100644 --- a/tika-gui-app/src/main/java/org/tallison/tika/app/fx/batch/BatchProcessConfig.java +++ b/tika-gui-app/src/main/java/org/tallison/tika/app/fx/batch/BatchProcessConfig.java @@ -61,6 +61,8 @@ public class BatchProcessConfig { private long writeLimit = -1; + private boolean throwOnWriteLimitReached = false; + public Optional getPipesIterator() { return pipesIterator; } @@ -211,6 +213,14 @@ public void setWriteLimit(long writeLimit) { this.writeLimit = writeLimit; } + public void setThrowOnWriteLimitReached(boolean throwOnWriteLimitReached) { + this.throwOnWriteLimitReached = throwOnWriteLimitReached; + } + + public boolean isThrowOnWriteLimitReached() { + return throwOnWriteLimitReached; + } + public void setParserConfig(ParserConfig parserConfig) { this.parserConfig = parserConfig; } 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 index bca599d..938a6e0 100644 --- 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 @@ -358,6 +358,8 @@ private void appendFSPipesIterator(BatchProcessConfig batchProcessConfig, if (batchProcessConfig.getWriteLimit() >= 0) { writer.appendTextElement(params, "writeLimit", Long.toString(batchProcessConfig.getWriteLimit())); + writer.appendTextElement(params, "throwOnWriteLimitReached", + Boolean.toString(batchProcessConfig.isThrowOnWriteLimitReached())); } } diff --git a/tika-gui-app/src/main/resources/org/tallison/tika/app/fx/batch-advanced-view.fxml b/tika-gui-app/src/main/resources/org/tallison/tika/app/fx/batch-advanced-view.fxml index 8c430bc..623b200 100644 --- a/tika-gui-app/src/main/resources/org/tallison/tika/app/fx/batch-advanced-view.fxml +++ b/tika-gui-app/src/main/resources/org/tallison/tika/app/fx/batch-advanced-view.fxml @@ -1,4 +1,5 @@ + + + @@ -35,12 +38,12 @@ - + - + @@ -59,6 +62,7 @@