Merge pull request #328 from HongJinFeng/master

shuzijun · web-flow · commit 401649e2b572 · 2021-05-24T12:53:23.000+08:00
[feature]支持按照题解数量排序
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/AbstractSortAction.java b/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/AbstractSortAction.java
@@ -0,0 +1,46 @@
+package com.shuzijun.leetcode.plugin.actions.tree;
+
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.shuzijun.leetcode.plugin.model.Question;
+import com.shuzijun.leetcode.plugin.utils.DataKeys;
+import com.shuzijun.leetcode.plugin.window.WindowFactory;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.MutableTreeNode;
+import javax.swing.tree.TreeNode;
+import java.util.Enumeration;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author hongjinfeng
+ * @date 2021/5/19 4:32 下午
+ */
+public abstract class AbstractSortAction extends AnAction {
+
+    @Override
+    public void actionPerformed(@NotNull AnActionEvent anActionEvent) {
+        JTree tree = WindowFactory.getDataContext(Objects.requireNonNull(anActionEvent.getProject())).getData(DataKeys.LEETCODE_PROJECTS_TREE);
+        assert tree != null;
+        DefaultMutableTreeNode note = (DefaultMutableTreeNode) tree.getLastSelectedPathComponent();
+        Enumeration<TreeNode> children = note.children();
+        List<MutableTreeNode> childrenForSort = new LinkedList<>();
+        while (children.hasMoreElements()) {
+            childrenForSort.add((MutableTreeNode) children.nextElement());
+        }
+        Question tag = (Question) note.getUserObject();
+        sortChildren(tag, childrenForSort);
+        note.setUserObject(tag);
+        note.removeAllChildren();
+        for (TreeNode treeNode : childrenForSort) {
+            note.add((MutableTreeNode) treeNode);
+        }
+        tree.updateUI();
+    }
+
+    public abstract void sortChildren(Question tag, List<MutableTreeNode> childrenForSort);
+}
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/SortActionGroup.java b/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/SortActionGroup.java
@@ -0,0 +1,16 @@
+package com.shuzijun.leetcode.plugin.actions.tree;
+
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
+
+/**
+ * @author hongjinfeng
+ * @date 2021/5/20 12:20 下午
+ */
+public class SortActionGroup extends DefaultActionGroup {
+
+    @Override
+    public void update(AnActionEvent event) {
+        event.getPresentation().setEnabled(true);
+    }
+}
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/SortByDifficultyAction.java b/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/SortByDifficultyAction.java
@@ -0,0 +1,26 @@
+package com.shuzijun.leetcode.plugin.actions.tree;
+
+import com.shuzijun.leetcode.plugin.model.Question;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.MutableTreeNode;
+import java.util.List;
+
+/**
+ * @author hongjinfeng
+ * @date 2021/5/20 9:42 上午
+ */
+public class SortByDifficultyAction extends AbstractSortAction {
+
+    @Override
+    public void sortChildren(Question tag, List<MutableTreeNode> childrenForSort) {
+        childrenForSort.sort((o1, o2) -> {
+            DefaultMutableTreeNode item1 = (DefaultMutableTreeNode) o1;
+            Question question1 = (Question) item1.getUserObject();
+            DefaultMutableTreeNode item2 = (DefaultMutableTreeNode) o2;
+            Question question2 = (Question) item2.getUserObject();
+            return tag.getLevelSortTrend() * (question1.getLevel() - question2.getLevel());
+        });
+        tag.setLevelSortTrend(-tag.getLevelSortTrend());
+    }
+}
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/SortByIdAction.java b/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/SortByIdAction.java
@@ -0,0 +1,36 @@
+package com.shuzijun.leetcode.plugin.actions.tree;
+
+import com.shuzijun.leetcode.plugin.model.Question;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.MutableTreeNode;
+import java.util.List;
+
+/**
+ * @author hongjinfeng
+ * @date 2021/5/20 9:40 上午
+ */
+public class SortByIdAction extends AbstractSortAction {
+
+    @Override
+    public void sortChildren(Question tag, List<MutableTreeNode> childrenForSort) {
+        childrenForSort.sort((o1, o2) -> {
+            DefaultMutableTreeNode item1 = (DefaultMutableTreeNode) o1;
+            Question question1 = (Question) item1.getUserObject();
+            DefaultMutableTreeNode item2 = (DefaultMutableTreeNode) o2;
+            Question question2 = (Question) item2.getUserObject();
+            int i = Integer.MAX_VALUE;
+            try {
+                i = Integer.parseInt(question1.getFrontendQuestionId());
+            } catch (Exception ignored) {
+            }
+            int j = Integer.MAX_VALUE;
+            try {
+                j = Integer.parseInt(question2.getFrontendQuestionId());
+            } catch (Exception ignored) {
+            }
+            return tag.getIdSortTrend() * (i - j);
+        });
+        tag.setIdSortTrend(-tag.getIdSortTrend());
+    }
+}
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/SortByNameAction.java b/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/SortByNameAction.java
@@ -0,0 +1,26 @@
+package com.shuzijun.leetcode.plugin.actions.tree;
+
+import com.shuzijun.leetcode.plugin.model.Question;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.MutableTreeNode;
+import java.util.List;
+
+/**
+ * @author hongjinfeng
+ * @date 2021/5/20 9:41 上午
+ */
+public class SortByNameAction extends AbstractSortAction {
+
+    @Override
+    public void sortChildren(Question tag, List<MutableTreeNode> childrenForSort) {
+        childrenForSort.sort((o1, o2) -> {
+            DefaultMutableTreeNode item1 = (DefaultMutableTreeNode) o1;
+            Question question1 = (Question) item1.getUserObject();
+            DefaultMutableTreeNode item2 = (DefaultMutableTreeNode) o2;
+            Question question2 = (Question) item2.getUserObject();
+            return tag.getNameSortTrend() * (question1.getTitle().compareTo(question2.getTitle()));
+        });
+        tag.setNameSortTrend(-tag.getNameSortTrend());
+    }
+}
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/SortByOccurrenceFrequencyAction.java b/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/SortByOccurrenceFrequencyAction.java
@@ -0,0 +1,26 @@
+package com.shuzijun.leetcode.plugin.actions.tree;
+
+import com.shuzijun.leetcode.plugin.model.Question;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.MutableTreeNode;
+import java.util.List;
+
+/**
+ * @author hongjinfeng
+ * @date 2021/5/20 9:43 上午
+ */
+public class SortByOccurrenceFrequencyAction extends AbstractSortAction{
+
+    @Override
+    public void sortChildren(Question tag, List<MutableTreeNode> childrenForSort) {
+        childrenForSort.sort((o1, o2) -> {
+            DefaultMutableTreeNode item1 = (DefaultMutableTreeNode) o1;
+            Question question1 = (Question) item1.getUserObject();
+            DefaultMutableTreeNode item2 = (DefaultMutableTreeNode) o2;
+            Question question2 = (Question) item2.getUserObject();
+            return tag.getOccurrenceFrequencySortTrend() * (question1.getOccurrenceFrequency().compareTo(question2.getOccurrenceFrequency()));
+        });
+        tag.setOccurrenceFrequencySortTrend(-tag.getOccurrenceFrequencySortTrend());
+    }
+}
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/SortByPassRateAction.java b/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/SortByPassRateAction.java
@@ -0,0 +1,28 @@
+package com.shuzijun.leetcode.plugin.actions.tree;
+
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.shuzijun.leetcode.plugin.model.Question;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.MutableTreeNode;
+import java.util.List;
+
+/**
+ * @author hongjinfeng
+ * @date 2021/5/20 9:41 上午
+ */
+public class SortByPassRateAction extends AbstractSortAction{
+
+    @Override
+    public void sortChildren(Question tag, List<MutableTreeNode> childrenForSort) {
+        childrenForSort.sort((o1, o2) -> {
+            DefaultMutableTreeNode item1 = (DefaultMutableTreeNode) o1;
+            Question question1 = (Question) item1.getUserObject();
+            DefaultMutableTreeNode item2 = (DefaultMutableTreeNode) o2;
+            Question question2 = (Question) item2.getUserObject();
+            return tag.getPassingRateSortTrend() * (question1.getPassingRate().compareTo(question2.getPassingRate()));
+        });
+        tag.setPassingRateSortTrend(-tag.getPassingRateSortTrend());
+    }
+}
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/SortBySolutionAction.java b/src/main/java/com/shuzijun/leetcode/plugin/actions/tree/SortBySolutionAction.java
@@ -0,0 +1,26 @@
+package com.shuzijun.leetcode.plugin.actions.tree;
+
+import com.shuzijun.leetcode.plugin.model.Question;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.MutableTreeNode;
+import java.util.List;
+
+/**
+ * @author hongjinfeng
+ * @date 2021/5/19 4:35 下午
+ */
+public class SortBySolutionAction extends AbstractSortAction {
+
+    @Override
+    public void sortChildren(Question tag, List<MutableTreeNode> childrenForSort) {
+        childrenForSort.sort((o1, o2) -> {
+            DefaultMutableTreeNode item1 = (DefaultMutableTreeNode) o1;
+            Question question1 = (Question) item1.getUserObject();
+            DefaultMutableTreeNode item2 = (DefaultMutableTreeNode) o2;
+            Question question2 = (Question) item2.getUserObject();
+            return tag.getSolutionSortTrend() * (question1.getTotalSolutionCount() - question2.getTotalSolutionCount());
+        });
+        tag.setSolutionSortTrend(-tag.getSolutionSortTrend());
+    }
+}
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/listener/TreeMouseListener.java b/src/main/java/com/shuzijun/leetcode/plugin/listener/TreeMouseListener.java
@@ -8,6 +8,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.ui.treeStructure.SimpleTree;
 import com.shuzijun.leetcode.plugin.manager.CodeManager;
