bug-fix: submission sync to async && approve accept

Author: ouyangjunyi

.vscode/launch.json

@@ -16,7 +16,16 @@
       "request": "launch",
       "name": "mine",
       "program": "${workspaceFolder}/bin/leetcode",
-      "args": ["submission", "-l", "C++", "-o", "submissions", "94"]
+      "args": [
+        "submission",
+        "-c",
+        "true",
+        "-l",
+        "C++",
+        "-o",
+        "submissions",
+        "94"
+      ]
     },
     {
       "type": "node",

lib/commands/submission.js

@@ -36,6 +36,12 @@ const cmd = {
         describe: 'Where to save submission code',
         default: '.'
       })
+      .option('c', {
+        alias: 'accept',
+        type: 'boolean',
+        describe: 'choose accept',
+        default: false
+      })
       .option('x', {
         alias: 'extra',
         type: 'boolean',
@@ -85,40 +91,35 @@ function doTask(problem, queue, cb) {
 }
 
 function exportSubmission(problem, argv, cb) {
-  core.getSubmissions(problem, function (e, submissions) {
+  core.getSubmissions(problem, function (e, submission) {
     if (e) return cb(e);
-    if (submissions.length === 0)
-      return cb('No submissions?');
-
-    // get obj list contain required filetype
-    submissions.map(submission => {
-      if ((argv.lang === 'all' || argv.lang === submission.lang) && submission.status_display === 'Accepted') {
-        submission.ac = true;
-        const data = _.extend({}, submission, problem);
-        // data.ac = true;
-        data.sid = submission.id;
-        const basename = file.fmt(config.file.submission, data);
-        const f = path.join(argv.outdir, basename + h.langToExt(submission.lang));
-
-        file.mkdir(argv.outdir);
-        // skip the existing cached submissions
-        if (file.exist(f))
-          return cb(null, chalk.underline(f));
-
-        core.getSubmission(submission, function (e, submission) {
-          if (e) return cb(e);
-
-          const opts = {
-            lang: submission.lang == 'C++' ? 'cpp' : submission.lang,
-            code: submission.code,
-            tpl: argv.extra ? 'detailed' : 'codeonly'
-          };
-          file.write(f, core.exportProblem(problem, opts));
-          cb(null, submission.ac ? chalk.green.underline(f)
-            : chalk.yellow.underline(f));
-        })
-      }
-    })
+
+    if ((argv.lang === 'all' || argv.lang === submission.lang)) {
+      submission.ac = submission.status_display === 'Accepted';
+      if (argv.accept && !submission.ac) return;
+      const data = _.extend({}, submission, problem);
+      data.sid = submission.id;
+      const basename = file.fmt(config.file.submission, data);
+      const f = path.join(argv.outdir, basename + h.langToExt(submission.lang));
+
+      file.mkdir(argv.outdir);
+      // skip the existing cached submissions
+      if (file.exist(f))
+        return cb(null, chalk.underline(f));
+
+      core.getSubmission(submission, function (e, submission) {
+        if (e) return cb(e);
+
+        const opts = {
+          lang: submission.lang == 'C++' ? 'cpp' : submission.lang,
+          code: submission.code,
+          tpl: argv.extra ? 'detailed' : 'codeonly'
+        };
+        file.write(f, core.exportProblem(problem, opts));
+        cb(null, submission.ac ? chalk.green.underline(f)
+          : chalk.yellow.underline(f));
+      })
+    }
   });
 }
 

lib/plugins/leetcode.js

@@ -352,38 +352,28 @@ plugin.getSubmissions = async (problem, cb) => {
 
     // FIXME: this only return the 1st 20 submissions, we should get next if necessary.
     const submissions = JSON.parse(body).submissions_dump;
-    Promise.all(
-      submissions.map(async (submission) => {
-        submission.id = _.last(_.compact(submission.url.split("/")));
-        const codeOpts = plugin.makeOpts(config.sys.urls.graphql);
-        codeOpts.headers.Origin = config.sys.urls.base;
-        codeOpts.headers.Referer = config.sys.urls.problem.replace(
-          "$slug",
-          problem.slug
-        );
-        codeOpts.json = true;
-        codeOpts.body = {
-          query: [
-            "query mySubmissionDetail($id: ID!) {",
-            "submissionDetail(submissionId: $id) { code} ",
-            "}",
-          ].join("\n"),
-          variables: { id: submission.id },
-        };
-        await new Promise((res, rej) => {
-          request.post(codeOpts, function (e, resp, body) {
-            submission.code = body.data.submissionDetail.code;
-            res();
-          });
-        });
-      })
-    )
-      .then(() => {
-        return cb(null, submissions);
-      })
-      .catch((err) => {
-        console.log(err);
+    submissions.map(async (submission) => {
+      submission.id = _.last(_.compact(submission.url.split("/")));
+      const codeOpts = plugin.makeOpts(config.sys.urls.graphql);
+      codeOpts.headers.Origin = config.sys.urls.base;
+      codeOpts.headers.Referer = config.sys.urls.problem.replace(
+        "$slug",
+        problem.slug
+      );
+      codeOpts.json = true;
+      codeOpts.body = {
+        query: [
+          "query mySubmissionDetail($id: ID!) {",
+          "submissionDetail(submissionId: $id) { code} ",
+          "}",
+        ].join("\n"),
+        variables: { id: submission.id },
+      };
+      request.post(codeOpts, function (e, resp, body) {
+        submission.code = body.data.submissionDetail.code;
+        cb(null, submission)
       });
+    });
   });
 };