From c59619da2d6798f58b2dff128e20b98f412fee63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20T=C3=A2che?= Date: Sun, 22 Sep 2024 21:59:10 +0200 Subject: [PATCH] Rework to avoid using preferences object to retrieve options --- .idea/.gitignore | 8 - .idea/codeStyles/Project.xml | 7 - .idea/codeStyles/codeStyleConfig.xml | 5 - .idea/csv-editor.xml | 282 +++++++++++ .idea/inspectionProfiles/Project_Default.xml | 201 +++++++- .idea/misc.xml | 4 +- .idea/scala_compiler.xml | 6 - .idea/sonarlint.xml | 11 - .idea/vcs.xml | 2 +- .idea/workspace.xml | 462 ++++++++++++++++++ .../com/github/gtache/autosubtitle/File.java | 1 + .../github/gtache/autosubtitle/Language.java | 2 +- .../gtache/autosubtitle/VideoConverter.java | 13 +- .../gtache/autosubtitle/archive/Archiver.java | 3 +- .../autosubtitle/process/ProcessListener.java | 3 +- .../autosubtitle/setup/SetupManager.java | 6 +- .../autosubtitle/subtitle/ExportOptions.java | 19 + .../autosubtitle/subtitle/ImportOptions.java | 14 + .../subtitle/SubtitleImporterExporter.java | 18 +- .../subtitle/converter/FormatException.java | 19 + .../subtitle/converter/FormatOptions.java | 20 + .../subtitle/converter/ParseOptions.java | 24 + .../subtitle/converter/SubtitleConverter.java | 18 +- .../converter/SubtitleConverterProvider.java | 12 + .../subtitle/extractor/ExtractOptions.java | 25 + .../subtitle/extractor/ExtractionModel.java | 1 + .../subtitle/extractor/SubtitleExtractor.java | 39 +- .../TestSubtitleImporterExporter.java | 18 +- .../converter/TestSubtitleConverter.java | 26 +- .../TestSubtitleConverterProvider.java | 32 ++ .../extractor/TestSubtitleExtractor.java | 55 --- .../github/gtache/autosubtitle/cli/Cli.java | 2 +- .../client/RemoteVideoConverter.java | 21 +- .../client/RemoteVideoLoader.java | 3 +- .../client/RemoteSubtitleConverter.java | 8 +- .../client/RemoteSubtitleExtractor.java | 8 +- .../translation/client/RemoteTranslator.java | 7 +- .../setup/conda/CondaSetupManager.java | 10 +- .../setup/conda/TestCondaSetupManager.java | 10 +- ...{ZipDecompresser.java => ZipArchiver.java} | 8 +- .../modules/archive/impl/ArchiveModule.java | 4 +- .../modules/subtitle/impl/SubtitleModule.java | 2 +- .../converter/impl/ASSSubtitleConverter.java | 86 ++-- .../converter/impl/FormatOptionsImpl.java | 17 + .../converter/impl/ParseOptionsImpl.java | 21 + .../converter/impl/SRTSubtitleConverter.java | 35 +- .../extractor/impl/ExtractOptionsImpl.java | 21 + .../subtitle/impl/ExportOptionsImpl.java | 18 + .../subtitle/impl/ImportOptionsImpl.java | 15 + .../subtitle/impl/SubtitleCollectionImpl.java | 3 +- .../impl/SubtitleImporterExporterImpl.java | 40 +- ...Decompresser.java => TestZipArchiver.java} | 22 +- .../autosubtitle/impl/TestArchitecture.java | 14 +- .../impl/TestASSSubtitleConverter.java | 42 +- .../converter/impl/TestFormatOptionsImpl.java | 40 ++ .../converter/impl/TestParseOptionsImpl.java | 43 ++ .../impl/TestSRTSubtitleConverter.java | 18 +- .../impl/TestAbstractSubtitleExtractor.java | 7 +- .../impl/TestExtractOptionsImpl.java | 44 ++ .../subtitle/impl/TestExportOptionsImpl.java | 39 ++ .../subtitle/impl/TestImportOptionsImpl.java | 36 ++ .../TestSubtitleImporterExporterImpl.java | 62 ++- .../archive/ffmpeg/TarArchiver.java | 2 +- .../archive/ffmpeg/XZArchiver.java | 2 +- .../ffmpeg/FFmpegVideoConverter.java | 47 +- ffmpeg/src/main/java/module-info.java | 1 - .../ffmpeg/TestFFmpegVideoConverter.java | 95 ++-- .../setup/ffmpeg/TestFFmpegSetupManager.java | 2 +- .../gui/parameters/ParametersModel.java | 6 + .../gui/subtitles/SubtitlesModel.java | 13 - .../autosubtitle/gui/work/WorkModel.java | 37 +- .../gui/impl/CombinedResourceBundle.java | 10 +- .../gui/impl/spi/MainBundleProvider.java | 1 + .../impl/spi/ParametersBundleProvider.java | 1 + .../gui/impl/spi/SetupBundleProvider.java | 1 + .../gui/impl/spi/SubtitlesBundleProvider.java | 1 + .../gui/impl/spi/WorkBundleProvider.java | 1 + .../modules/gui/impl/GuiCoreModule.java | 6 + .../parameters/fx/FXParametersController.java | 4 +- .../gui/parameters/fx/FXParametersModel.java | 24 +- .../gui/subtitles/fx/FXSubtitlesBinder.java | 31 +- .../subtitles/fx/FXSubtitlesController.java | 12 +- .../gui/subtitles/fx/FXSubtitlesModel.java | 41 +- .../gui/work/fx/FXWorkBinder.java | 31 +- .../gui/work/fx/FXWorkController.java | 8 +- .../autosubtitle/gui/work/fx/FXWorkModel.java | 51 +- gui/fx/src/main/java/module-info.java | 1 - .../parameters/fx/TestFXParametersModel.java | 13 + .../subtitles/fx/TestFXSubtitlesBinder.java | 73 ++- .../subtitles/fx/TestFXSubtitlesModel.java | 27 +- .../gui/work/fx/TestFXWorkBinder.java | 78 ++- .../gui/work/fx/TestFXWorkModel.java | 39 +- .../TestObservableSubtitleCollectionImpl.java | 8 +- .../gui/fx/TestObservableSubtitleImpl.java | 28 +- .../gtache/autosubtitle/gui/run/Main.java | 2 +- .../modules/gui/run/RunComponent.java | 1 + pom.xml | 8 +- whisper/base/pom.xml | 4 + .../json/whisper/base/WhisperJsonModule.java | 6 +- .../base/WhisperSubtitleExtractor.java | 6 +- .../whisper/base/JSONSubtitleConverter.java | 25 +- whisper/base/src/main/java/module-info.java | 2 +- .../AbstractWhisperSubtitleExtractor.java | 36 +- whisper/common/src/main/java/module-info.java | 1 - .../TestAbstractWhisperSubtitleExtractor.java | 41 +- whisper/pom.xml | 11 - whisper/whisperx/pom.xml | 4 + .../json/whisperx/WhisperXJsonModule.java | 6 +- .../whisperx/WhisperXSubtitleExtractor.java | 6 +- .../json/whisperx/JSONSubtitleConverter.java | 58 +-- .../parser/json/whisperx/JSONSubtitles.java | 3 + .../whisperx/src/main/java/module-info.java | 2 +- .../json/whisperx/TestWhisperXJsonModule.java | 6 +- .../TestWhisperXSubtitleExtractor.java | 32 +- .../whisperx/TestJSONSubtitleConverter.java | 42 +- 115 files changed, 2294 insertions(+), 765 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/csv-editor.xml delete mode 100644 .idea/scala_compiler.xml delete mode 100644 .idea/sonarlint.xml create mode 100644 .idea/workspace.xml create mode 100644 api/src/main/java/com/github/gtache/autosubtitle/subtitle/ExportOptions.java create mode 100644 api/src/main/java/com/github/gtache/autosubtitle/subtitle/ImportOptions.java create mode 100644 api/src/main/java/com/github/gtache/autosubtitle/subtitle/converter/FormatException.java create mode 100644 api/src/main/java/com/github/gtache/autosubtitle/subtitle/converter/FormatOptions.java create mode 100644 api/src/main/java/com/github/gtache/autosubtitle/subtitle/converter/ParseOptions.java create mode 100644 api/src/main/java/com/github/gtache/autosubtitle/subtitle/extractor/ExtractOptions.java create mode 100644 api/src/test/java/com/github/gtache/autosubtitle/subtitle/converter/TestSubtitleConverterProvider.java delete mode 100644 api/src/test/java/com/github/gtache/autosubtitle/subtitle/extractor/TestSubtitleExtractor.java rename core/src/main/java/com/github/gtache/autosubtitle/archive/impl/{ZipDecompresser.java => ZipArchiver.java} (95%) create mode 100644 core/src/main/java/com/github/gtache/autosubtitle/subtitle/converter/impl/FormatOptionsImpl.java create mode 100644 core/src/main/java/com/github/gtache/autosubtitle/subtitle/converter/impl/ParseOptionsImpl.java create mode 100644 core/src/main/java/com/github/gtache/autosubtitle/subtitle/extractor/impl/ExtractOptionsImpl.java create mode 100644 core/src/main/java/com/github/gtache/autosubtitle/subtitle/impl/ExportOptionsImpl.java create mode 100644 core/src/main/java/com/github/gtache/autosubtitle/subtitle/impl/ImportOptionsImpl.java rename core/src/test/java/com/github/gtache/autosubtitle/archive/impl/{TestZipDecompresser.java => TestZipArchiver.java} (72%) create mode 100644 core/src/test/java/com/github/gtache/autosubtitle/subtitle/converter/impl/TestFormatOptionsImpl.java create mode 100644 core/src/test/java/com/github/gtache/autosubtitle/subtitle/converter/impl/TestParseOptionsImpl.java create mode 100644 core/src/test/java/com/github/gtache/autosubtitle/subtitle/extractor/impl/TestExtractOptionsImpl.java create mode 100644 core/src/test/java/com/github/gtache/autosubtitle/subtitle/impl/TestExportOptionsImpl.java create mode 100644 core/src/test/java/com/github/gtache/autosubtitle/subtitle/impl/TestImportOptionsImpl.java diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index c2621b8..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index df5f35d..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/csv-editor.xml b/.idea/csv-editor.xml new file mode 100644 index 0000000..8470082 --- /dev/null +++ b/.idea/csv-editor.xml @@ -0,0 +1,282 @@ + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 058a36e..84995dc 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,30 +1,53 @@