fix #567

shuzijun · shuzijun · commit c3618b011d82 · 2022-10-01T11:48:05.000+08:00
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/manager/CodeManager.java b/src/main/java/com/shuzijun/leetcode/plugin/manager/CodeManager.java
@@ -148,7 +148,7 @@ public static void RunCodeCode(String titleSlug, Project project) {
             } else if (response.getStatusCode() == 429) {
                 MessageUtils.getInstance(project).showWarnMsg("", "Please wait for the result.");
             } else {
-                LogUtils.LOG.error("RuncodeCode failure " + response == null ? "" : response.getBody());
+                LogUtils.LOG.error("RuncodeCode failure " +  response.getBody());
                 MessageUtils.getInstance(project).showWarnMsg("", PropertiesUtils.getInfo("request.failed"));
             }
         } catch (Exception i) {
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/manager/ViewManager.java b/src/main/java/com/shuzijun/leetcode/plugin/manager/ViewManager.java
@@ -116,7 +116,7 @@ public static void loadAllServiceData(NavigatorAction navigatorAction, Project p
                 }
             }
             if (status) {
-                if ("TRIED".equalsIgnoreCase(filters.getStatus()) && !questionView.getStatusSign().equalsIgnoreCase("❓")) {
+                if ("TRIED".equalsIgnoreCase(filters.getStatus()) && !questionView.getStatusSign().equalsIgnoreCase("?")) {
                     continue;
                 } else if ("AC".equalsIgnoreCase(filters.getStatus()) && !questionView.getStatusSign().equalsIgnoreCase("✔")) {
                     continue;
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/model/QuestionView.java b/src/main/java/com/shuzijun/leetcode/plugin/model/QuestionView.java
@@ -109,6 +109,9 @@ public void setFrontendQuestionId(String frontendQuestionId) {
     }
 
     public void setAcceptance(Double acceptance) {
+        if (acceptance != null && acceptance.doubleValue() > 1) {
+            acceptance = acceptance / 100;
+        }
         this.acceptance = acceptance;
     }
 
@@ -117,6 +120,9 @@ public Double getAcceptance() {
     }
 
     public Double getFrequency() {
+        if (frequency != null && frequency.doubleValue() > 1) {
+            frequency = frequency / 100;
+        }
         return frequency;
     }
 
@@ -127,17 +133,17 @@ public void setFrequency(Double frequency) {
     public String getStatusSign() {
 
         if ("notac".equalsIgnoreCase(status) || "TRIED".equalsIgnoreCase(status)) {
-            return "❓";
+            return "?";
         } else if ("ac".equalsIgnoreCase(status)) {
             return "✔";
         } else if ("lock".equalsIgnoreCase(status)) {
             return "$";
         } else if ("day".equalsIgnoreCase(status)) {
             return "D";
         } else if (level != null) {
-            return "   ";
+            return " ";
         }
-        return "   ";
+        return " ";
     }
 
     public String getCategory() {
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/utils/URLUtils.java b/src/main/java/com/shuzijun/leetcode/plugin/utils/URLUtils.java
@@ -1,5 +1,6 @@
 package com.shuzijun.leetcode.plugin.utils;
 
+import com.shuzijun.leetcode.plugin.model.Config;
 import com.shuzijun.leetcode.plugin.setting.PersistentConfig;
 import org.apache.commons.lang.StringUtils;
 
@@ -29,7 +30,11 @@ public class URLUtils {
     private static String leetcodeRandomOneQuestion = "/problems/random-one-question/all";
 
     public static String getLeetcodeHost() {
-        String host = PersistentConfig.getInstance().getConfig().getUrl();
+        Config config = PersistentConfig.getInstance().getInitConfig();
+        if (config == null) {
+            return leetcode;
+        }
+        String host = config.getUrl();
         if (StringUtils.isBlank(host)) {
             return leetcode;
         }
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/window/login/HttpLogin.java b/src/main/java/com/shuzijun/leetcode/plugin/window/login/HttpLogin.java
@@ -78,7 +78,7 @@ public static boolean ajaxLogin(Config config, NavigatorAction navigatorAction,
                 } else {
                     HttpRequestUtils.resetHttpclient();
                     MessageUtils.getInstance(project).showInfoMsg("info", PropertiesUtils.getInfo("login.unknown"));
-                    SentryUtils.submitErrorReport(null, String.format("login.unknown:\nStatusCode:%s\nbody:%s", response.getStatusCode(), body));
+                    //SentryUtils.submitErrorReport(null, String.format("login.unknown:\nStatusCode:%s\nbody:%s", response.getStatusCode(), body));
                     return Boolean.FALSE;
                 }
             } else if (response.getStatusCode() == 400) {
@@ -93,7 +93,7 @@ public static boolean ajaxLogin(Config config, NavigatorAction navigatorAction,
             } else {
                 HttpRequestUtils.resetHttpclient();
                 MessageUtils.getInstance(project).showInfoMsg("info", PropertiesUtils.getInfo("login.unknown"));
-                SentryUtils.submitErrorReport(null, String.format("login.unknown:\nStatusCode:%s\nbody:%s", response.getStatusCode(), body));
+                //SentryUtils.submitErrorReport(null, String.format("login.unknown:\nStatusCode:%s\nbody:%s", response.getStatusCode(), body));
                 return Boolean.FALSE;
             }
         } catch (Exception e) {
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/window/navigator/AllNavigatorTable.java b/src/main/java/com/shuzijun/leetcode/plugin/window/navigator/AllNavigatorTable.java
@@ -82,6 +82,13 @@ protected MyJBTable<QuestionView> createMyTable(MyTableModel<QuestionView> myTab
         MyJBTable<QuestionView> myJBTable = new MyJBTable(myTableModel) {
             @Override
             protected void prepareRenderer(Component component, Object value, int row, int column) {
+                if (component instanceof JLabel) {
+                    if (column == 0 || column == 2) {
+                        ((JLabel) component).setHorizontalAlignment(SwingConstants.CENTER);
+                    } else {
+                        ((JLabel) component).setHorizontalAlignment(SwingConstants.LEADING);
+                    }
+                }
                 if (column == 2) {
                     if (value != null) {
                         if (value.toString().equals("Easy")) {
@@ -147,8 +154,8 @@ public boolean compareSlug(QuestionView myData, String titleSlug) {
     }
 
     protected void setColumnWidth(MyJBTable myJBTable) {
-        myJBTable.getColumnModel().getColumn(0).setMaxWidth(20);
-        myJBTable.getColumnModel().getColumn(2).setMaxWidth(60);
+        myJBTable.getColumnModel().getColumn(0).setMaxWidth(30);
+        myJBTable.getColumnModel().getColumn(2).setMaxWidth(70);
     }
 
 }
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/window/navigator/NavigatorTable.java b/src/main/java/com/shuzijun/leetcode/plugin/window/navigator/NavigatorTable.java
@@ -7,7 +7,6 @@
 import com.shuzijun.leetcode.plugin.model.PageInfo;
 import com.shuzijun.leetcode.plugin.model.Question;
 import com.shuzijun.leetcode.plugin.model.QuestionView;
-import com.shuzijun.leetcode.plugin.utils.URLUtils;
 import com.shuzijun.leetcode.plugin.window.NavigatorTableData;
 import icons.LeetCodeEditorIcons;
 
@@ -103,6 +102,14 @@ protected MyJBTable<QuestionView> createMyTable(MyTableModel<QuestionView> myTab
         MyJBTable<QuestionView> myJBTable = new MyJBTable(myTableModel) {
             @Override
             protected void prepareRenderer(Component component, Object value, int row, int column) {
+
+                if (component instanceof JLabel) {
+                    if (column == 0 || column == 2 || column == 3 || column == 4) {
+                        ((JLabel) component).setHorizontalAlignment(SwingConstants.CENTER);
+                    } else {
+                        ((JLabel) component).setHorizontalAlignment(SwingConstants.LEADING);
+                    }
+                }
                 if (column == 3) {
                     if (value != null) {
                         if (value.toString().equals("Easy")) {
@@ -173,10 +180,10 @@ public boolean compareSlug(QuestionView myData, String titleSlug) {
     }
 
     protected void setColumnWidth(MyJBTable myJBTable) {
-        myJBTable.getColumnModel().getColumn(0).setMaxWidth(20);
-        myJBTable.getColumnModel().getColumn(2).setMaxWidth(50);
-        myJBTable.getColumnModel().getColumn(3).setMaxWidth(60);
-        myJBTable.getColumnModel().getColumn(4).setMaxWidth(50);
+        myJBTable.getColumnModel().getColumn(0).setMaxWidth(30);
+        myJBTable.getColumnModel().getColumn(2).setMaxWidth(60);
+        myJBTable.getColumnModel().getColumn(3).setMaxWidth(70);
+        myJBTable.getColumnModel().getColumn(4).setMaxWidth(60);
     }
 
 }
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/window/navigator/TopNavigatorTable.java b/src/main/java/com/shuzijun/leetcode/plugin/window/navigator/TopNavigatorTable.java
@@ -100,6 +100,13 @@ protected MyJBTable<CodeTopQuestionView> createMyTable(MyTableModel<CodeTopQuest
         MyJBTable<CodeTopQuestionView> myJBTable = new MyJBTable(myTableModel) {
             @Override
             protected void prepareRenderer(Component component, Object value, int row, int column) {
+                if (component instanceof JLabel) {
+                    if (column == 0 || column == 2 || column == 3 || column == 4) {
+                        ((JLabel) component).setHorizontalAlignment(SwingConstants.CENTER);
+                    } else {
+                        ((JLabel) component).setHorizontalAlignment(SwingConstants.LEADING);
+                    }
+                }
                 if (column == 2) {
                     if (value != null) {
                         if (value.toString().equals("Easy")) {
@@ -175,10 +182,11 @@ public boolean compareSlug(CodeTopQuestionView myData, String titleSlug) {
 
     @Override
     protected void setColumnWidth(MyJBTable myJBTable) {
-        myJBTable.getColumnModel().getColumn(0).setMaxWidth(20);
-        myJBTable.getColumnModel().getColumn(2).setMaxWidth(60);
-        myJBTable.getColumnModel().getColumn(3).setMaxWidth(80);
-        myJBTable.getColumnModel().getColumn(4).setMaxWidth(50);
+        myJBTable.getColumnModel().getColumn(0).setMaxWidth(30);
+        myJBTable.getColumnModel().getColumn(2).setMaxWidth(70);
+        myJBTable.getColumnModel().getColumn(3).setMinWidth(100);
+        myJBTable.getColumnModel().getColumn(3).setMaxWidth(120);
+        myJBTable.getColumnModel().getColumn(4).setMaxWidth(60);
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public static void RunCodeCode(String titleSlug, Project project) {`
`148`	`148`	`} else if (response.getStatusCode() == 429) {`
`149`	`149`	`MessageUtils.getInstance(project).showWarnMsg("", "Please wait for the result.");`
`150`	`150`	`} else {`
`151`		`- LogUtils.LOG.error("RuncodeCode failure " + response == null ? "" : response.getBody());`
	`151`	`+ LogUtils.LOG.error("RuncodeCode failure " + response.getBody());`
`152`	`152`	`MessageUtils.getInstance(project).showWarnMsg("", PropertiesUtils.getInfo("request.failed"));`
`153`	`153`	`}`
`154`	`154`	`} catch (Exception i) {`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public static void loadAllServiceData(NavigatorAction navigatorAction, Project p`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`if (status) {`
`119`		`- if ("TRIED".equalsIgnoreCase(filters.getStatus()) && !questionView.getStatusSign().equalsIgnoreCase("❓")) {`
	`119`	`+ if ("TRIED".equalsIgnoreCase(filters.getStatus()) && !questionView.getStatusSign().equalsIgnoreCase("?")) {`
`120`	`120`	`continue;`
`121`	`121`	`} else if ("AC".equalsIgnoreCase(filters.getStatus()) && !questionView.getStatusSign().equalsIgnoreCase("✔")) {`
`122`	`122`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,9 @@ public void setFrontendQuestionId(String frontendQuestionId) {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`public void setAcceptance(Double acceptance) {`
	`112`	`+ if (acceptance != null && acceptance.doubleValue() > 1) {`
	`113`	`+ acceptance = acceptance / 100;`
	`114`	`+ }`
`112`	`115`	`this.acceptance = acceptance;`
`113`	`116`	`}`
`114`	`117`
`@@ -117,6 +120,9 @@ public Double getAcceptance() {`
`117`	`120`	`}`
`118`	`121`
`119`	`122`	`public Double getFrequency() {`
	`123`	`+ if (frequency != null && frequency.doubleValue() > 1) {`
	`124`	`+ frequency = frequency / 100;`
	`125`	`+ }`
`120`	`126`	`return frequency;`
`121`	`127`	`}`
`122`	`128`
`@@ -127,17 +133,17 @@ public void setFrequency(Double frequency) {`
`127`	`133`	`public String getStatusSign() {`
`128`	`134`
`129`	`135`	`if ("notac".equalsIgnoreCase(status) \|\| "TRIED".equalsIgnoreCase(status)) {`
`130`		`- return "❓";`
	`136`	`+ return "?";`
`131`	`137`	`} else if ("ac".equalsIgnoreCase(status)) {`
`132`	`138`	`return "✔";`
`133`	`139`	`} else if ("lock".equalsIgnoreCase(status)) {`
`134`	`140`	`return "$";`
`135`	`141`	`} else if ("day".equalsIgnoreCase(status)) {`
`136`	`142`	`return "D";`
`137`	`143`	`} else if (level != null) {`
`138`		`- return " ";`
	`144`	`+ return " ";`
`139`	`145`	`}`
`140`		`- return " ";`
	`146`	`+ return " ";`
`141`	`147`	`}`
`142`	`148`
`143`	`149`	`public String getCategory() {`