Merge pull request #415 from shuzijun/gradle

Synchronize the website API and modify the display style.

Author: shuzijun

gradle.properties

@@ -1,4 +1,4 @@
-plugin_version = 7.4
+plugin_version = 8.0
 idea_local_path =
 # '' | windows | mac | linux
 build_env =

src/main/java/com/shuzijun/leetcode/plugin/actions/AbstractAsynAction.java

@@ -12,6 +12,8 @@
 import com.shuzijun.leetcode.plugin.setting.ProjectConfig;
 import com.shuzijun.leetcode.plugin.utils.MessageUtils;
 import com.shuzijun.leetcode.plugin.utils.PropertiesUtils;
+import com.shuzijun.leetcode.plugin.utils.URLUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author shuzijun
@@ -21,21 +23,30 @@ abstract class AbstractEditAction extends AbstractAction {
     @Override
     public void actionPerformed(AnActionEvent anActionEvent, Config config) {
         VirtualFile vf = ArrayUtil.getFirstElement(FileEditorManager.getInstance(anActionEvent.getProject()).getSelectedFiles());
-        if(vf == null){
+        if (vf == null) {
             return;
         }
         LeetcodeEditor leetcodeEditor = ProjectConfig.getInstance(anActionEvent.getProject()).getEditor(vf.getPath());
         if (leetcodeEditor == null) {
             return;
         }
-        Question question = ViewManager.getQuestionById(leetcodeEditor.getFrontendQuestionId(), anActionEvent.getProject());
+        if (StringUtils.isBlank(leetcodeEditor.getTitleSlug())) {
+            MessageUtils.getInstance(anActionEvent.getProject()).showInfoMsg("info", PropertiesUtils.getInfo("tree.null"));
+            return;
+        }
+        if(!URLUtils.getLeetcodeHost().equals(leetcodeEditor.getHost())){
+            MessageUtils.getInstance(anActionEvent.getProject()).showInfoMsg("info", PropertiesUtils.getInfo("tree.host"));
+            return;
+        }
+        Question question = ViewManager.getQuestionByTitleSlug(leetcodeEditor.getTitleSlug(), null, anActionEvent.getProject());
         if (question == null) {
             MessageUtils.getInstance(anActionEvent.getProject()).showInfoMsg("info", PropertiesUtils.getInfo("tree.null"));
             return;
         }
 
         actionPerformed(anActionEvent, config, question);
 
+
     }
 
     public abstract void actionPerformed(AnActionEvent anActionEvent, Config config, Question question);

src/main/java/com/shuzijun/leetcode/plugin/actions/editor/AbstractEditAction.java

@@ -3,13 +3,18 @@
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.shuzijun.leetcode.plugin.manager.ArticleManager;
 import com.shuzijun.leetcode.plugin.manager.ViewManager;
 import com.shuzijun.leetcode.plugin.model.*;
 import com.shuzijun.leetcode.plugin.setting.ProjectConfig;
+import com.shuzijun.leetcode.plugin.utils.URLUtils;
 import com.shuzijun.leetcode.plugin.window.SolutionPanel;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -27,15 +32,26 @@ public void update(@NotNull AnActionEvent anActionEvent) {
             return;
         }
         LeetcodeEditor leetcodeEditor = ProjectConfig.getInstance(anActionEvent.getProject()).getEditor(vf.getPath());
-        if (leetcodeEditor == null) {
-            return;
-        }
-        Question question = ViewManager.getDumbQuestionById(leetcodeEditor.getFrontendQuestionId(), anActionEvent.getProject());
-        if (question == null) {
+        if (leetcodeEditor == null || StringUtils.isBlank(leetcodeEditor.getTitleSlug()) || !URLUtils.getLeetcodeHost().equals(leetcodeEditor.getHost())) {
             anActionEvent.getPresentation().setEnabled(false);
             return;
         }
-        anActionEvent.getPresentation().setEnabled(!Constant.ARTICLE_LIVE_NONE.equals(question.getArticleLive()));
+        Question question = ViewManager.getCaCheQuestionByTitleSlug(leetcodeEditor.getTitleSlug(), null, anActionEvent.getProject());
+        if (question != null) {
+            anActionEvent.getPresentation().setEnabled(!Constant.ARTICLE_LIVE_NONE.equals(question.getArticleLive()));
+        } else {
+            ProgressManager.getInstance().run(new Task.Backgroundable(anActionEvent.getProject(), "Get Question", false) {
+                @Override
+                public void run(@NotNull ProgressIndicator progressIndicator) {
+                    Question question = ViewManager.getQuestionByTitleSlug(leetcodeEditor.getTitleSlug(), null, anActionEvent.getProject());
+                    if (question == null) {
+                        anActionEvent.getPresentation().setEnabled(false);
+                        return;
+                    }
+                    anActionEvent.getPresentation().setEnabled(!Constant.ARTICLE_LIVE_NONE.equals(question.getArticleLive()));
+                }
+            });
+        }
     }
 
     @Override
@@ -58,7 +74,7 @@ public void actionPerformed(AnActionEvent anActionEvent, Config config, Question
                     solution.set(solutionList.get(dialog.getSelectedRow()));
                 }
             });
