- Ajout d'un bouton "télécharger et remplacer" avec popup de confirmation, qui passe tous les volumes du pack (pas seulement les manquants) et replace_existing=true à l'API. - Nouvelle colonne replace_existing dans torrent_downloads. - Fix critique du parseur de volumes : le pass 2 mélangeait les indices d'octets (String::find) avec les indices de caractères (Vec<char>), causant un décalage quand le titre contenait des caractères multi-octets (é, à...). "Tome #097" extrayait 9 au lieu de 97. Réécrit en indexation char pure. - Le préfixe "tome" skip désormais "#" (tome #097 → 97). - Protection intra-batch : si une destination est déjà utilisée, le fichier garde son nom original au lieu d'écraser. - Alerte WARN si N fichiers source donnent N/3 volumes uniques. - Nettoyage du répertoire sl-{id} et de la catégorie qBittorrent après import. - Badges volumes en flex-wrap dans la page downloads. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
397 lines
13 KiB
Rust
397 lines
13 KiB
Rust
use axum::{extract::State, Json};
|
|
use serde::{Deserialize, Serialize};
|
|
use sqlx::Row;
|
|
use utoipa::ToSchema;
|
|
use uuid::Uuid;
|
|
|
|
use crate::{error::ApiError, state::AppState};
|
|
|
|
// ─── Types ──────────────────────────────────────────────────────────────────
|
|
|
|
#[derive(Deserialize, ToSchema)]
|
|
pub struct QBittorrentAddRequest {
|
|
pub url: String,
|
|
/// When provided together with `series_name` and `expected_volumes`, tracks the download
|
|
/// in `torrent_downloads` and triggers automatic import on completion.
|
|
#[schema(value_type = Option<String>)]
|
|
pub library_id: Option<Uuid>,
|
|
pub series_name: Option<String>,
|
|
pub expected_volumes: Option<Vec<i32>>,
|
|
/// When true, overwrite existing files at destination during import.
|
|
#[serde(default)]
|
|
pub replace_existing: bool,
|
|
}
|
|
|
|
#[derive(Serialize, ToSchema)]
|
|
pub struct QBittorrentAddResponse {
|
|
pub success: bool,
|
|
pub message: String,
|
|
/// Set when `library_id` + `series_name` + `expected_volumes` were provided.
|
|
#[schema(value_type = Option<String>)]
|
|
pub torrent_download_id: Option<Uuid>,
|
|
}
|
|
|
|
#[derive(Serialize, ToSchema)]
|
|
pub struct QBittorrentTestResponse {
|
|
pub success: bool,
|
|
pub message: String,
|
|
pub version: Option<String>,
|
|
}
|
|
|
|
// ─── Config helper ──────────────────────────────────────────────────────────
|
|
|
|
#[derive(Deserialize)]
|
|
struct QBittorrentConfig {
|
|
url: String,
|
|
username: String,
|
|
password: String,
|
|
}
|
|
|
|
pub(crate) async fn load_qbittorrent_config(
|
|
pool: &sqlx::PgPool,
|
|
) -> Result<(String, String, String), ApiError> {
|
|
let row = sqlx::query("SELECT value FROM app_settings WHERE key = 'qbittorrent'")
|
|
.fetch_optional(pool)
|
|
.await?;
|
|
|
|
let row = row.ok_or_else(|| ApiError::bad_request("qBittorrent is not configured"))?;
|
|
let value: serde_json::Value = row.get("value");
|
|
let config: QBittorrentConfig = serde_json::from_value(value)
|
|
.map_err(|e| ApiError::internal(format!("invalid qbittorrent config: {e}")))?;
|
|
|
|
if config.url.is_empty() || config.username.is_empty() {
|
|
return Err(ApiError::bad_request(
|
|
"qBittorrent URL and username must be configured in settings",
|
|
));
|
|
}
|
|
|
|
let url = config.url.trim_end_matches('/').to_string();
|
|
Ok((url, config.username, config.password))
|
|
}
|
|
|
|
// ─── Login helper ───────────────────────────────────────────────────────────
|
|
|
|
pub(crate) async fn qbittorrent_login(
|
|
client: &reqwest::Client,
|
|
base_url: &str,
|
|
username: &str,
|
|
password: &str,
|
|
) -> Result<String, ApiError> {
|
|
let resp = client
|
|
.post(format!("{base_url}/api/v2/auth/login"))
|
|
.form(&[("username", username), ("password", password)])
|
|
.send()
|
|
.await
|
|
.map_err(|e| ApiError::internal(format!("qBittorrent login request failed: {e}")))?;
|
|
|
|
if !resp.status().is_success() {
|
|
let status = resp.status();
|
|
let text = resp.text().await.unwrap_or_default();
|
|
return Err(ApiError::internal(format!(
|
|
"qBittorrent login failed ({status}): {text}"
|
|
)));
|
|
}
|
|
|
|
// Extract SID from Set-Cookie header
|
|
let cookie_header = resp
|
|
.headers()
|
|
.get("set-cookie")
|
|
.and_then(|v| v.to_str().ok())
|
|
.unwrap_or("");
|
|
|
|
let sid = cookie_header
|
|
.split(';')
|
|
.next()
|
|
.and_then(|s| s.strip_prefix("SID="))
|
|
.ok_or_else(|| ApiError::internal("Failed to get SID cookie from qBittorrent"))?
|
|
.to_string();
|
|
|
|
Ok(sid)
|
|
}
|
|
|
|
// ─── Handlers ───────────────────────────────────────────────────────────────
|
|
|
|
/// Add a torrent to qBittorrent
|
|
#[utoipa::path(
|
|
post,
|
|
path = "/qbittorrent/add",
|
|
tag = "qbittorrent",
|
|
request_body = QBittorrentAddRequest,
|
|
responses(
|
|
(status = 200, body = QBittorrentAddResponse),
|
|
(status = 400, description = "Bad request or qBittorrent not configured"),
|
|
(status = 401, description = "Unauthorized"),
|
|
(status = 500, description = "qBittorrent connection error"),
|
|
),
|
|
security(("Bearer" = []))
|
|
)]
|
|
pub async fn add_torrent(
|
|
State(state): State<AppState>,
|
|
Json(body): Json<QBittorrentAddRequest>,
|
|
) -> Result<Json<QBittorrentAddResponse>, ApiError> {
|
|
if body.url.is_empty() {
|
|
return Err(ApiError::bad_request("url is required"));
|
|
}
|
|
|
|
let is_managed = body.library_id.is_some()
|
|
&& body.series_name.is_some()
|
|
&& body.expected_volumes.is_some();
|
|
|
|
let (base_url, username, password) = load_qbittorrent_config(&state.pool).await?;
|
|
|
|
let client = reqwest::Client::builder()
|
|
.timeout(std::time::Duration::from_secs(10))
|
|
.build()
|
|
.map_err(|e| ApiError::internal(format!("failed to build HTTP client: {e}")))?;
|
|
|
|
let sid = qbittorrent_login(&client, &base_url, &username, &password).await?;
|
|
|
|
// Pre-generate the download ID; use a unique category per download so we can
|
|
// reliably match the torrent back (tags/savepath are unreliable on qBittorrent 4.x).
|
|
let download_id = if is_managed { Some(Uuid::new_v4()) } else { None };
|
|
let category = download_id.as_ref().map(|id| format!("sl-{id}"));
|
|
|
|
// Create the category in qBittorrent before adding the torrent
|
|
if let Some(ref cat) = category {
|
|
let _ = client
|
|
.post(format!("{base_url}/api/v2/torrents/createCategory"))
|
|
.header("Cookie", format!("SID={sid}"))
|
|
.form(&[("category", cat.as_str()), ("savePath", "/downloads")])
|
|
.send()
|
|
.await;
|
|
}
|
|
|
|
let mut form_params: Vec<(&str, &str)> = vec![("urls", &body.url)];
|
|
let savepath = "/downloads";
|
|
if is_managed {
|
|
form_params.push(("savepath", savepath));
|
|
if let Some(ref cat) = category {
|
|
form_params.push(("category", cat));
|
|
}
|
|
}
|
|
|
|
let resp = client
|
|
.post(format!("{base_url}/api/v2/torrents/add"))
|
|
.header("Cookie", format!("SID={sid}"))
|
|
.form(&form_params)
|
|
.send()
|
|
.await
|
|
.map_err(|e| ApiError::internal(format!("qBittorrent add request failed: {e}")))?;
|
|
|
|
if !resp.status().is_success() {
|
|
let status = resp.status();
|
|
let text = resp.text().await.unwrap_or_default();
|
|
return Ok(Json(QBittorrentAddResponse {
|
|
success: false,
|
|
message: format!("qBittorrent returned {status}: {text}"),
|
|
torrent_download_id: None,
|
|
}));
|
|
}
|
|
|
|
// If managed download: record in torrent_downloads
|
|
let torrent_download_id = if is_managed {
|
|
let library_id = body.library_id.unwrap();
|
|
let series_name = body.series_name.as_deref().unwrap();
|
|
let expected_volumes = body.expected_volumes.as_deref().unwrap();
|
|
|
|
// Try to resolve hash: first from magnet, then by category in qBittorrent
|
|
let mut qb_hash = extract_magnet_hash(&body.url);
|
|
if qb_hash.is_none() {
|
|
if let Some(ref cat) = category {
|
|
// For .torrent URLs: wait briefly then query qBittorrent by category
|
|
tokio::time::sleep(std::time::Duration::from_secs(2)).await;
|
|
qb_hash = resolve_hash_by_category(&client, &base_url, &sid, cat).await;
|
|
}
|
|
}
|
|
|
|
let id = download_id.unwrap();
|
|
sqlx::query(
|
|
"INSERT INTO torrent_downloads (id, library_id, series_name, expected_volumes, qb_hash, replace_existing) \
|
|
VALUES ($1, $2, $3, $4, $5, $6)",
|
|
)
|
|
.bind(id)
|
|
.bind(library_id)
|
|
.bind(series_name)
|
|
.bind(expected_volumes)
|
|
.bind(qb_hash.as_deref())
|
|
.bind(body.replace_existing)
|
|
.execute(&state.pool)
|
|
.await?;
|
|
|
|
tracing::info!("Created torrent download {id} for {series_name}, qb_hash={qb_hash:?}");
|
|
|
|
Some(id)
|
|
} else {
|
|
None
|
|
};
|
|
|
|
Ok(Json(QBittorrentAddResponse {
|
|
success: true,
|
|
message: "Torrent added to qBittorrent".to_string(),
|
|
torrent_download_id,
|
|
}))
|
|
}
|
|
|
|
/// Extract the info-hash from a magnet link (lowercased hex).
|
|
/// magnet:?xt=urn:btih:HASH...
|
|
/// Handles both hex (40 chars) and base32 (32 chars) encoded hashes.
|
|
fn extract_magnet_hash(url: &str) -> Option<String> {
|
|
let lower = url.to_lowercase();
|
|
let marker = "urn:btih:";
|
|
let start = lower.find(marker)? + marker.len();
|
|
let hash_part = &lower[start..];
|
|
let end = hash_part
|
|
.find(|c: char| !c.is_alphanumeric())
|
|
.unwrap_or(hash_part.len());
|
|
let hash = &hash_part[..end];
|
|
if hash.is_empty() {
|
|
return None;
|
|
}
|
|
// 40-char hex hash: use as-is
|
|
if hash.len() == 40 && hash.chars().all(|c| c.is_ascii_hexdigit()) {
|
|
return Some(hash.to_string());
|
|
}
|
|
// 32-char base32 hash: decode to hex
|
|
if hash.len() == 32 {
|
|
if let Some(hex) = base32_to_hex(hash) {
|
|
return Some(hex);
|
|
}
|
|
}
|
|
// Fallback: return as-is (may not match qBittorrent)
|
|
Some(hash.to_string())
|
|
}
|
|
|
|
/// Decode a base32-encoded string to a lowercase hex string.
|
|
fn base32_to_hex(input: &str) -> Option<String> {
|
|
let input = input.to_uppercase();
|
|
let alphabet = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
|
|
let mut bits: u64 = 0;
|
|
let mut bit_count = 0u32;
|
|
let mut bytes = Vec::with_capacity(20);
|
|
|
|
for ch in input.bytes() {
|
|
let val = alphabet.iter().position(|&c| c == ch)? as u64;
|
|
bits = (bits << 5) | val;
|
|
bit_count += 5;
|
|
if bit_count >= 8 {
|
|
bit_count -= 8;
|
|
bytes.push((bits >> bit_count) as u8);
|
|
bits &= (1u64 << bit_count) - 1;
|
|
}
|
|
}
|
|
|
|
if bytes.len() != 20 {
|
|
return None;
|
|
}
|
|
Some(bytes.iter().map(|b| format!("{b:02x}")).collect())
|
|
}
|
|
|
|
/// Torrent entry from qBittorrent API.
|
|
#[derive(Deserialize, Clone)]
|
|
struct QbTorrentEntry {
|
|
hash: String,
|
|
#[serde(default)]
|
|
name: String,
|
|
}
|
|
|
|
/// Resolve the hash of a torrent by its unique category in qBittorrent.
|
|
/// Each managed torrent gets category `sl-{download_id}` at add time,
|
|
/// so we can reliably find it even when multiple torrents are added concurrently.
|
|
pub(crate) async fn resolve_hash_by_category(
|
|
client: &reqwest::Client,
|
|
base_url: &str,
|
|
sid: &str,
|
|
category: &str,
|
|
) -> Option<String> {
|
|
let resp = client
|
|
.get(format!("{base_url}/api/v2/torrents/info"))
|
|
.query(&[("category", category)])
|
|
.header("Cookie", format!("SID={sid}"))
|
|
.send()
|
|
.await
|
|
.ok()?;
|
|
|
|
if !resp.status().is_success() {
|
|
tracing::warn!("[QBITTORRENT] Failed to query torrents by category {category}");
|
|
return None;
|
|
}
|
|
|
|
let torrents: Vec<QbTorrentEntry> = resp.json().await.unwrap_or_default();
|
|
if torrents.len() == 1 {
|
|
tracing::info!("[QBITTORRENT] Resolved hash {} via category {category} ({})", torrents[0].hash, torrents[0].name);
|
|
return Some(torrents[0].hash.clone());
|
|
}
|
|
|
|
if torrents.is_empty() {
|
|
tracing::warn!("[QBITTORRENT] No torrent found with category {category}");
|
|
} else {
|
|
tracing::warn!("[QBITTORRENT] Multiple torrents with category {category}, expected 1");
|
|
}
|
|
None
|
|
}
|
|
|
|
/// Test connection to qBittorrent
|
|
#[utoipa::path(
|
|
get,
|
|
path = "/qbittorrent/test",
|
|
tag = "qbittorrent",
|
|
responses(
|
|
(status = 200, body = QBittorrentTestResponse),
|
|
(status = 400, description = "qBittorrent not configured"),
|
|
(status = 401, description = "Unauthorized"),
|
|
),
|
|
security(("Bearer" = []))
|
|
)]
|
|
pub async fn test_qbittorrent(
|
|
State(state): State<AppState>,
|
|
) -> Result<Json<QBittorrentTestResponse>, ApiError> {
|
|
let (base_url, username, password) = load_qbittorrent_config(&state.pool).await?;
|
|
|
|
let client = reqwest::Client::builder()
|
|
.timeout(std::time::Duration::from_secs(10))
|
|
.build()
|
|
.map_err(|e| ApiError::internal(format!("failed to build HTTP client: {e}")))?;
|
|
|
|
let sid = match qbittorrent_login(&client, &base_url, &username, &password).await {
|
|
Ok(sid) => sid,
|
|
Err(e) => {
|
|
return Ok(Json(QBittorrentTestResponse {
|
|
success: false,
|
|
message: format!("Login failed: {}", e.message),
|
|
version: None,
|
|
}));
|
|
}
|
|
};
|
|
|
|
let resp = client
|
|
.get(format!("{base_url}/api/v2/app/version"))
|
|
.header("Cookie", format!("SID={sid}"))
|
|
.send()
|
|
.await;
|
|
|
|
match resp {
|
|
Ok(r) if r.status().is_success() => {
|
|
let version = r.text().await.unwrap_or_default();
|
|
Ok(Json(QBittorrentTestResponse {
|
|
success: true,
|
|
message: format!("Connected successfully ({})", version.trim()),
|
|
version: Some(version.trim().to_string()),
|
|
}))
|
|
}
|
|
Ok(r) => {
|
|
let status = r.status();
|
|
let text = r.text().await.unwrap_or_default();
|
|
Ok(Json(QBittorrentTestResponse {
|
|
success: false,
|
|
message: format!("qBittorrent returned {status}: {text}"),
|
|
version: None,
|
|
}))
|
|
}
|
|
Err(e) => Ok(Json(QBittorrentTestResponse {
|
|
success: false,
|
|
message: format!("Connection failed: {e}"),
|
|
version: None,
|
|
})),
|
|
}
|
|
}
|