Compare commits
2 Commits
2ed2b864b2
...
97b7bfb7fb
Author | SHA1 | Date | |
---|---|---|---|
97b7bfb7fb | |||
8f76e92804 |
26
.vscode/launch.json
vendored
26
.vscode/launch.json
vendored
@ -4,25 +4,6 @@
|
||||
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"type": "lldb",
|
||||
"request": "launch",
|
||||
"name": "debug quirks_path lib",
|
||||
"cargo": {
|
||||
"args": [
|
||||
"test",
|
||||
"--no-run",
|
||||
"--lib",
|
||||
"--package=quirks_path"
|
||||
],
|
||||
"filter": {
|
||||
"name": "quirks_path",
|
||||
"kind": "lib"
|
||||
}
|
||||
},
|
||||
"args": [],
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
{
|
||||
"type": "lldb",
|
||||
"request": "launch",
|
||||
@ -39,8 +20,9 @@
|
||||
}
|
||||
},
|
||||
"args": [
|
||||
"start",
|
||||
"--environment",
|
||||
"recorder/development"
|
||||
"development"
|
||||
],
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
@ -61,14 +43,14 @@
|
||||
},
|
||||
"args": [
|
||||
"--environment",
|
||||
"recorder/development"
|
||||
"development"
|
||||
],
|
||||
"cwd": "${workspaceFolder}"
|
||||
},
|
||||
{
|
||||
"type": "lldb",
|
||||
"request": "launch",
|
||||
"name": "debug record lib",
|
||||
"name": "debug recorder lib",
|
||||
"cargo": {
|
||||
"args": [
|
||||
"test",
|
||||
|
910
Cargo.lock
generated
910
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -4,6 +4,11 @@ resolver = "2"
|
||||
|
||||
[patch.crates-io]
|
||||
testcontainers = { git = "https://github.com/testcontainers/testcontainers-rs.git", rev = "af21727" }
|
||||
# loco-rs = { git = "https://github.com/lonelyhentxi/loco.git", rev = "beb890e" }
|
||||
# loco-rs = { git = "https://github.com/loco-rs/loco.git" }
|
||||
async-graphql = { git = "https://github.com/aumetra/async-graphql.git", rev = "690ece7" }
|
||||
async-graphql-axum = { git = "https://github.com/aumetra/async-graphql.git", rev = "690ece7" }
|
||||
jwt-authorizer = { git = "https://github.com/blablacio/jwt-authorizer.git", rev = "e956774" }
|
||||
|
||||
# [patch."https://github.com/lonelyhentxi/qbit.git"]
|
||||
# qbit-rs = { path = "./patches/qbit-rs" }
|
||||
|
@ -1,2 +1,2 @@
|
||||
^https://konobangu.com/*** http://127.0.0.1:5000/$1
|
||||
^wss://konobangu.com/*** ws://127.0.0.1:5000/$1
|
||||
^https://konobangu.com/*** http://127.0.0.1:5000/$1 excludeFilter://^https://konobangu.com/api/***
|
||||
^wss://konobangu.com/*** ws://127.0.0.1:5000/$1 ^excludeFilter://^wss://konobangu.com/api/***
|
@ -1 +1 @@
|
||||
^https://recorder.konobangu.com/*** http://127.0.0.1:7600/$1
|
||||
^https://konobangu.com/api/*** http://127.0.0.1:5001/api/$1
|
@ -22,7 +22,7 @@ testcontainers = [
|
||||
]
|
||||
|
||||
[dependencies]
|
||||
loco-rs = { version = "0.13" }
|
||||
loco-rs = { version = "0.14" }
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
serde_json = "1"
|
||||
tokio = { version = "1.42", features = ["macros", "fs", "rt-multi-thread"] }
|
||||
@ -38,11 +38,17 @@ sea-orm = { version = "1", features = [
|
||||
] }
|
||||
figment = { version = "0.10", features = ["toml", "json", "env", "yaml"] }
|
||||
|
||||
axum = "0.7.9"
|
||||
axum = "0.8"
|
||||
uuid = { version = "1.6.0", features = ["v4"] }
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
|
||||
sea-orm-migration = { version = "1", features = ["runtime-tokio-rustls"] }
|
||||
reqwest = { version = "0.12.9" }
|
||||
reqwest = { version = "0.12", features = [
|
||||
"charset",
|
||||
"http2",
|
||||
"json",
|
||||
"macos-system-configuration",
|
||||
"rustls-tls",
|
||||
] }
|
||||
thiserror = "2"
|
||||
rss = "2"
|
||||
bytes = "1.9"
|
||||
@ -64,7 +70,6 @@ scraper = "0.22.0"
|
||||
leaky-bucket = "1.1.2"
|
||||
serde_with = "3"
|
||||
jwt-authorizer = "0.15.0"
|
||||
axum-auth = "0.7.0"
|
||||
futures = "0.3.31"
|
||||
librqbit-core = "4"
|
||||
qbit-rs = { git = "https://github.com/lonelyhentxi/qbit.git", rev = "72d53138ebe", features = [
|
||||
@ -91,8 +96,11 @@ async-graphql-axum = "7.0.13"
|
||||
fastrand = "2.3.0"
|
||||
seaography = "1.1.2"
|
||||
quirks_path = "0.1.0"
|
||||
base64 = "0.22.1"
|
||||
tower = "0.5.2"
|
||||
axum-extra = "0.10.0"
|
||||
|
||||
[dev-dependencies]
|
||||
serial_test = "3"
|
||||
loco-rs = { version = "0.13", features = ["testing"] }
|
||||
loco-rs = { version = "0.14", features = ["testing"] }
|
||||
insta = { version = "1", features = ["redactions", "yaml", "filters"] }
|
||||
|
@ -58,6 +58,8 @@ server:
|
||||
# - POST
|
||||
# Set the value of the [`Access-Control-Max-Age`][mdn] header in seconds
|
||||
# max_age: 3600
|
||||
fallback:
|
||||
enable: false
|
||||
|
||||
# Worker Configuration
|
||||
workers:
|
@ -19,7 +19,6 @@ use recorder::{
|
||||
use sea_orm_migration::MigratorTrait;
|
||||
|
||||
async fn pull_mikan_bangumi_rss(ctx: &AppContext) -> color_eyre::eyre::Result<()> {
|
||||
color_eyre::install()?;
|
||||
let rss_link = "https://mikanani.me/RSS/Bangumi?bangumiId=3416&subgroupid=370";
|
||||
|
||||
// let rss_link =
|
||||
@ -49,10 +48,7 @@ async fn pull_mikan_bangumi_rss(ctx: &AppContext) -> color_eyre::eyre::Result<()
|
||||
}
|
||||
|
||||
async fn init() -> color_eyre::eyre::Result<AppContext> {
|
||||
tracing_subscriber::fmt()
|
||||
.with_max_level(tracing::Level::INFO)
|
||||
.with_test_writer()
|
||||
.init();
|
||||
color_eyre::install()?;
|
||||
let ctx = loco_rs::cli::playground::<App>().await?;
|
||||
let BootResult {
|
||||
app_context: ctx, ..
|
||||
@ -66,15 +62,5 @@ async fn main() -> color_eyre::eyre::Result<()> {
|
||||
let ctx = init().await?;
|
||||
pull_mikan_bangumi_rss(&ctx).await?;
|
||||
|
||||
// let active_model: articles::ActiveModel = ActiveModel {
|
||||
// title: Set(Some("how to build apps in 3 steps".to_string())),
|
||||
// content: Set(Some("use Loco: https://loco.rs".to_string())),
|
||||
// ..Default::default()
|
||||
// };
|
||||
// active_model.insert(&ctx.db).await.unwrap();
|
||||
|
||||
// let res = articles::Entity::find().all(&ctx.db).await.unwrap();
|
||||
// println!("{:?}", res);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
@ -5,6 +5,7 @@ use loco_rs::{
|
||||
app::{AppContext, Hooks},
|
||||
boot::{create_app, BootResult, StartMode},
|
||||
cache,
|
||||
config::Config,
|
||||
controller::AppRoutes,
|
||||
db::truncate_table,
|
||||
environment::Environment,
|
||||
@ -12,10 +13,9 @@ use loco_rs::{
|
||||
task::Tasks,
|
||||
Result,
|
||||
};
|
||||
use sea_orm::DatabaseConnection;
|
||||
|
||||
use crate::{
|
||||
auth::service::AppAuthService,
|
||||
auth::service::{AppAuthService, AppAuthServiceInitializer},
|
||||
controllers::{self},
|
||||
dal::{AppDalClient, AppDalInitalizer},
|
||||
extract::mikan::{client::AppMikanClientInitializer, AppMikanClient},
|
||||
@ -25,6 +25,8 @@ use crate::{
|
||||
workers::subscription_worker::SubscriptionWorker,
|
||||
};
|
||||
|
||||
pub const CONFIG_FOLDER: &str = "LOCO_CONFIG_FOLDER";
|
||||
|
||||
pub trait AppContextExt {
|
||||
fn get_dal_client(&self) -> &AppDalClient {
|
||||
AppDalClient::app_instance()
|
||||
@ -49,6 +51,20 @@ pub struct App;
|
||||
|
||||
#[async_trait]
|
||||
impl Hooks for App {
|
||||
async fn load_config(env: &Environment) -> Result<Config> {
|
||||
std::env::var(CONFIG_FOLDER).map_or_else(
|
||||
|_| {
|
||||
let monorepo_project_config_dir = Path::new("./apps/recorder/config");
|
||||
if monorepo_project_config_dir.exists() && monorepo_project_config_dir.is_dir() {
|
||||
return env.load_from_folder(monorepo_project_config_dir);
|
||||
}
|
||||
let current_config_dir = Path::new("./config");
|
||||
env.load_from_folder(current_config_dir)
|
||||
},
|
||||
|config_folder| env.load_from_folder(Path::new(&config_folder)),
|
||||
)
|
||||
}
|
||||
|
||||
fn app_name() -> &'static str {
|
||||
env!("CARGO_CRATE_NAME")
|
||||
}
|
||||
@ -58,6 +74,7 @@ impl Hooks for App {
|
||||
Box::new(AppDalInitalizer),
|
||||
Box::new(AppMikanClientInitializer),
|
||||
Box::new(AppGraphQLServiceInitializer),
|
||||
Box::new(AppAuthServiceInitializer),
|
||||
];
|
||||
|
||||
Ok(initializers)
|
||||
@ -73,15 +90,19 @@ impl Hooks for App {
|
||||
)
|
||||
}
|
||||
|
||||
async fn boot(mode: StartMode, environment: &Environment) -> Result<BootResult> {
|
||||
create_app::<Self, Migrator>(mode, environment).await
|
||||
async fn boot(
|
||||
mode: StartMode,
|
||||
environment: &Environment,
|
||||
config: Config,
|
||||
) -> Result<BootResult> {
|
||||
create_app::<Self, Migrator>(mode, environment, config).await
|
||||
}
|
||||
|
||||
fn routes(ctx: &AppContext) -> AppRoutes {
|
||||
AppRoutes::with_default_routes()
|
||||
.prefix("/api")
|
||||
.add_route(controllers::subscribers::routes())
|
||||
.add_route(controllers::graphql::routes(ctx.get_graphql_service()))
|
||||
.add_route(controllers::auth::routes())
|
||||
.add_route(controllers::graphql::routes(ctx.clone()))
|
||||
}
|
||||
|
||||
async fn connect_workers(ctx: &AppContext, queue: &Queue) -> Result<()> {
|
||||
@ -98,12 +119,12 @@ impl Hooks for App {
|
||||
|
||||
fn register_tasks(_tasks: &mut Tasks) {}
|
||||
|
||||
async fn truncate(db: &DatabaseConnection) -> Result<()> {
|
||||
truncate_table(db, subscribers::Entity).await?;
|
||||
async fn truncate(ctx: &AppContext) -> Result<()> {
|
||||
truncate_table(&ctx.db, subscribers::Entity).await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn seed(_db: &DatabaseConnection, _base: &Path) -> Result<()> {
|
||||
async fn seed(_ctx: &AppContext, _base: &Path) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
use async_trait::async_trait;
|
||||
use axum::{http::request::Parts, RequestPartsExt};
|
||||
use axum_auth::AuthBasic;
|
||||
use axum::http::request::Parts;
|
||||
use base64::{self, Engine};
|
||||
use reqwest::header::AUTHORIZATION;
|
||||
|
||||
use super::{
|
||||
config::BasicAuthConfig,
|
||||
@ -9,6 +10,48 @@ use super::{
|
||||
};
|
||||
use crate::models::{auth::AuthType, subscribers::SEED_SUBSCRIBER};
|
||||
|
||||
#[derive(Debug, PartialEq, Eq, Clone)]
|
||||
pub struct AuthBasic {
|
||||
pub user: String,
|
||||
pub password: Option<String>,
|
||||
}
|
||||
|
||||
impl AuthBasic {
|
||||
fn decode_request_parts(req: &mut Parts) -> Result<Self, AuthError> {
|
||||
let authorization = req
|
||||
.headers
|
||||
.get(AUTHORIZATION)
|
||||
.and_then(|s| s.to_str().ok())
|
||||
.ok_or_else(|| AuthError::BasicInvalidCredentials)?;
|
||||
|
||||
let split = authorization.split_once(' ');
|
||||
|
||||
match split {
|
||||
Some((name, contents)) if name == "Basic" => {
|
||||
let decoded = base64::engine::general_purpose::STANDARD
|
||||
.decode(contents)
|
||||
.map_err(|_| AuthError::BasicInvalidCredentials)?;
|
||||
|
||||
let decoded =
|
||||
String::from_utf8(decoded).map_err(|_| AuthError::BasicInvalidCredentials)?;
|
||||
|
||||
Ok(if let Some((user, password)) = decoded.split_once(':') {
|
||||
Self {
|
||||
user: String::from(user),
|
||||
password: Some(String::from(password)),
|
||||
}
|
||||
} else {
|
||||
Self {
|
||||
user: decoded,
|
||||
password: None,
|
||||
}
|
||||
})
|
||||
}
|
||||
_ => Err(AuthError::BasicInvalidCredentials),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct BasicAuthService {
|
||||
pub config: BasicAuthConfig,
|
||||
@ -17,7 +60,11 @@ pub struct BasicAuthService {
|
||||
#[async_trait]
|
||||
impl AuthService for BasicAuthService {
|
||||
async fn extract_user_info(&self, request: &mut Parts) -> Result<AuthUserInfo, AuthError> {
|
||||
if let Ok(AuthBasic((found_user, found_password))) = request.extract().await {
|
||||
if let Ok(AuthBasic {
|
||||
user: found_user,
|
||||
password: found_password,
|
||||
}) = AuthBasic::decode_request_parts(request)
|
||||
{
|
||||
if self.config.user == found_user
|
||||
&& self.config.password == found_password.unwrap_or_default()
|
||||
{
|
||||
|
@ -1,6 +1,7 @@
|
||||
use axum::{
|
||||
http::StatusCode,
|
||||
response::{IntoResponse, Response},
|
||||
Json,
|
||||
};
|
||||
use thiserror::Error;
|
||||
|
||||
@ -30,6 +31,6 @@ pub enum AuthError {
|
||||
|
||||
impl IntoResponse for AuthError {
|
||||
fn into_response(self) -> Response {
|
||||
(StatusCode::UNAUTHORIZED, self.to_string()).into_response()
|
||||
(StatusCode::UNAUTHORIZED, Json(self.to_string())).into_response()
|
||||
}
|
||||
}
|
||||
|
@ -3,7 +3,6 @@ use axum::{
|
||||
extract::FromRequestParts,
|
||||
http::request::Parts,
|
||||
response::{IntoResponse as _, Response},
|
||||
Extension,
|
||||
};
|
||||
use jwt_authorizer::{JwtAuthorizer, Validation};
|
||||
use loco_rs::app::{AppContext, Initializer};
|
||||
@ -22,22 +21,17 @@ pub struct AuthUserInfo {
|
||||
pub auth_type: AuthType,
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl<S> FromRequestParts<S> for AuthUserInfo
|
||||
where
|
||||
S: Send + Sync,
|
||||
{
|
||||
impl FromRequestParts<AppContext> for AuthUserInfo {
|
||||
type Rejection = Response;
|
||||
|
||||
async fn from_request_parts(req: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
|
||||
let Extension(ctx) = Extension::<AppContext>::from_request_parts(req, state)
|
||||
.await
|
||||
.expect("AppContext should be present");
|
||||
|
||||
let auth_service = ctx.get_auth_service();
|
||||
async fn from_request_parts(
|
||||
parts: &mut Parts,
|
||||
state: &AppContext,
|
||||
) -> Result<Self, Self::Rejection> {
|
||||
let auth_service = state.get_auth_service();
|
||||
|
||||
auth_service
|
||||
.extract_user_info(req)
|
||||
.extract_user_info(parts)
|
||||
.await
|
||||
.map_err(|err| err.into_response())
|
||||
}
|
||||
|
@ -1,19 +1,40 @@
|
||||
use async_graphql::http::{playground_source, GraphQLPlaygroundConfig};
|
||||
use async_graphql_axum::GraphQL;
|
||||
use axum::response::Html;
|
||||
use loco_rs::prelude::*;
|
||||
use async_graphql_axum::{GraphQLRequest, GraphQLResponse};
|
||||
use axum::{
|
||||
extract::State,
|
||||
middleware::from_extractor_with_state,
|
||||
response::{Html, IntoResponse},
|
||||
routing::{get, post},
|
||||
};
|
||||
use loco_rs::{app::AppContext, prelude::Routes};
|
||||
|
||||
use crate::graphql::service::AppGraphQLService;
|
||||
use crate::{app::AppContextExt, auth::AuthUserInfo};
|
||||
|
||||
pub async fn graphql_playground() -> impl IntoResponse {
|
||||
async fn graphql_playground() -> impl IntoResponse {
|
||||
Html(playground_source(GraphQLPlaygroundConfig::new(
|
||||
"/api/graphql",
|
||||
)))
|
||||
}
|
||||
|
||||
pub fn routes(graphql_service: &AppGraphQLService) -> Routes {
|
||||
Routes::new().prefix("/graphql").add(
|
||||
"/",
|
||||
get(graphql_playground).post_service(GraphQL::new(graphql_service.schema.clone())),
|
||||
)
|
||||
async fn graphql_handler(
|
||||
State(ctx): State<AppContext>,
|
||||
auth_user_info: AuthUserInfo,
|
||||
req: GraphQLRequest,
|
||||
) -> GraphQLResponse {
|
||||
let graphql_service = ctx.get_graphql_service();
|
||||
let mut req = req.into_inner();
|
||||
req = req.data(auth_user_info);
|
||||
|
||||
graphql_service.schema.execute(req).await.into()
|
||||
}
|
||||
|
||||
pub fn routes(state: AppContext) -> Routes {
|
||||
Routes::new()
|
||||
.prefix("/graphql")
|
||||
.add("/playground", get(graphql_playground))
|
||||
.add(
|
||||
"/",
|
||||
post(graphql_handler)
|
||||
.layer(from_extractor_with_state::<AuthUserInfo, AppContext>(state)),
|
||||
)
|
||||
}
|
||||
|
@ -1,2 +1,2 @@
|
||||
pub mod auth;
|
||||
pub mod graphql;
|
||||
pub mod subscribers;
|
||||
|
@ -1,5 +1,5 @@
|
||||
pub mod config;
|
||||
pub mod query_root;
|
||||
pub mod service;
|
||||
pub mod config;
|
||||
|
||||
pub use query_root::schema;
|
||||
pub use query_root::schema;
|
||||
|
@ -2,7 +2,11 @@ use async_graphql::dynamic::*;
|
||||
use sea_orm::DatabaseConnection;
|
||||
use seaography::{Builder, BuilderContext};
|
||||
|
||||
lazy_static::lazy_static! { static ref CONTEXT : BuilderContext = BuilderContext :: default () ; }
|
||||
lazy_static::lazy_static! { static ref CONTEXT : BuilderContext = {
|
||||
BuilderContext {
|
||||
..Default::default()
|
||||
}
|
||||
}; }
|
||||
|
||||
pub fn schema(
|
||||
database: DatabaseConnection,
|
||||
@ -15,7 +19,6 @@ pub fn schema(
|
||||
seaography::register_entities!(
|
||||
builder,
|
||||
[
|
||||
auth,
|
||||
bangumi,
|
||||
downloaders,
|
||||
downloads,
|
||||
@ -28,7 +31,6 @@ pub fn schema(
|
||||
);
|
||||
|
||||
{
|
||||
builder.register_enumeration::<auth::AuthType>();
|
||||
builder.register_enumeration::<downloads::DownloadStatus>();
|
||||
builder.register_enumeration::<subscriptions::SubscriptionCategory>();
|
||||
builder.register_enumeration::<downloaders::DownloaderCategory>();
|
||||
@ -36,6 +38,7 @@ pub fn schema(
|
||||
}
|
||||
|
||||
let schema = builder.schema_builder();
|
||||
|
||||
let schema = if let Some(depth) = depth {
|
||||
schema.limit_depth(depth)
|
||||
} else {
|
||||
|
@ -1,5 +1,4 @@
|
||||
use async_trait::async_trait;
|
||||
use loco_rs::schema::jsonb_null;
|
||||
use sea_orm_migration::{prelude::*, schema::*};
|
||||
|
||||
use super::defs::{
|
||||
@ -27,7 +26,7 @@ impl MigrationTrait for Migration {
|
||||
.col(pk_auto(Subscribers::Id))
|
||||
.col(string_len_uniq(Subscribers::Pid, 64))
|
||||
.col(string(Subscribers::DisplayName))
|
||||
.col(jsonb_null(Subscribers::BangumiConf))
|
||||
.col(json_binary_null(Subscribers::BangumiConf))
|
||||
.to_owned(),
|
||||
)
|
||||
.await?;
|
||||
@ -101,13 +100,13 @@ impl MigrationTrait for Migration {
|
||||
.col(text_null(Bangumi::SeasonRaw))
|
||||
.col(text_null(Bangumi::Fansub))
|
||||
.col(text_null(Bangumi::MikanFansubId))
|
||||
.col(jsonb_null(Bangumi::Filter))
|
||||
.col(json_binary_null(Bangumi::Filter))
|
||||
.col(text_null(Bangumi::RssLink))
|
||||
.col(text_null(Bangumi::PosterLink))
|
||||
.col(text_null(Bangumi::SavePath))
|
||||
.col(boolean(Bangumi::Deleted).default(false))
|
||||
.col(text_null(Bangumi::Homepage))
|
||||
.col(jsonb_null(Bangumi::Extra))
|
||||
.col(json_binary_null(Bangumi::Extra))
|
||||
.foreign_key(
|
||||
ForeignKey::create()
|
||||
.name("fk_bangumi_subscriber_id")
|
||||
@ -214,7 +213,7 @@ impl MigrationTrait for Migration {
|
||||
.col(text_null(Episodes::Subtitle))
|
||||
.col(boolean(Episodes::Deleted).default(false))
|
||||
.col(text_null(Episodes::Source))
|
||||
.col(jsonb_null(Episodes::Extra))
|
||||
.col(json_binary_null(Episodes::Extra))
|
||||
.foreign_key(
|
||||
ForeignKey::create()
|
||||
.name("fk_episodes_bangumi_id")
|
||||
|
@ -45,11 +45,5 @@ impl Related<super::subscribers::Entity> for Entity {
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelatedEntity)]
|
||||
pub enum RelatedEntity {
|
||||
#[sea_orm(entity = "super::subscribers::Entity")]
|
||||
Subscriber,
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl ActiveModelBehavior for ActiveModel {}
|
||||
|
@ -1,3 +1,4 @@
|
||||
use async_graphql::SimpleObject;
|
||||
use async_trait::async_trait;
|
||||
use loco_rs::app::AppContext;
|
||||
use sea_orm::{entity::prelude::*, sea_query::OnConflict, ActiveValue, FromJsonQueryResult};
|
||||
@ -5,13 +6,19 @@ use serde::{Deserialize, Serialize};
|
||||
|
||||
use super::subscription_bangumi;
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, FromJsonQueryResult)]
|
||||
#[derive(
|
||||
Clone, Debug, PartialEq, Eq, Serialize, Deserialize, FromJsonQueryResult, SimpleObject,
|
||||
)]
|
||||
#[graphql(name = "BangumiFilter")]
|
||||
pub struct BangumiFilter {
|
||||
pub name: Option<Vec<String>>,
|
||||
pub group: Option<Vec<String>>,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, FromJsonQueryResult)]
|
||||
#[derive(
|
||||
Clone, Debug, PartialEq, Eq, Serialize, Deserialize, FromJsonQueryResult, SimpleObject,
|
||||
)]
|
||||
#[graphql(name = "BangumiExtra")]
|
||||
pub struct BangumiExtra {
|
||||
pub name_zh: Option<String>,
|
||||
pub s_name_zh: Option<String>,
|
||||
@ -21,14 +28,16 @@ pub struct BangumiExtra {
|
||||
pub s_name_jp: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
|
||||
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize, SimpleObject)]
|
||||
#[sea_orm(table_name = "bangumi")]
|
||||
#[graphql(name = "Bangumi")]
|
||||
pub struct Model {
|
||||
pub created_at: DateTime,
|
||||
pub updated_at: DateTime,
|
||||
#[sea_orm(primary_key)]
|
||||
pub id: i32,
|
||||
pub mikan_bangumi_id: Option<String>,
|
||||
#[graphql(default_with = "default_subscriber_id")]
|
||||
pub subscriber_id: i32,
|
||||
pub display_name: String,
|
||||
pub raw_name: String,
|
||||
|
@ -45,7 +45,7 @@ pub struct Model {
|
||||
pub poster_link: Option<String>,
|
||||
pub episode_index: i32,
|
||||
pub homepage: Option<String>,
|
||||
pub subtitle: Option<Vec<String>>,
|
||||
pub subtitle: Option<String>,
|
||||
#[sea_orm(default = "false")]
|
||||
pub deleted: bool,
|
||||
pub source: Option<String>,
|
||||
@ -218,7 +218,7 @@ impl ActiveModel {
|
||||
poster_link: ActiveValue::Set(bgm.poster_link.clone()),
|
||||
episode_index: ActiveValue::Set(raw_meta.episode_index),
|
||||
homepage: ActiveValue::Set(Some(homepage.to_string())),
|
||||
subtitle: ActiveValue::Set(raw_meta.subtitle.map(|s| vec![s])),
|
||||
subtitle: ActiveValue::Set(raw_meta.subtitle),
|
||||
source: ActiveValue::Set(raw_meta.source),
|
||||
extra: ActiveValue::Set(EpisodeExtra {
|
||||
name_zh: raw_meta.name_zh,
|
||||
|
@ -1,3 +1,4 @@
|
||||
use async_graphql::SimpleObject;
|
||||
use async_trait::async_trait;
|
||||
use loco_rs::{
|
||||
app::AppContext,
|
||||
@ -8,7 +9,9 @@ use serde::{Deserialize, Serialize};
|
||||
|
||||
pub const SEED_SUBSCRIBER: &str = "konobangu";
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, FromJsonQueryResult)]
|
||||
#[derive(
|
||||
Clone, Debug, PartialEq, Eq, Serialize, Deserialize, FromJsonQueryResult, SimpleObject,
|
||||
)]
|
||||
pub struct SubscriberBangumiConfig {
|
||||
pub leading_group_tag: Option<bool>,
|
||||
}
|
||||
@ -80,8 +83,6 @@ pub enum RelatedEntity {
|
||||
Bangumi,
|
||||
#[sea_orm(entity = "super::episodes::Entity")]
|
||||
Episode,
|
||||
#[sea_orm(entity = "super::auth::Entity")]
|
||||
Auth,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize, Serialize)]
|
||||
@ -106,11 +107,6 @@ impl ActiveModelBehavior for ActiveModel {
|
||||
}
|
||||
|
||||
impl Model {
|
||||
/// finds a user by the provided pid
|
||||
///
|
||||
/// # Errors
|
||||
///
|
||||
/// When could not find user or DB query error
|
||||
pub async fn find_by_pid(ctx: &AppContext, pid: &str) -> ModelResult<Self> {
|
||||
let db = &ctx.db;
|
||||
let parse_uuid = Uuid::parse_str(pid).map_err(|e| ModelError::Any(e.into()))?;
|
||||
@ -150,12 +146,6 @@ impl Model {
|
||||
Self::find_by_pid(ctx, SEED_SUBSCRIBER).await
|
||||
}
|
||||
|
||||
/// Asynchronously creates a user with a password and saves it to the
|
||||
/// database.
|
||||
///
|
||||
/// # Errors
|
||||
///
|
||||
/// When could not save the user into the DB
|
||||
pub async fn create_root(ctx: &AppContext) -> ModelResult<Self> {
|
||||
let db = &ctx.db;
|
||||
let txn = db.begin().await?;
|
||||
|
File diff suppressed because it is too large
Load Diff
5
justfile
5
justfile
@ -9,8 +9,11 @@ prepare-dev-recorder:
|
||||
dev-webui:
|
||||
pnpm run dev
|
||||
|
||||
dev-proxy:
|
||||
pnpm run --filter=proxy dev
|
||||
|
||||
dev-recorder:
|
||||
cargo watch -w apps/recorder -w config -x 'recorder start'
|
||||
cargo watch -w apps/recorder -x 'recorder start'
|
||||
|
||||
down-recorder:
|
||||
cargo run -p recorder --bin recorder_cli -- db down 999 --environment development
|
||||
|
Loading…
Reference in New Issue
Block a user