Merge branch 'develop'

fix #89, #90, #85

Author: kaiwk

README.md

@@ -16,6 +16,7 @@ LeetCode brings you offer, and now Emacs brings you LeetCode!
 | l      | change prefer language                 |
 | s      | filter problems by regex               |
 | t      | filter problems by tag                 |
+| T      | toggle tag display                     |
 | d      | filter problems by difficulty          |
 | /      | clear filters                          |
 | g      | refresh without fetching from LeetCode |
@@ -71,6 +72,9 @@ manually: `pip3 install my_cookies`.
 You can set your preferred LeetCode programming language and SQL by setting
 `leetcode-prefer-language` and `leetcode-prefer-sql`:
 
+If you prefer not to see problems' tags in the `*leetcode**`buffer by default.
+set `leetcode-prefer-tag-display` to nil
+
 ```elisp
 (setq leetcode-prefer-language "python3")
 (setq leetcode-prefer-sql "mysql")

leetcode.el

@@ -6,7 +6,7 @@
 ;; Keywords: extensions, tools
 ;; URL: https://github.com/kaiwk/leetcode.el
 ;; Package-Requires: ((emacs "26") (dash "2.16.0") (graphql "0.1.1") (spinner "1.7.3") (aio "1.0") (log4e "0.3.3"))
-;; Version: 0.1.21
+;; Version: 0.1.22
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -103,7 +103,7 @@ The object with following attributes:
 The object with following attributes:
 :num      Number
 :tag      String
-:problems Vector
+:problems List
 
 The elements of :problems has attributes:
 :status     String
@@ -300,19 +300,20 @@ USER-AND-PROBLEMS is an alist comes from
                 :easy     .ac_easy
                 :medium   .ac_medium
                 :hard     .ac_hard))
-    (leetcode--debug "problem status pairs: %s" .stat_status_pairs)
+    (leetcode--debug "set user: %s, solved %s in %s problems" .user_name .num_solved .num_total)
     ;; problem list
     (setq leetcode--all-problems
           (list
            :num .num_total
            :tag "all"
            :problems
            (let* ((len .num_total)
-                  (problems (make-vector len nil)))
+                  (problems nil))
              (dotimes (i len)
                (let-alist (aref .stat_status_pairs i)
-                 (aset problems (1- .stat.frontend_question_id)
-                       (list
+                 (leetcode--debug "frontend_question_id: %s, question_id: %s, title: %s"
+                                  .stat.frontend_question_id .stat.question_id .stat.question__title)
+                 (push (list
                         :status .status
                         :id .stat.frontend_question_id
                         :backend-id .stat.question_id
@@ -323,15 +324,15 @@ USER-AND-PROBLEMS is an alist comes from
                                         (/ (float .stat.total_acs)
                                            .stat.total_submitted)))
                         :difficulty .difficulty.level
-                        :paid-only (eq .paid_only t)))))
+                        :paid-only (eq .paid_only t))
+                       problems)))
              problems)))))
 
 (defun leetcode--set-tags (all-tags)
   "Set `leetcode--all-tags' and `leetcode--all-problems' with ALL-TAGS."
