Implement 'list -q'

* remove 'list -l|-D', use unified query parameter.

Signed-off-by: Eric Wang <skygragon@gmail.com>

Author: skygragon

README.md

@@ -58,8 +58,7 @@ Navigate all the problems. The heading `✔` means you have AC-ed the problem.
     ✔ [  2] Add Two Numbers                                              Medium (24.5%)
     ✔ [  1] Two Sum                                                      Easy   (25.6%)
 
-* `-D` to only show undone problems.
-* `-l` to filter by level.
+* `-q` to filter by query conditions.
 * `-s` to show statistic counters.
 * `lc list <keyword>` to search by keyword.
 
@@ -150,7 +149,7 @@ Copy `.lc-completion.bash` to your home directory, and source it in .bashrc (Lin
 	$ source ~/.bashrc
 
 	$ lc list --<tab>
-	--help     --keyword  --level    --stat     --undone
+	--help     --keyword  --query    --stat
 
 ### Colorful Output
 

lib/commands/list.js

@@ -10,41 +10,60 @@ var cmd = {
   builder: {
     keyword: {
       type:     'string',
-      describe: 'keyword used to search problems.'
+      describe: 'Filter problems by keyword.'
     },
-    level: {
-      alias:    'l',
-      choices:  ['easy', 'medium', 'hard', 'e', 'm', 'h'],
-      describe: 'Filter problems by level.'
+    query: {
+      alias:    'q',
+      type:     'string',
+      describe: 'Filter problems by conditions.\n' +
+                'e(easy),m(medium),h(hard),d(done),l(locked)\n' +
+                'Uppercase means "not", e.g. D(not done)'
     },
     stat: {
       alias:    's',
       type:     'boolean',
-      describe: 'Show stats of the problems.'
-    },
-    undone: {
-      alias:    'D',
-      type:     'boolean',
-      describe: 'List undone problems.'
+      describe: 'Show stats of the listed problems.'
     }
   }
 };
 
+function byLevel(x, q) {
+  return x.level[0].toLowerCase() === q.toLowerCase();
+}
+
+function byStateAC(x, q) {
+  return x.state === 'ac';
+}
+
+function byLocked(x, q) {
+  return x.locked;
+}
+
+var QUERY_HANDLERS = {
+  e: byLevel,
+  E: _.negate(byLevel),
+  m: byLevel,
+  M: _.negate(byLevel),
+  h: byLevel,
+  H: _.negate(byLevel),
+  l: byLocked,
+  L: _.negate(byLocked),
+  d: byStateAC,
+  D: _.negate(byStateAC)
+};
+
 cmd.handler = function(argv) {
   core.getProblems(function(e, problems) {
     if (e) return console.log('ERROR:', e);
 
     var all = problems.length;
 
-    if (argv.undone) {
-      problems = _.filter(problems, function(x) {
-        return x.state !== 'ac';
-      });
-    }
+    if (argv.query) {
+      argv.query.split('').forEach(function(q) {
+        var f = QUERY_HANDLERS[q];
+        if (!f) return;
 
-    if (argv.level) {
-      problems = _.filter(problems, function(x) {
-        return x.level[0].toLowerCase() === argv.level[0];
+        problems = _.filter(problems, _.partial(f, _, q));
       });
     }