测试数据上传时自动读取config

hydro/handler/import.js

@@ -1,3 +1,6 @@
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
 const problem = require('../model/problem');
 const { Route, Handler } = require('../service/server');
 const { PERM_CREATE_PROBLEM } = require('../permission');
@@ -29,7 +32,14 @@ class ProblemImportHandler extends Handler {
         if (pid) pdoc.pid = pid;
         if (hidden) pdoc.hidden = true;
         const docId = await problem.add(domainId, pdoc.title, pdoc.content, this.user._id, pdoc);
-        await problem.setTestdata(docId, testdata);
+        const file = path.resolve(os.tmpdir(), 'hydro', `import_${domainId}_${pid}.zip`);
+        const w = fs.createWriteStream(file);
+        await new Promise((resolve, reject) => {
+            w.on('finish', resolve);
+            w.on('error', reject);
+            testdata.pipe(w);
+        });
+        await problem.setTestdata(domainId, docId, file);
         this.response.body = { pid: pid || docId };
         this.response.redirect = `/p/${pid || docId}/settings`;
     }

hydro/handler/problem.js

@@ -79,9 +79,15 @@ class ProblemHandler extends Handler {
 class ProblemCategoryHandler extends ProblemHandler {
     async get({ domainId, page = 1, category }) {
         this.response.template = 'problem_main.html';
-        const q = {
-            $or: [{ category }, { tag: category }],
-        };
+        const q = { $and: [] };
+        for (const name of category) {
+            q.$and.push({
+                $or: [
+                    { category: { $elemMatch: { $eq: name } } },
+                    { tag: { $elemMatch: { $eq: name } } },
+                ],
+            });
+        }
         let psdict = {};
         if (!this.user.hasPerm(PERM_VIEW_PROBLEM_HIDDEN)) q.hidden = false;
         const [pdocs, ppcount, pcount] = await paginate(
@@ -97,10 +103,10 @@ class ProblemCategoryHandler extends ProblemHandler {
         const path = [
             ['Hydro', 'homepage'],
             ['problem_main', 'problem_main'],
-            [category, null, true],
+            [category, null, null, true],
         ];
         this.response.body = {
-            path, page, pcount, ppcount, pdocs, psdict, category,
+            path, page, pcount, ppcount, pdocs, psdict, category: category.join('+'),
         };
     }
 }
@@ -295,8 +301,7 @@ class ProblemDataUploadHandler extends ProblemManageHandler {
 
     async post({ domainId }) {
         if (!this.request.files.file) throw new BadRequestError();
-        const r = fs.createReadStream(this.request.files.file.path);
-        await problem.setTestdata(domainId, this.pdoc.docId, r);
+        await problem.setTestdata(domainId, this.pdoc.docId, this.request.files.file.path);
         if (this.pdoc.data && typeof this.pdoc.data === 'object') {
             const f = await file.getMeta(this.pdoc.data);
             this.md5 = f.md5;