Adjust judger folder structure

.gitignore

@@ -1,4 +1,5 @@
 target/
 Cargo.lock
 scripts/thirdparty/
-override.env
+override.env
+problem-packages/

.vscode/launch.json

@@ -13,7 +13,7 @@
         "serve"
       ],
       "stopAtEntry": false,
-      "cwd": "${workspaceFolder}/judger/workdirs/development",
+      "cwd": "${workspaceFolder}/judger/",
       "environment": [],
       "externalConsole": false,
       "MIMode": "gdb",

Dockerfile

@@ -17,10 +17,13 @@ RUN curl https://rclone.org/install.sh | bash
 
 RUN mkdir /workdir
 RUN mkdir /workdir/problem-package
-COPY judger/workdirs/docker/ /workdir
+COPY judger/.env /workdir/.env
+COPY judger/rclone.conf /workdir/rclone.conf
+RUN sed -i 's/127.0.0.1/host.docker.internal/g' /workdir/rclone.conf
 
 WORKDIR /workdir
 ENV RUST_LOG=DEBUG
 ENV PLATFORM_URI=http://host.docker.internal:8080/
+ENV ENABLE_RCLONE=true
 EXPOSE 8000
 CMD [ "judger", "serve" ]

judger/workdirs/development/override.example.env → judger/override.example.env

@@ -1,6 +1,5 @@
 # Description: This file is an example of the override.env file. 
 # You can copy this file to override.env and modify the values to override the default values.
 
-# In this example, we enable rclone and set the problem package path to rclone-problem-package.
-ENABLE_RCLONE=true
-PROBLEM_PACKAGE_PATH=rclone-problem-package
+# In this example, we enable rclone
+ENABLE_RCLONE=true

judger/src/option.rs

@@ -23,7 +23,7 @@ pub struct JudgerOpt {
     #[structopt(long, default_value = "oj-lab-problem-package")]
     pub problem_package_bucket: String,
     /// Where to store problem package
-    #[structopt(env = "PROBLEM_PACKAGE_PATH", default_value = "problem-package")]
+    #[structopt(env = "PROBLEM_PACKAGE_PATH", default_value = "problem-packages")]
     pub problem_package_dir: PathBuf,
 }