fix bug #5

fuzhengyin · Jan 15, 2022 · 7df5e0b · 7df5e0b
1 parent b334fbb
commit 7df5e0b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'org.example'
-version '1.2-SNAPSHOT'
+version '1.3-SNAPSHOT'
 
 repositories {
     mavenCentral()

diff --git a/src/main/java/com/fuzhengyin/string_appender/AppSettingsState.java b/src/main/java/com/fuzhengyin/string_appender/AppSettingsState.java
@@ -33,10 +33,10 @@ public class AppSettingsState implements PersistentStateComponent<AppSettingsSta
     public int maxWord;
     public int maxLength;
 
-    public static final int max_word_type_word = 1;
-    public static final int max_word_type_length = 2;
-    public static final int feature_id_type_fixed_string = 1;
-    public static final int feature_id_type_script_produce = 2;
+    public static final int max_word_type_word = 0;
+    public static final int max_word_type_length = 1;
+    public static final int feature_id_type_fixed_string = 0;
+    public static final int feature_id_type_script_produce = 1;
     public String pythonPath;
     public String suffix;
 

diff --git a/src/main/java/com/fuzhengyin/string_appender/ExtractToSpecialDest.java b/src/main/java/com/fuzhengyin/string_appender/ExtractToSpecialDest.java
@@ -56,16 +56,22 @@ public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descri
                         String text = entry.getText();
                         AppSettingsState instance = AppSettingsState.getInstance();
                         String xmlPath = instance.xmlPath;
-                        getFeatureId(project, instance, mainViewModel);
+                        if (instance.fixProduceType == AppSettingsState.feature_id_type_script_produce && (instance.fixProduceScriptPath == null || instance.fixProduceScriptPath.trim().length() == 0)) {
+                            Messages.showMessageDialog("Can't process", "Python Script not Defined", Messages.getErrorIcon());
+                            return;
+                        }
                         if (xmlPath == null || !new File(xmlPath).exists()) {
                             Messages.showMessageDialog("Can't process", "xml " + xmlPath + " not exists", Messages.getErrorIcon());
                             return;
                         }
+                        extractFeatureId(project, instance, mainViewModel);
+
                         String prefix = mainViewModel.prefix.value;
                         if (prefix == null || prefix.trim().isEmpty()) {
-                            Messages.showMessageDialog("Can't process", "FeatureId not Exists", Messages.getErrorIcon());
+                            Messages.showMessageDialog("Can't process", "Prefix not Defined", Messages.getErrorIcon());
                             return;
                         }
+
                         mainViewModel.moonDest.setValue(xmlPath);
                         String trans = mainViewModel.trans(text);
                         if (instance.maxWordType == AppSettingsState.max_word_type_word) {
@@ -92,10 +98,11 @@ public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descri
         };
     }
 
-    private void getFeatureId(@NotNull Project project, AppSettingsState instance, MainViewModel mainViewModel) {
+    private void extractFeatureId(@NotNull Project project, AppSettingsState instance, MainViewModel mainViewModel) {
         if (instance.fixProduceType == AppSettingsState.feature_id_type_fixed_string) {
             mainViewModel.prefix.setValue(instance.prefix);
             mainViewModel.suffix.setValue(instance.suffix);
+            return;
         }
         Process process = null;
         InputStream inputStream = null;
@@ -113,8 +120,14 @@ private void getFeatureId(@NotNull Project project, AppSettingsState instance, M
                 bufferedInputStream = new BufferedInputStream(inputStream);
                 byte[] bytes = bufferedInputStream.readAllBytes();
                 String[] split = new String(bytes).trim().split("/");
-                mainViewModel.prefix.setValue(split[0]);
-                mainViewModel.suffix.setValue(split[1]);
+                if (split.length == 1) {
+                    mainViewModel.prefix.setValue(split[0]);
+                    mainViewModel.suffix.setValue("");
+                } else {
+                    mainViewModel.prefix.setValue(split[0]);
+                    mainViewModel.suffix.setValue(split[1]);
+                }
+                return;
             }
         } catch (IOException | InterruptedException e) {
             e.printStackTrace();