-            if(solution.get() !=null){
+            if (solution.get() != null) {
                 question.setArticleSlug(solution.get().getSlug());
                 ArticleManager.openArticle(question, project);
             }

src/main/java/com/shuzijun/leetcode/plugin/actions/editor/AbstractEditAsynAction.java

@@ -32,7 +32,7 @@ public void update(AnActionEvent e) {
 
         if (tags != null && !tags.isEmpty()) {
             for (Tag tag : tags) {
-                if(tag.isSelect()){
+                if (tag.isSelect()) {
                     e.getPresentation().setIcon(LeetCodeEditorIcons.FILTER);
                     findToolbar.getComponent().updateUI();
                     return;
@@ -57,11 +57,7 @@ public AnAction[] getChildren(AnActionEvent anActionEvent) {
 
         if (tags != null && !tags.isEmpty()) {
             for (Tag tag : tags) {
-                if (PluginConstant.LEETCODE_FIND_CATEGORY.equals(id)) {
-                    anActionList.add(new FindTagAction(tag.getName(), tag, true));
-                }else {
-                    anActionList.add(new FindTagAction(tag.getName(), tag));
-                }
+                anActionList.add(new FindTagAction(tag.getName(), tag, tags, onlyOne(id), getFilterKey(id)));
             }
         }
         AnAction[] anActions = new AnAction[anActionList.size()];
@@ -86,4 +82,26 @@ private List<Tag> getTags(String id) {
         return tags;
     }
 
+    private boolean onlyOne(String id) {
+        if (PluginConstant.LEETCODE_FIND_TAGS.equals(id)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private String getFilterKey(String id) {
+        if (PluginConstant.LEETCODE_FIND_DIFFICULTY.equals(id)) {
+            return "difficulty";
+        } else if (PluginConstant.LEETCODE_FIND_STATUS.equals(id)) {
+            return "status";
+        } else if (PluginConstant.LEETCODE_FIND_LISTS.equals(id)) {
+            return "listId";
+        } else if (PluginConstant.LEETCODE_FIND_TAGS.equals(id)) {
+            return "tags";
+        } else if (PluginConstant.LEETCODE_FIND_CATEGORY.equals(id)) {
+            return "categorySlug";
+        }
+        return "";
+    }
 }

src/main/java/com/shuzijun/leetcode/plugin/actions/editor/OpenSolutionAction.java

@@ -6,10 +6,9 @@
 import com.shuzijun.leetcode.plugin.manager.ViewManager;
 import com.shuzijun.leetcode.plugin.model.Config;
 import com.shuzijun.leetcode.plugin.utils.DataKeys;
+import com.shuzijun.leetcode.plugin.window.NavigatorTable;
 import com.shuzijun.leetcode.plugin.window.WindowFactory;
 
-import javax.swing.*;
-
 /**
  * @author shuzijun
  */
@@ -18,15 +17,12 @@ public class FindClearAction extends AbstractAction {
     @Override
     public void actionPerformed(AnActionEvent anActionEvent, Config config) {
 
-        JTree tree = WindowFactory.getDataContext(anActionEvent.getProject()).getData(DataKeys.LEETCODE_PROJECTS_TREE);
-        if (tree == null) {
+        NavigatorTable navigatorTable = WindowFactory.getDataContext(anActionEvent.getProject()).getData(DataKeys.LEETCODE_PROJECTS_TREE);
+        if (navigatorTable == null) {
             return;
-        }
-        boolean isLoad = ViewManager.clearFilter();
-        if (isLoad) {
-            ViewManager.loadServiceData(tree,anActionEvent.getProject());
         } else {
-            ViewManager.update(tree);
+            navigatorTable.getPageInfo().clearFilter();
         }
+        ViewManager.loadServiceData(navigatorTable,anActionEvent.getProject());
     }
 }