-  (leetcode--debug "all tags: %s" all-tags)
   (let-alist all-tags
     ;; set problems tags
-    (dovec (problem (plist-get leetcode--all-problems :problems))
+    (dolist (problem (plist-get leetcode--all-problems :problems))
       (dolist (topic (to-list .topics))
         (let-alist topic
           (when (member (plist-get problem :backend-id) (to-list .questions))
@@ -341,7 +342,7 @@ USER-AND-PROBLEMS is an alist comes from
     ;; set leetcode--all-tags
     (dolist (topic (to-list .topics))
       (let-alist topic
-        (unless (member topic leetcode--all-tags)
+        (unless (member .slug leetcode--all-tags)
           (push .slug leetcode--all-tags))))))
 
 (defun leetcode--slugify-title (title)
@@ -458,7 +459,7 @@ Return a list of rows, each row is a vector:
         (medium-tag "medium")
         (hard-tag "hard")
         rows)
-    (dovec (p problems)
+    (dolist (p problems)
       (setq rows
             (cons
              (vector
@@ -473,8 +474,8 @@ Return a list of rows, each row is a vector:
               (number-to-string (plist-get p :id))
               ;; title
               (concat
-	           (plist-get p :title)
-	           " "
+               (plist-get p :title)
+               " "
                (if (eq (plist-get p :paid-only) t)
                    (prog1 leetcode--paid
                      (put-text-property
@@ -486,7 +487,7 @@ Return a list of rows, each row is a vector:
               ;; difficulty
               (leetcode--stringify-difficulty (plist-get p :difficulty))
               ;; tags
-              (string-join (plist-get p :tags) ", "))
+              (if leetcode--display-tags (string-join (plist-get p :tags) ", ") ""))
              rows)))
     (reverse rows)))
 
@@ -500,7 +501,6 @@ Return a list of rows, each row is a vector:
 
 (defun leetcode--filter (rows)
   "Filter ROWS by `leetcode--filter-regex', `leetcode--filter-tag' and `leetcode--filter-difficulty'."
-  (leetcode--debug "filter rows: %s" rows)
   (seq-filter
    (lambda (row)
      (and
@@ -553,6 +553,12 @@ Return a list of rows, each row is a vector:
         (completing-read "Difficulty: " leetcode--all-difficulties))
   (leetcode-refresh))
 
+(defun leetcode-toggle-tag-display ()
+  "Toggle `leetcode--display-tags` and refresh"
+  (interactive)
+  (setq leetcode--display-tags (not leetcode--display-tags))
+  (leetcode-refresh))
+
 (aio-defun leetcode--fetch-all-tags ()
   (let* ((url-request-method "GET")
          (url-request-extra-headers
@@ -587,7 +593,8 @@ Return a list of rows, each row is a vector:
 (defun leetcode-refresh ()
   "Make `tabulated-list-entries'."
   (interactive)
-  (let* ((header-names '(" " "#" "Problem" "Acceptance" "Difficulty" "Tags"))
+  (let* ((header-names (append '(" " "#" "Problem" "Acceptance" "Difficulty")
+                               (if leetcode--display-tags '("Tags"))))
          (rows (leetcode--filter (leetcode--problems-rows)))
          (headers (leetcode--make-tabulated-headers header-names rows)))
     (with-current-buffer (get-buffer-create leetcode--buffer-name)
@@ -611,6 +618,7 @@ Return a list of rows, each row is a vector:
         (leetcode--set-user-and-problems users-and-problems)
         (leetcode--set-tags all-tags))
     (leetcode--warn "LeetCode parse user and problems failed"))
+  (setq leetcode--display-tags leetcode-prefer-tag-display)
   (leetcode-reset-filter)
   (leetcode-refresh))
 
@@ -1033,6 +1041,13 @@ Call `leetcode-solve-problem' on the current problem id."
            (get-buffer (leetcode--get-code-buffer-name title))))
         leetcode--problem-titles))
 
+(defcustom leetcode-prefer-tag-display t
+  "Whether to display tags by default in the *leetcode* buffer."
+  :type :boolean)
+
+(defvar leetcode--display-tags leetcode-prefer-tag-display
+  "(Internal) Whether tags are displayed the *leetcode* buffer.")
+
 (defvar leetcode-prefer-language "python3"
   "LeetCode programming language.
 c, cpp, csharp, golang, java, javascript, kotlin, php, python,
@@ -1104,11 +1119,9 @@ python3, ruby, rust, scala, swift, mysql, mssql, oraclesql.")
 
 (defun leetcode--get-problem-by-id (id)
   "Get problem from `leetcode--all-problems' by ID."
-  (let ((num (plist-get leetcode--all-problems :num))
-        (problems (plist-get leetcode--all-problems :problems)))
-    (when (or (< id 1) (> id num))
-      (user-error "Not found: No such problem with given id `%d'" id))
-    (aref problems (1- id))))
+  (seq-find (lambda (p)
+              (equal id (plist-get p :id)))
+            (plist-get leetcode--all-problems :problems)))
 
 (defun leetcode--get-problem-id (slug-title)
   "Get problem id by SLUG-TITLE."
@@ -1189,6 +1202,7 @@ major mode by `leetcode-prefer-language'and `auto-mode-alist'."
       (define-key map "s" #'leetcode-set-filter-regex)
       (define-key map "l" #'leetcode-set-prefer-language)
       (define-key map "t" #'leetcode-set-filter-tag)
+      (define-key map "T" #'leetcode-toggle-tag-display)
       (define-key map "d" #'leetcode-set-filter-difficulty)
       (define-key map "g" #'leetcode-refresh)
       (define-key map "G" #'leetcode-refresh-fetch)