Merge branch 'master' of github.com:mdcpp/mdoj

mdcpp · Jul 16, 2024 · 468686d · 468686d
2 parents 9b35227 + 8f68bc6
commit 468686d
Show file tree

Hide file tree

Showing 50 changed files with 1,555 additions and 447 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -50,7 +50,7 @@ features = [
   "judger",
   "transport",
   "serde",
-  "extra_trait",
+  "extra_trait"
 ]
 
 [dependencies.postcard]

diff --git a/backend/migration/src/m20231207_000001_create_table.rs b/backend/migration/src/m20231207_000001_create_table.rs
@@ -107,7 +107,7 @@ enum Submit {
     Score,
 }
 #[derive(Iden)]
-enum Test {
+enum Testcase {
     Table,
     Id,
     UserId,
@@ -457,32 +457,37 @@ impl MigrationTrait for Migration {
         manager
             .create_table(
                 Table::create()
-                    .table(Test::Table)
+                    .table(Testcase::Table)
                     .if_not_exists()
                     .col(
-                        ColumnDef::new(Test::Id)
+                        ColumnDef::new(Testcase::Id)
                             .integer()
                             .not_null()
                             .auto_increment()
                             .primary_key(),
                     )
-                    .col(ColumnDef::new(Test::UserId).integer().not_null())
+                    .col(ColumnDef::new(Testcase::UserId).integer().not_null())
                     .foreign_key(
                         ForeignKey::create()
                             .name("fk-test-user")
-                            .from(Test::Table, Test::UserId)
+                            .from(Testcase::Table, Testcase::UserId)
                             .to(User::Table, User::Id),
                     )
-                    .col(ColumnDef::new(Test::ProblemId).integer().null())
+                    .col(ColumnDef::new(Testcase::ProblemId).integer().null())
                     .foreign_key(
                         ForeignKey::create()
                             .name("fk-test-user")
-                            .from(Test::Table, Test::ProblemId)
+                            .from(Testcase::Table, Testcase::ProblemId)
                             .to(Problem::Table, Problem::Id),
                     )
-                    .col(ColumnDef::new(Test::Input).binary().not_null())
-                    .col(ColumnDef::new(Test::Output).binary().not_null())
-                    .col(ColumnDef::new(Test::Score).unsigned().not_null().default(0))
+                    .col(ColumnDef::new(Testcase::Input).binary().not_null())
+                    .col(ColumnDef::new(Testcase::Output).binary().not_null())
+                    .col(
+                        ColumnDef::new(Testcase::Score)
+                            .unsigned()
+                            .not_null()
+                            .default(0),
+                    )
                     .to_owned(),
             )
             .await?;
@@ -703,7 +708,7 @@ impl MigrationTrait for Migration {
             .drop_table(Table::drop().table(Submit::Table).to_owned())
             .await?;
         manager
-            .drop_table(Table::drop().table(Test::Table).to_owned())
+            .drop_table(Table::drop().table(Testcase::Table).to_owned())
             .await?;
         manager
             .drop_table(Table::drop().table(Token::Table).to_owned())

diff --git a/backend/src/init/config.rs → backend/src/config.rs b/backend/src/init/config.rs → backend/src/config.rs
@@ -1,10 +1,13 @@
 use std::{path::PathBuf, str::FromStr};
 
-use super::Error;
+use crate::server;
+use crate::server::InitError;
 use ip_network::IpNetwork;
 use serde::{Deserialize, Serialize};
 use tokio::{fs, io::AsyncReadExt};
 
+pub use crate::server::PACKAGE_NAME;
+
 lazy_static::lazy_static! {
     pub static ref CONFIG_PATH: PathBuf=PathBuf::from_str(
         &std::env::var("CONFIG_PATH").unwrap_or("config.toml".to_string()))
@@ -130,7 +133,7 @@ impl Default for Imgur {
     }
 }
 
-pub async fn init() -> super::Result<GlobalConfig> {
+pub async fn init() -> server::Result<GlobalConfig> {
     let config_path = CONFIG_PATH.as_path();
     if fs::metadata(config_path).await.is_ok() {
         let mut buf = Vec::new();
@@ -140,10 +143,10 @@ pub async fn init() -> super::Result<GlobalConfig> {
         config
             .read_to_end(&mut buf)
             .await
-            .map_err(Error::ConfigRead)?;
+            .map_err(InitError::ConfigRead)?;
         let config =
             std::str::from_utf8(&buf).expect("Config file may container non-utf8 character");
-        let config: GlobalConfig = toml::from_str(config).map_err(Error::ConfigParse)?;
+        let config: GlobalConfig = toml::from_str(config).map_err(InitError::ConfigParse)?;
         Ok(config)
     } else {
         println!(
@@ -155,7 +158,7 @@ pub async fn init() -> super::Result<GlobalConfig> {
         let config_txt = toml::to_string(&config).unwrap();
         fs::write(config_path, config_txt)
             .await
-            .map_err(Error::ConfigWrite)?;
+            .map_err(InitError::ConfigWrite)?;
 
         println!(
             "Config generated, please edit {:?} before restart",

diff --git a/backend/src/controller/crypto.rs b/backend/src/controller/crypto.rs
@@ -3,7 +3,7 @@ use rand::{rngs::OsRng, Rng};
 use serde::{de::DeserializeOwned, Serialize};
 use tracing::Span;
 
-use crate::init::config::GlobalConfig;
+use crate::config::GlobalConfig;
 use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
 use blake2::{Blake2b512, Digest};