Reworks default tools, moves some files

whisper/whisperx/src/main/java/com/github/gtache/autosubtitle/modules/setup/whisperx/WhisperX.java

@@ -1,6 +1,7 @@
 package com.github.gtache.autosubtitle.modules.setup.whisperx;
 
 import javax.inject.Qualifier;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

whisper/whisperx/src/main/java/com/github/gtache/autosubtitle/modules/setup/whisperx/WhisperXBundledRoot.java

@@ -1,6 +1,7 @@
 package com.github.gtache.autosubtitle.modules.setup.whisperx;
 
 import javax.inject.Qualifier;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

whisper/whisperx/src/main/java/com/github/gtache/autosubtitle/modules/setup/whisperx/WhisperXPythonVersion.java

@@ -1,6 +1,7 @@
 package com.github.gtache.autosubtitle.modules.setup.whisperx;
 
 import javax.inject.Qualifier;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

whisper/whisperx/src/main/java/com/github/gtache/autosubtitle/modules/setup/whisperx/WhisperXSetupModule.java

@@ -25,11 +25,7 @@ public abstract class WhisperXSetupModule {
     @IntoMap
     @StringKey("whisperx")
     abstract SetupManager bindsSubtitleExtractorSetupManager(final WhisperXSetupManager manager);
-
-    @Binds
-    @SubtitleExtractorSetup
-    abstract SetupManager bindsDefaultSubtitleExtractorSetupManager(final WhisperXSetupManager manager);
-
+    
     @Provides
     @WhisperXPythonVersion
     static String providesPythonVersion() {

whisper/whisperx/src/main/java/com/github/gtache/autosubtitle/modules/setup/whisperx/WhisperXVenvPath.java

@@ -1,6 +1,7 @@
 package com.github.gtache.autosubtitle.modules.setup.whisperx;
 
 import javax.inject.Qualifier;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

whisper/whisperx/src/main/java/com/github/gtache/autosubtitle/modules/whisperx/WhisperXModule.java

@@ -1,11 +1,14 @@
 package com.github.gtache.autosubtitle.modules.whisperx;
 
+import com.github.gtache.autosubtitle.ToolType;
+import com.github.gtache.autosubtitle.modules.impl.ToolTypeKey;
 import com.github.gtache.autosubtitle.modules.setup.whisperx.WhisperXSetupModule;
 import com.github.gtache.autosubtitle.modules.subtitle.extractor.whisperx.WhisperXExtractorModule;
 import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModelProvider;
 import com.github.gtache.autosubtitle.whisperx.WhisperXExtractionModelProvider;
 import dagger.Binds;
 import dagger.Module;
+import dagger.Provides;
 import dagger.multibindings.IntoMap;
 import dagger.multibindings.StringKey;
 
@@ -24,6 +27,13 @@ public abstract class WhisperXModule {
     @StringKey("whisperx")
     abstract ExtractionModelProvider bindsExtractionModelProvider(final WhisperXExtractionModelProvider provider);
 
+    @Provides
+    @IntoMap
+    @ToolTypeKey(ToolType.SUBTITLE_EXTRACTOR)
+    static String providesDefaultExtractor() {
+        return "whisperx";
+    }
+
     @Binds
     abstract ExtractionModelProvider bindsDefaultExtractionModelProvider(final WhisperXExtractionModelProvider provider);
 }

whisper/whisperx/src/main/java/com/github/gtache/autosubtitle/setup/whisperx/WhisperXSetupManager.java

@@ -8,11 +8,13 @@ import com.github.gtache.autosubtitle.setup.SetupUserBridge;
 import com.github.gtache.autosubtitle.setup.conda.CondaSetupManager;
 import com.github.gtache.autosubtitle.setup.whisper.AbstractWhisperSetupManager;
 import com.github.gtache.autosubtitle.setup.whisper.WhisperSetupConfiguration;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import java.io.IOException;
 import java.net.http.HttpClient;
 import java.nio.file.Files;

whisper/whisperx/src/main/java/com/github/gtache/autosubtitle/subtitle/converter/json/whisperx/WhisperXJSONSubtitleConverter.java

@@ -15,6 +15,7 @@ import com.github.gtache.autosubtitle.subtitle.impl.SubtitleImpl;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Comparator;

whisper/whisperx/src/main/java/com/github/gtache/autosubtitle/subtitle/extractor/whisperx/WhisperXSubtitleExtractor.java

@@ -11,6 +11,7 @@ import com.github.gtache.autosubtitle.subtitle.extractor.whisper.AbstractWhisper
 import com.github.gtache.autosubtitle.whisper.WhisperModels;
 
 import javax.inject.Inject;
+
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;

whisper/whisperx/src/main/java/com/github/gtache/autosubtitle/whisperx/WhisperXExtractionModelProvider.java

@@ -5,6 +5,7 @@ import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModelProvider
 import com.github.gtache.autosubtitle.whisper.WhisperModels;
 
 import javax.inject.Inject;
+
 import java.util.Arrays;
 import java.util.List;