+import com.shuzijun.leetcode.plugin.model.Constant;
 import com.shuzijun.leetcode.plugin.model.Question;
 import org.jetbrains.annotations.NotNull;
 
@@ -44,20 +45,27 @@ public void mouseClicked(MouseEvent e) {
                 if (e.getButton() == 3) { //鼠标右键
                     final ActionManager actionManager = ActionManager.getInstance();
                     final ActionGroup actionGroup = (ActionGroup) actionManager.getAction("leetcode.NavigatorActionsMenu");
+
                     if (actionGroup != null) {
                         actionManager.createActionPopupMenu("", actionGroup).getComponent().show(e.getComponent(), e.getX(), e.getY());
                     }
                 } else if (e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() == 2) {
-                    ProgressManager.getInstance().run(new Task.Backgroundable(project,"leetcode.editor.openCode",false) {
+                    ProgressManager.getInstance().run(new Task.Backgroundable(project, "leetcode.editor.openCode", false) {
                         @Override
                         public void run(@NotNull ProgressIndicator progressIndicator) {
                             CodeManager.openCode(question, project);
                         }
                     });
                 }
+            } else if (Constant.NODETYPE_TAG.equals(question.getNodeType()) || Constant.NODETYPE_PROBLEMS.equals(question.getNodeType())) {
+                if (e.getButton() == 3) { //鼠标右键
+                    final ActionManager actionManager = ActionManager.getInstance();
+                    final ActionGroup actionGroup = (ActionGroup) actionManager.getAction("leetcode.editor.tree.menu");
+                    if (actionGroup != null) {
+                        actionManager.createActionPopupMenu("", actionGroup).getComponent().show(e.getComponent(), e.getX(), e.getY());
+                    }
+                }
             }
         }
-
-
     }
 }
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/manager/QuestionManager.java b/src/main/java/com/shuzijun/leetcode/plugin/manager/QuestionManager.java
@@ -208,12 +208,15 @@ private static List<Question> parseQuestion(String str) {
                 question.setLeaf(Boolean.TRUE);
                 question.setQuestionId(object.getJSONObject("stat").getString("question_id"));
                 question.setFrontendQuestionId(object.getJSONObject("stat").getString("frontend_question_id"));
+                question.setTotalSolutionCount(object.getJSONObject("stat").getInteger("total_column_articles"));
+                question.setPassingRate(object.getJSONObject("stat").getDouble("total_acs")/object.getJSONObject("stat").getInteger("total_submitted"));
                 try {
                     if (object.getBoolean("paid_only") && isPremium) {
                         question.setStatus(object.getBoolean("paid_only") ? "lock" : null);
                     } else {
                         question.setStatus(object.get("status") == null ? "" : object.getString("status"));
                     }
+                    question.setOccurrenceFrequency(object.getDouble("frequency"));
                 } catch (Exception ee) {
                     question.setStatus("");
                 }
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/manager/ViewManager.java b/src/main/java/com/shuzijun/leetcode/plugin/manager/ViewManager.java
@@ -67,13 +67,15 @@ public String apply(Question question) {
         DefaultTreeModel treeMode = (DefaultTreeModel) tree.getModel();
         DefaultMutableTreeNode root = (DefaultMutableTreeNode) treeMode.getRoot();
         root.removeAllChildren();
-        DefaultMutableTreeNode node = new DefaultMutableTreeNode(new Question(String.format("Problems(%d)", questionList.size())));
+        Question problems = new Question(String.format("Problems(%d)", questionList.size()));
+        problems.setNodeType(Constant.NODETYPE_PROBLEMS);
+        DefaultMutableTreeNode node = new DefaultMutableTreeNode(problems);
         root.add(node);
         for (Question q : questionList) {
             node.add(new DefaultMutableTreeNode(q));
         }
         for (String key : filter.keySet()) {
-            if(Constant.FIND_TYPE_CATEGORY.equals(key)){
+            if (Constant.FIND_TYPE_CATEGORY.equals(key)) {
                 continue;
             }
             DefaultMutableTreeNode filterNode = new DefaultMutableTreeNode(new Question(key));
@@ -254,8 +256,13 @@ private static void addChild(DefaultMutableTreeNode rootNode, List<Tag> Lists, M
         if (!Lists.isEmpty()) {
             for (Tag tag : Lists) {
                 long qCnt = tag.getQuestions().stream().filter(q -> questionMap.get(q) != null).count();
-                DefaultMutableTreeNode tagNode = new DefaultMutableTreeNode(new Question(String.format("%s(%d)",
-                        tag.getName(), qCnt)));
+                Question item = new Question(String.format("%s(%d)",
+                        tag.getName(), qCnt));
+                Question parent = (Question) rootNode.getUserObject();
+                if (parent.getTitle().equals(Constant.FIND_TYPE_TAGS)) {
+                    item.setNodeType(Constant.NODETYPE_TAG);
+                }
+                DefaultMutableTreeNode tagNode = new DefaultMutableTreeNode(item);
                 rootNode.add(tagNode);
                 for (String key : tag.getQuestions()) {
                     if (questionMap.get(key) != null) {
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/model/Constant.java b/src/main/java/com/shuzijun/leetcode/plugin/model/Constant.java
@@ -31,6 +31,8 @@ public class Constant {
     public static final String NODETYPE_CARD = "card";
     public static final String NODETYPE_CHAPTER = "chapter";
     public static final String NODETYPE_ITEM = "item";
+    public static final String NODETYPE_TAG = "tag";
+    public static final String NODETYPE_PROBLEMS = "problems";
     /**
      * 探索下列表内容
      */
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/model/Question.java b/src/main/java/com/shuzijun/leetcode/plugin/model/Question.java
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`import com.intellij.openapi.project.Project;`
`9`	`9`	`import com.intellij.ui.treeStructure.SimpleTree;`
`10`	`10`	`import com.shuzijun.leetcode.plugin.manager.CodeManager;`
	`11`	`+import com.shuzijun.leetcode.plugin.model.Constant;`
`11`	`12`	`import com.shuzijun.leetcode.plugin.model.Question;`
`12`	`13`	`import org.jetbrains.annotations.NotNull;`
`13`	`14`
`@@ -44,20 +45,27 @@ public void mouseClicked(MouseEvent e) {`
`44`	`45`	`if (e.getButton() == 3) { //鼠标右键`
`45`	`46`	`final ActionManager actionManager = ActionManager.getInstance();`
`46`	`47`	`final ActionGroup actionGroup = (ActionGroup) actionManager.getAction("leetcode.NavigatorActionsMenu");`
	`48`	`+`
`47`	`49`	`if (actionGroup != null) {`
`48`	`50`	`actionManager.createActionPopupMenu("", actionGroup).getComponent().show(e.getComponent(), e.getX(), e.getY());`
`49`	`51`	`}`
`50`	`52`	`} else if (e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() == 2) {`
`51`		`- ProgressManager.getInstance().run(new Task.Backgroundable(project,"leetcode.editor.openCode",false) {`
	`53`	`+ ProgressManager.getInstance().run(new Task.Backgroundable(project, "leetcode.editor.openCode", false) {`
`52`	`54`	`@Override`
`53`	`55`	`public void run(@NotNull ProgressIndicator progressIndicator) {`
`54`	`56`	`CodeManager.openCode(question, project);`
`55`	`57`	`}`
`56`	`58`	`});`
`57`	`59`	`}`
	`60`	`+ } else if (Constant.NODETYPE_TAG.equals(question.getNodeType()) \|\| Constant.NODETYPE_PROBLEMS.equals(question.getNodeType())) {`
	`61`	`+ if (e.getButton() == 3) { //鼠标右键`
	`62`	`+ final ActionManager actionManager = ActionManager.getInstance();`
	`63`	`+ final ActionGroup actionGroup = (ActionGroup) actionManager.getAction("leetcode.editor.tree.menu");`
	`64`	`+ if (actionGroup != null) {`
	`65`	`+ actionManager.createActionPopupMenu("", actionGroup).getComponent().show(e.getComponent(), e.getX(), e.getY());`
	`66`	`+ }`
	`67`	`+ }`
`58`	`68`	`}`
`59`	`69`	`}`
`60`		`-`
`61`		`-`
`62`	`70`	`}`
`63`	`71`	`}`