From a5cac129dd8b3f2c1a118341878ae8dc8d2f2220 Mon Sep 17 00:00:00 2001 From: reidlab Date: Tue, 17 Oct 2023 17:25:56 -0700 Subject: [PATCH] rework some imports --- src/endpoints/accounts/login_account.rs | 2 +- src/endpoints/accounts/register_account.rs | 10 +++--- .../accounts/update_account_settings.rs | 6 ++-- src/endpoints/levels/download_level.rs | 5 ++- src/endpoints/levels/get_levels.rs | 32 +++++++++---------- src/endpoints/levels/upload_level.rs | 6 ++-- src/endpoints/users/get_users.rs | 4 +-- src/helpers/accounts.rs | 4 +-- src/helpers/reupload.rs | 4 +-- src/main.rs | 9 ------ src/template_endpoints/account_management.rs | 4 +-- src/template_endpoints/login.rs | 2 +- src/template_endpoints/reupload.rs | 4 +-- 13 files changed, 41 insertions(+), 51 deletions(-) diff --git a/src/endpoints/accounts/login_account.rs b/src/endpoints/accounts/login_account.rs index 822f6a8..39107a7 100644 --- a/src/endpoints/accounts/login_account.rs +++ b/src/endpoints/accounts/login_account.rs @@ -40,7 +40,7 @@ pub fn login_account(input: Form) -> status::Custom<&'static s // account verification { - use crate::schema::accounts::dsl::*; + use db::schema::accounts::dsl::*; let query_result = accounts .select(id) diff --git a/src/endpoints/accounts/register_account.rs b/src/endpoints/accounts/register_account.rs index 86776fd..9f9cc3c 100644 --- a/src/endpoints/accounts/register_account.rs +++ b/src/endpoints/accounts/register_account.rs @@ -47,12 +47,12 @@ pub fn register_account(input: Form) -> status::Custom<&'st } // account management - use crate::models::{Account, NewAccount}; + use db::models::{Account, NewAccount}; let inserted_account: Account; { - use crate::schema::accounts::dsl::*; + use db::schema::accounts::dsl::*; let account_name_usage = accounts.filter(username.eq(input.userName.clone())).count().get_result::(connection) as Result; let account_name_used = account_name_usage.expect("database name query error") != 0; @@ -74,10 +74,10 @@ pub fn register_account(input: Form) -> status::Custom<&'st } // user management - use crate::models::{User, NewUser}; - + { - use crate::schema::users::dsl::*; + use db::models::{User, NewUser}; + use db::schema::users::dsl::*; let new_user = NewUser { account_id: inserted_account.id, diff --git a/src/endpoints/accounts/update_account_settings.rs b/src/endpoints/accounts/update_account_settings.rs index 380a3e9..e053a46 100644 --- a/src/endpoints/accounts/update_account_settings.rs +++ b/src/endpoints/accounts/update_account_settings.rs @@ -39,10 +39,10 @@ pub fn update_account_settings(input: Form) -> status Err(_) => return status::Custom(Status::Ok, "-1") }; - use crate::models::Account; - + { - use crate::schema::accounts::dsl::*; + use db::models::Account; + use db::schema::accounts::dsl::*; diesel::update(accounts) .filter(id.eq(account_id_val)) diff --git a/src/endpoints/levels/download_level.rs b/src/endpoints/levels/download_level.rs index 1949611..b96e754 100644 --- a/src/endpoints/levels/download_level.rs +++ b/src/endpoints/levels/download_level.rs @@ -27,9 +27,8 @@ pub struct FormDownloadLevel { pub fn download_level(input: Form) -> status::Custom<&'static str> { let connection = &mut db::establish_connection_pg(); - use crate::schema::{levels, users}; - - use crate::models::{Level, User}; + use db::schema::{levels, users}; + use db::models::{Level, User}; let mut response: Vec = Vec::new(); diff --git a/src/endpoints/levels/get_levels.rs b/src/endpoints/levels/get_levels.rs index 714c728..c39feed 100644 --- a/src/endpoints/levels/get_levels.rs +++ b/src/endpoints/levels/get_levels.rs @@ -44,8 +44,8 @@ pub struct FormGetLevels { pub fn get_levels(input: Form) -> status::Custom<&'static str> { let connection = &mut db::establish_connection_pg(); - use crate::schema::{levels, users}; - use crate::models::{Level, User}; + use db::schema::{levels, users}; + use db::models::{Level, User}; let mut can_see_unlisted = false; @@ -145,35 +145,35 @@ pub fn get_levels(input: Form) -> status::Custom<&'static str> { Some(demon_filter) => { match demon_filter { 1 => { - query = query.filter(levels::demon_difficulty.eq::(crate::difficulty::DemonDifficulty::Easy.to_demon_difficulty())); - count_query = count_query.filter(levels::demon_difficulty.eq::(crate::difficulty::DemonDifficulty::Easy.to_demon_difficulty())) + query = query.filter(levels::demon_difficulty.eq::(helpers::difficulty::DemonDifficulty::Easy.to_demon_difficulty())); + count_query = count_query.filter(levels::demon_difficulty.eq::(helpers::difficulty::DemonDifficulty::Easy.to_demon_difficulty())) }, 2 => { - query = query.filter(levels::demon_difficulty.eq::(crate::difficulty::DemonDifficulty::Medium.to_demon_difficulty())); - count_query = count_query.filter(levels::demon_difficulty.eq::(crate::difficulty::DemonDifficulty::Medium.to_demon_difficulty())) + query = query.filter(levels::demon_difficulty.eq::(helpers::difficulty::DemonDifficulty::Medium.to_demon_difficulty())); + count_query = count_query.filter(levels::demon_difficulty.eq::(helpers::difficulty::DemonDifficulty::Medium.to_demon_difficulty())) }, 3 => { - query = query.filter(levels::demon_difficulty.eq::(crate::difficulty::DemonDifficulty::Hard.to_demon_difficulty())); - count_query = count_query.filter(levels::demon_difficulty.eq::(crate::difficulty::DemonDifficulty::Hard.to_demon_difficulty())) + query = query.filter(levels::demon_difficulty.eq::(helpers::difficulty::DemonDifficulty::Hard.to_demon_difficulty())); + count_query = count_query.filter(levels::demon_difficulty.eq::(helpers::difficulty::DemonDifficulty::Hard.to_demon_difficulty())) }, 4 => { - query = query.filter(levels::demon_difficulty.eq::(crate::difficulty::DemonDifficulty::Insane.to_demon_difficulty())); - count_query = count_query.filter(levels::demon_difficulty.eq::(crate::difficulty::DemonDifficulty::Insane.to_demon_difficulty())) + query = query.filter(levels::demon_difficulty.eq::(helpers::difficulty::DemonDifficulty::Insane.to_demon_difficulty())); + count_query = count_query.filter(levels::demon_difficulty.eq::(helpers::difficulty::DemonDifficulty::Insane.to_demon_difficulty())) }, 5 => { - query = query.filter(levels::demon_difficulty.eq::(crate::difficulty::DemonDifficulty::Extreme.to_demon_difficulty())); - count_query = count_query.filter(levels::demon_difficulty.eq::(crate::difficulty::DemonDifficulty::Extreme.to_demon_difficulty())) + query = query.filter(levels::demon_difficulty.eq::(helpers::difficulty::DemonDifficulty::Extreme.to_demon_difficulty())); + count_query = count_query.filter(levels::demon_difficulty.eq::(helpers::difficulty::DemonDifficulty::Extreme.to_demon_difficulty())) }, _ => panic!("invalid demon filter!") } - query = query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::(crate::difficulty::LevelDifficulty::Demon.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::(crate::difficulty::LevelDifficulty::Demon.to_star_difficulty())))); - count_query = count_query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::(crate::difficulty::LevelDifficulty::Demon.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::(crate::difficulty::LevelDifficulty::Demon.to_star_difficulty())))) + query = query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::(helpers::difficulty::LevelDifficulty::Demon.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::(helpers::difficulty::LevelDifficulty::Demon.to_star_difficulty())))); + count_query = count_query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::(helpers::difficulty::LevelDifficulty::Demon.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::(helpers::difficulty::LevelDifficulty::Demon.to_star_difficulty())))) }, None => panic!("demon filter option with no demon filter argument") }, "-3" => { - query = query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::(crate::difficulty::LevelDifficulty::Auto.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::(crate::difficulty::LevelDifficulty::Auto.to_star_difficulty())))); - count_query = count_query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::(crate::difficulty::LevelDifficulty::Auto.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::(crate::difficulty::LevelDifficulty::Auto.to_star_difficulty())))) + query = query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::(helpers::difficulty::LevelDifficulty::Auto.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::(helpers::difficulty::LevelDifficulty::Auto.to_star_difficulty())))); + count_query = count_query.filter(diesel::BoolExpressionMethods::or(levels::difficulty.eq::(helpers::difficulty::LevelDifficulty::Auto.to_star_difficulty()), levels::difficulty.is_null().and(levels::community_difficulty.eq::(helpers::difficulty::LevelDifficulty::Auto.to_star_difficulty())))) }, // easy, normal, hard, harder, insane _ => { diff --git a/src/endpoints/levels/upload_level.rs b/src/endpoints/levels/upload_level.rs index a67206e..d241d00 100644 --- a/src/endpoints/levels/upload_level.rs +++ b/src/endpoints/levels/upload_level.rs @@ -113,10 +113,10 @@ pub fn upload_level(input: Form) -> status::Custom<&'static str } // data base 🤣😁 - use crate::models::{Level, NewLevel}; - + { - use crate::schema::levels::dsl::*; + use db::models::{Level, NewLevel}; + use db::schema::levels::dsl::*; if levels .filter(id.eq(input.levelID)) diff --git a/src/endpoints/users/get_users.rs b/src/endpoints/users/get_users.rs index 268f72d..a74a64b 100644 --- a/src/endpoints/users/get_users.rs +++ b/src/endpoints/users/get_users.rs @@ -18,8 +18,8 @@ pub fn get_users(input: Form) -> status::Custom<&'static str> { let connection = &mut db::establish_connection_pg(); // query users - use crate::schema::users::dsl::*; - use crate::models::User; + use db::schema::users::dsl::*; + use db::models::User; let mut query_users = users.into_boxed(); diff --git a/src/helpers/accounts.rs b/src/helpers/accounts.rs index 2f22c9e..27fc32d 100644 --- a/src/helpers/accounts.rs +++ b/src/helpers/accounts.rs @@ -10,7 +10,7 @@ pub enum AuthError { } pub fn auth(account_id: i32, password_val: Option, gjp_val: Option, gjp2_val: Option) -> Result<(i32, i32), AuthError> { - use crate::schema::accounts::dsl::*; + use db::schema::accounts::dsl::*; let connection = &mut db::establish_connection_pg(); @@ -57,7 +57,7 @@ pub fn auth(account_id: i32, password_val: Option, gjp_val: Option i32 { - use crate::schema::users::dsl::*; + use db::schema::users::dsl::*; let connection = &mut db::establish_connection_pg(); diff --git a/src/helpers/reupload.rs b/src/helpers/reupload.rs index a1a003b..f724def 100644 --- a/src/helpers/reupload.rs +++ b/src/helpers/reupload.rs @@ -11,8 +11,8 @@ pub static REUPLOAD_ACCOUNT_ID: RwLock = RwLock::new(0); pub fn init() { let connection = &mut db::establish_connection_pg(); - use crate::schema::{accounts, users}; - use crate::models::{Account, NewAccount, User, NewUser}; + use db::schema::{accounts, users}; + use db::models::{Account, NewAccount, User, NewUser}; match accounts::table .filter(accounts::username.eq(REUPLOAD_USER_NAME)) diff --git a/src/main.rs b/src/main.rs index 58456e6..7d80f43 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,19 +13,10 @@ use rocket::data::{Limits, ToByteUnit}; use rocket_dyn_templates::Template; mod db; -use db::*; - mod helpers; -use helpers::*; - mod endpoints; -use endpoints::*; - mod template_endpoints; -use template_endpoints::*; - mod config; -use config::*; #[get("/")] async fn files(file: PathBuf) -> Option { diff --git a/src/template_endpoints/account_management.rs b/src/template_endpoints/account_management.rs index ff33fde..4cd2d82 100644 --- a/src/template_endpoints/account_management.rs +++ b/src/template_endpoints/account_management.rs @@ -16,8 +16,8 @@ pub fn account_management(cookies: &CookieJar<'_>) -> Result match logged_in { Ok((username_val, _account_id_val, user_id_val)) => { - use crate::schema::users::dsl::*; - use crate::models::User; + use db::schema::users::dsl::*; + use db::models::User; let result = users .filter(id.eq(user_id_val)) diff --git a/src/template_endpoints/login.rs b/src/template_endpoints/login.rs index f1f6436..b13e43d 100644 --- a/src/template_endpoints/login.rs +++ b/src/template_endpoints/login.rs @@ -23,7 +23,7 @@ pub struct FormLogin { pub fn post_login(cookies: &CookieJar<'_>, input: Form) -> Template { let connection = &mut db::establish_connection_pg(); - use crate::schema::accounts::dsl::*; + use db::schema::accounts::dsl::*; let result = accounts .select((id, username)) diff --git a/src/template_endpoints/reupload.rs b/src/template_endpoints/reupload.rs index 9ab1e2e..7193b6d 100644 --- a/src/template_endpoints/reupload.rs +++ b/src/template_endpoints/reupload.rs @@ -71,8 +71,8 @@ pub async fn post_reupload(input: Form) -> Template { let gmd_file = reqwest::get(format!("https://history.geometrydash.eu/level/{}/{}/download/", remote_level_id, level.id)).await.expect("failed to fetch gmd file from remote server"); let level_data = helpers::levels::gmd_parse(&gmd_file.text().await.expect("failed to parse gmd file as text")); - use crate::schema::levels::dsl::*; - use crate::models::{Level, NewLevel}; + use db::schema::levels::dsl::*; + use db::models::{Level, NewLevel}; let new_level = NewLevel { name: level_data.get("k2").expect("level name not found").to_string(),