dumtruck/konobangu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix tasks

Browse Source
This commit is contained in:
master
2025-06-14 22:30:58 +08:00
parent 882b29d7a1
commit 1b5bdadf10
15 changed files with 91 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/proxy/.whistle/rules/files/1.mikan_doppel
View File

@@ -1 +1 @@
^https://mikanani.me/*** http://127.0.0.1:5010/$1
^https://mikanani.me/*** http://127.0.0.1:5005/$1

2
apps/proxy/src/bin/mikan_doppel.rs
View File

@@ -10,7 +10,7 @@ async fn main() -> RecorderResult<()> {
.with_max_level(Level::DEBUG)
.init();
let mut mikan_server = MikanMockServer::new_with_port(5010).await.unwrap();
let mut mikan_server = MikanMockServer::new_with_port(5005).await.unwrap();
let resources_mock = mikan_server.mock_resources_with_doppel();

1
apps/recorder/.env
View File

@@ -14,3 +14,4 @@ BASIC_PASSWORD = "konobangu"
# MIKAN_PROXY = ""
# MIKAN_PROXY_AUTH_HEADER = ""
# MIKAN_NO_PROXY = ""
# MIKAN_PROXY_ACCEPT_INVALID_CERTS = "true"

17
apps/recorder/.env.dev Normal file
View File

@@ -0,0 +1,17 @@
HOST="konobangu.com"
DATABASE_URL = "postgres://konobangu:konobangu@localhost:5432/konobangu"
STORAGE_DATA_DIR = "./data"
AUTH_TYPE = "basic" # or oidc
BASIC_USER = "konobangu"
BASIC_PASSWORD = "konobangu"
# OIDC_ISSUER="https://auth.logto.io/oidc"
# OIDC_AUDIENCE = "https://konobangu.com/api"
# OIDC_CLIENT_ID = "client_id"
# OIDC_CLIENT_SECRET = "client_secret" # optional
# OIDC_EXTRA_SCOPES = "read:konobangu write:konobangu"
# OIDC_EXTRA_CLAIM_KEY = ""
# OIDC_EXTRA_CLAIM_VALUE = ""
MIKAN_PROXY = "http://127.0.0.1:8899"
# MIKAN_PROXY_AUTH_HEADER = ""
# MIKAN_NO_PROXY = ""
MIKAN_PROXY_ACCEPT_INVALID_CERTS = true

7
apps/recorder/Cargo.toml
View File

@@ -111,7 +111,12 @@ tracing-appender = "0.2.3"
clap = "4.5.31"
ipnetwork = "0.21.1"
typed-builder = "0.21.0"
apalis = { version = "0.7", features = ["limit", "tracing", "catch-panic"] }
apalis = { version = "0.7", features = [
"limit",
"tracing",
"catch-panic",
"retry",
] }
apalis-sql = { version = "0.7", features = ["postgres"] }
cocoon = { version = "0.4.3", features = ["getrandom", "thiserror"] }
rand = "0.9.1"

1
apps/recorder/src/extract/mikan/web.rs
View File

@@ -710,6 +710,7 @@ pub async fn scrape_mikan_bangumi_meta_from_bangumi_homepage_url(
)
}
#[allow(dead_code)]
#[instrument(err, skip_all, fields(mikan_bangumi_homepage_url = mikan_bangumi_homepage_url.as_str()))]
pub async fn scrape_mikan_bangumi_index_meta_from_bangumi_homepage_url(
mikan_client: &MikanClient,

9
apps/recorder/src/task/service.rs
View File

@@ -3,6 +3,7 @@ use std::{ops::Deref, sync::Arc};
use apalis::prelude::*;
use apalis_sql::{
Config,
context::SqlContext,
postgres::{PgListen, PostgresStorage},
};
use tokio::sync::RwLock;
@@ -51,7 +52,13 @@ impl TaskService {
) -> RecorderResult<TaskId> {
let task_id = {
let mut storage = self.subscriber_task_storage.write().await;
storage.push(subscriber_task).await?.task_id
let sql_context = {
let mut c = SqlContext::default();
c.set_max_attempts(1);
c
};
let request = Request::new_with_ctx(subscriber_task, sql_context);
storage.push_request(request).await?.task_id
};
Ok(task_id)

1
apps/webui/.gitignore vendored
View File

@@ -13,3 +13,4 @@ dist/
.idea
.env.local
.env.*.lcoal
.tanstack

38
apps/webui/src/components/ui/detail-empty-view.tsx
View File

@@ -1,18 +1,30 @@
import { memo } from "react";
import { cn } from "@/presentation/utils";
import { DetailedHTMLProps, HTMLAttributes, memo } from "react";
import { Card, CardContent } from "./card";
export interface DetailEmptyViewProps {
export interface DetailEmptyViewProps
extends DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement> {
message: string;
fullWidth?: boolean;
}
export const DetailEmptyView = memo(({ message }: DetailEmptyViewProps) => {
return (
<div className="container mx-auto py-6 max-w-4xl">
<Card>
<CardContent className="flex items-center justify-center h-32">
<p className="text-muted-foreground">{message ?? "No data"}</p>
</CardContent>
</Card>
</div>
);
});
export const DetailEmptyView = memo(
({ message, fullWidth, ...props }: DetailEmptyViewProps) => {
return (
<div
{...props}
className={cn(
"container mx-auto py-6",
fullWidth ? "w-full" : "max-w-4xl",
props.className
)}
>
<Card>
<CardContent className="flex items-center justify-center h-32">
<p className="text-muted-foreground">{message ?? "No data"}</p>
</CardContent>
</Card>
</div>
);
}
);

18
apps/webui/src/infra/graphql/gql/graphql.ts
View File

@@ -133,7 +133,7 @@ export type BangumiInsertInput = {
savePath?: InputMaybe<Scalars['String']['input']>;
season: Scalars['Int']['input'];
seasonRaw?: InputMaybe<Scalars['String']['input']>;
subscriberId: Scalars['Int']['input'];
subscriberId?: InputMaybe<Scalars['Int']['input']>;
updatedAt?: InputMaybe<Scalars['String']['input']>;
};
@@ -267,7 +267,7 @@ export type Credential3rdInsertInput = {
credentialType: Credential3rdTypeEnum;
id?: InputMaybe<Scalars['Int']['input']>;
password?: InputMaybe<Scalars['String']['input']>;
subscriberId: Scalars['Int']['input'];
subscriberId?: InputMaybe<Scalars['Int']['input']>;
updatedAt?: InputMaybe<Scalars['String']['input']>;
userAgent?: InputMaybe<Scalars['String']['input']>;
username?: InputMaybe<Scalars['String']['input']>;
@@ -450,7 +450,7 @@ export type DownloadersInsertInput = {
id?: InputMaybe<Scalars['Int']['input']>;
password: Scalars['String']['input'];
savePath: Scalars['String']['input'];
subscriberId: Scalars['Int']['input'];
subscriberId?: InputMaybe<Scalars['Int']['input']>;
updatedAt?: InputMaybe<Scalars['String']['input']>;
username: Scalars['String']['input'];
};
@@ -566,7 +566,7 @@ export type DownloadsInsertInput = {
rawName: Scalars['String']['input'];
savePath?: InputMaybe<Scalars['String']['input']>;
status: DownloadStatusEnum;
subscriberId: Scalars['Int']['input'];
subscriberId?: InputMaybe<Scalars['Int']['input']>;
updatedAt?: InputMaybe<Scalars['String']['input']>;
url: Scalars['String']['input'];
};
@@ -729,7 +729,7 @@ export type EpisodesInsertInput = {
season: Scalars['Int']['input'];
seasonRaw?: InputMaybe<Scalars['String']['input']>;
source?: InputMaybe<Scalars['String']['input']>;
subscriberId: Scalars['Int']['input'];
subscriberId?: InputMaybe<Scalars['Int']['input']>;
subtitle?: InputMaybe<Scalars['String']['input']>;
updatedAt?: InputMaybe<Scalars['String']['input']>;
};
@@ -1292,7 +1292,7 @@ export type SubscriberTasksInsertInput = {
priority: Scalars['Int']['input'];
runAt: Scalars['String']['input'];
status: SubscriberTaskStatusEnum;
subscriberId: Scalars['Int']['input'];
subscriberId?: InputMaybe<Scalars['Int']['input']>;
taskType: SubscriberTaskTypeEnum;
};
@@ -1449,7 +1449,7 @@ export type SubscriptionBangumiFilterInput = {
export type SubscriptionBangumiInsertInput = {
bangumiId: Scalars['Int']['input'];
id?: InputMaybe<Scalars['Int']['input']>;
subscriberId: Scalars['Int']['input'];
subscriberId?: InputMaybe<Scalars['Int']['input']>;
subscriptionId: Scalars['Int']['input'];
};
@@ -1532,7 +1532,7 @@ export type SubscriptionEpisodeFilterInput = {
export type SubscriptionEpisodeInsertInput = {
episodeId: Scalars['Int']['input'];
id?: InputMaybe<Scalars['Int']['input']>;
subscriberId: Scalars['Int']['input'];
subscriberId?: InputMaybe<Scalars['Int']['input']>;
subscriptionId: Scalars['Int']['input'];
};
@@ -1645,7 +1645,7 @@ export type SubscriptionsInsertInput = {
enabled: Scalars['Boolean']['input'];
id?: InputMaybe<Scalars['Int']['input']>;
sourceUrl: Scalars['String']['input'];
subscriberId: Scalars['Int']['input'];
subscriberId?: InputMaybe<Scalars['Int']['input']>;
updatedAt?: InputMaybe<Scalars['String']['input']>;
};

2
apps/webui/src/presentation/routes/_app/tasks/manage.tsx
View File

@@ -231,7 +231,7 @@ function TaskManageRouteComponent() {
);
})
) : (
<DetailEmptyView message="No tasks found" />
<DetailEmptyView message="No tasks found" fullWidth />
)}
</div>