Merge pull request #177 from lanyeeee/develop

Develop

Author: lanyeeee

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 lanyeeee (https://github.com/lanyeeee)
+Copyright (c) 2024-2026 lanyeeee (https://github.com/lanyeeee)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src-tauri/src/commands.rs

@@ -1,4 +1,5 @@
 use std::path::PathBuf;
+use std::sync::Arc;
 use std::time::Duration;
 
 // TODO: 用`#![allow(clippy::used_underscore_binding)]`来消除警告
@@ -7,6 +8,7 @@ use indexmap::IndexMap;
 use tauri::AppHandle;
 use tauri_plugin_opener::OpenerExt;
 use tauri_specta::Event;
+use tokio::sync::Semaphore;
 use tokio::task::JoinSet;
 use tokio::time::sleep;
 use walkdir::WalkDir;
@@ -307,20 +309,23 @@ pub async fn download_all_favorites(app: AppHandle) -> CommandResult<()> {
     let first_page = jm_client
         .get_favorite_folder(0, 1, FavoriteSort::FavoriteTime)
         .await
-        .map_err(|err| CommandError::from("更新收藏夹失败", err))?;
+        .map_err(|err| CommandError::from("获取收藏夹失败", err))?;
     favorite_comics.extend(first_page.list);
     // 计算总页数
     let count = first_page.count;
     let total = first_page
         .total
         .parse::<i64>()
-        .map_err(|err| CommandError::from("更新收藏夹失败", err))?;
+        .map_err(|err| CommandError::from("获取收藏夹失败", err))?;
     let page_count = (total / count) + 1;
     // 获取收藏夹剩余页
+    let sem = Arc::new(Semaphore::new(5));
     let mut join_set = JoinSet::new();
     for page in 2..=page_count {
         let jm_client = jm_client.clone();
+        let sem = sem.clone();
         join_set.spawn(async move {
+            let _permit = sem.acquire().await?;
             let page = jm_client
                 .get_favorite_folder(0, page, FavoriteSort::FavoriteTime)
                 .await?;
@@ -330,7 +335,7 @@ pub async fn download_all_favorites(app: AppHandle) -> CommandResult<()> {
     // 等待所有请求完成
     while let Some(Ok(get_favorite_result)) = join_set.join_next().await {
         // 如果有请求失败，直接返回错误
-        let page = get_favorite_result.map_err(|err| CommandError::from("更新收藏夹失败", err))?;
+        let page = get_favorite_result.map_err(|err| CommandError::from("获取收藏夹失败", err))?;
         favorite_comics.extend(page.list);
     }
     // 至此，收藏夹已经全部获取完毕

src-tauri/src/config.rs

@@ -32,6 +32,7 @@ pub struct Config {
     pub update_downloaded_comics_interval_sec: u64,
     pub api_domain_mode: ApiDomainMode,
     pub custom_api_domain: String,
+    pub should_download_cover: bool,
 }
 
 impl Config {
@@ -116,6 +117,7 @@ impl Config {
             update_downloaded_comics_interval_sec: 0,
             api_domain_mode: ApiDomainMode::Domain2,
             custom_api_domain: API_DOMAIN_2.to_string(),
+            should_download_cover: true,
         }
     }
 }

src-tauri/src/download_manager.rs

@@ -210,6 +210,7 @@ impl DownloadTask {
         let comic_title = &self.comic.name;
         let chapter_title = &self.chapter_info.chapter_title;
         let chapter_id = self.chapter_info.chapter_id;
+
         if let Err(err) = self.comic.save_comic_metadata() {
             let err_title = format!("`{comic_title}`保存元数据失败");
             let string_chain = err.to_string_chain();
@@ -220,6 +221,21 @@ impl DownloadTask {
 
             return;
         }
+
+        let should_download_cover = self.app.get_config().read().should_download_cover;
+        if should_download_cover {
+            if let Err(err) = self.download_cover().await {
+                let err_title = format!("`{comic_title}`下载封面失败");
+                let string_chain = err.to_string_chain();
+                tracing::error!(err_title, message = string_chain);
+
+                self.set_state(DownloadTaskState::Failed);
+                self.emit_download_task_update_event();
+
+                return;
+            }
+        }
+
         // 获取此章节每张图片的下载链接以及对应的block_num
         let Some(urls_with_block_num) = self.get_urls_with_block_num(chapter_id).await else {
             return;
@@ -285,6 +301,28 @@ impl DownloadTask {
         self.emit_download_task_update_event();
     }
 
+    async fn download_cover(&self) -> anyhow::Result<()> {
+        let cover_path = self.comic.get_cover_path().context("获取封面路径失败")?;
+        // if cover_path.exists() {
+        //     return Ok(());
+        // }
+
+        let comic_id = self.comic.id;
+        let url = format!("https://cdn-msp3.18comic.vip/media/albums/{comic_id}.jpg");
+
+        let (img_data, _format) = self
+            .app
+            .get_jm_client()
+            .get_img_data_and_format(&url)
+            .await
+            .context(format!("下载图片`{url}`失败"))?;
+
+        std::fs::write(&cover_path, img_data)
+            .context(format!("保存图片`{}`失败", cover_path.display()))?;
+
+        Ok(())
+    }
+
     fn create_temp_download_dir(&self) -> Option<PathBuf> {
         let comic_title = &self.comic.name;
         let chapter_title = &self.chapter_info.chapter_title;

src-tauri/src/export.rs

@@ -19,7 +19,7 @@ use zip::{write::SimpleFileOptions, ZipWriter};
 
 use crate::{
     events::{ExportCbzEvent, ExportPdfEvent},
-    extensions::PathIsImg,
+    extensions::{AnyhowErrorToStringChain, PathIsImg},
     types::{ChapterInfo, Comic, ComicInfo},
 };
 
@@ -93,6 +93,13 @@ pub fn cbz(app: &AppHandle, comic: &Comic) -> anyhow::Result<()> {
     // 保证导出目录存在
     std::fs::create_dir_all(&chapter_export_dir)
         .context(format!("创建目录`{}`失败", chapter_export_dir.display()))?;
+    // 先把封面拷贝到导出目录(如果有)
+    if let Err(err) = copy_cover(comic, &chapter_export_dir) {
+        let comic_title = &comic.name;
+        let err_title = format!("`{comic_title}`导出cbz时，将封面拷贝到导出目录失败");
+        let string_chain = err.to_string_chain();
+        tracing::error!(err_title, message = string_chain);
+    }
     // 并发处理
     let downloaded_chapter_infos = downloaded_chapter_infos.into_par_iter();
     downloaded_chapter_infos.try_for_each(|chapter_info| -> anyhow::Result<()> {
@@ -187,6 +194,18 @@ pub fn cbz(app: &AppHandle, comic: &Comic) -> anyhow::Result<()> {
     Ok(())
 }
 
+fn copy_cover(comic: &Comic, chapter_export_dir: &Path) -> anyhow::Result<()> {
+    let src_cover_path = comic.get_cover_path().context("获取封面路径失败")?;
+    let cover_filename = src_cover_path.file_name().context("获取封面的文件名失败")?;
+
+    if src_cover_path.exists() {
+        let dst_cover_path = chapter_export_dir.join(cover_filename);
+        std::fs::copy(src_cover_path, dst_cover_path)?;
+    }
+
+    Ok(())
+}
+
 struct PdfCreateErrorEventGuard {
     uuid: String,
     app: AppHandle,
@@ -269,7 +288,7 @@ pub fn pdf(app: &AppHandle, comic: &Comic) -> anyhow::Result<()> {
             ))?
             .filter_map(Result::ok)
             .map(|entry| entry.path())
-            .filter(|path| path.is_img())
+            .filter(|path| path.is_common_img())
             .collect();
         image_paths.sort_by(|a, b| a.file_name().cmp(&b.file_name()));
 

src-tauri/src/extensions.rs

@@ -25,12 +25,22 @@ impl AnyhowErrorToStringChain for anyhow::Error {
 }
 
 pub trait PathIsImg {
-    /// 判断路径是否为图片文件
+    /// 判断路径是否为图片(jpg/png/webp/gif)
     fn is_img(&self) -> bool;
+
+    /// 判断路径是否为普通图片(jpg/png/webp)
+    fn is_common_img(&self) -> bool;
 }
 
 impl PathIsImg for std::path::Path {
     fn is_img(&self) -> bool {
+        self.extension()
+            .and_then(|ext| ext.to_str())
+            .map(str::to_lowercase)
+            .is_some_and(|ext| matches!(ext.as_str(), "jpg" | "png" | "webp" | "gif"))
+    }
+
+    fn is_common_img(&self) -> bool {
         self.extension()
             .and_then(|ext| ext.to_str())
             .map(str::to_lowercase)

src-tauri/src/jm_client.rs

@@ -536,17 +536,20 @@ impl JmClient {
     }
 
     pub async fn get_img_data_and_format(&self, url: &str) -> anyhow::Result<(Bytes, ImageFormat)> {
-        let request = self.img_client.read().get(url);
-
+        let request = self
+            .img_client
+            .read()
+            .get(url)
+            .header("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36");
         let http_resp = request.send().await?;
+
         let status = http_resp.status();
         if status != StatusCode::OK {
             let text = http_resp.text().await?;
             let err = anyhow!("下载图片`{url}`失败，预料之外的状态码: {text}");
             return Err(err);
         }
 
-        let mut headers = http_resp.headers().clone();
         let mut image_data = http_resp.bytes().await?;
 
         if image_data.is_empty() {
@@ -563,22 +566,11 @@ impl JmClient {
                 return Err(err);
             }
 
-            headers = http_resp.headers().clone();
             image_data = http_resp.bytes().await?;
         }
-        // 获取 resp headers 的 content-type 字段
-        let content_type = headers
-            .get("content-type")
-            .ok_or(anyhow!("响应中没有content-type字段"))?
-            .to_str()
-            .context("响应中的content-type字段不是utf-8字符串")?
-            .to_string();
-        // 确定原始图片格式
-        let format = match content_type.as_str() {
-            "image/webp" => ImageFormat::WebP,
-            "image/gif" => ImageFormat::Gif,
-            _ => return Err(anyhow!("原图出现了意料之外的格式: {content_type}")),
-        };
+
+        let format = image::guess_format(&image_data)
+            .context("无法从图片数据中猜测出图片格式，可能图片数据不完整或已损坏")?;
 
         Ok((image_data, format))
     }

src-tauri/src/types/comic.rs

@@ -236,6 +236,17 @@ impl Comic {
         Ok(())
     }
 
+    pub fn get_cover_path(&self) -> anyhow::Result<PathBuf> {
+        let comic_download_dir = self
+            .comic_download_dir
+            .as_ref()
+            .context("`comic_download_dir`字段为`None`")?;
+
+        let cover_path = comic_download_dir.join("cover.jpg");
+
+        Ok(cover_path)
+    }
+
     fn update_chapter_infos_fields(&mut self) -> anyhow::Result<()> {
         let Some(comic_download_dir) = &self.comic_download_dir else {
             return Err(anyhow!("`comic_download_dir`字段为`None`"));

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2.0.0-rc",
   "productName": "jmcomic-downloader",
-  "version": "0.16.2",
+  "version": "0.17.0",
   "identifier": "com.lanyeeee.jmcomic-downloader",
   "build": {
     "beforeDevCommand": "pnpm dev",

src/bindings.ts

@@ -249,7 +249,7 @@ export type ComicInFavorite = { id: number; author: string; description: string
 export type ComicInSearch = { id: number; author: string; name: string; image: string; category: CategoryRespData; categorySub: CategorySubRespData; liked: boolean; isFavorite: boolean; updateAt: number; isDownloaded: boolean; comicDownloadDir: string }
 export type ComicInWeekly = { id: number; author: string; description: string; name: string; image: string; category: Category; category_sub: CategorySub; liked: boolean; is_favorite: boolean; update_at: number; is_downloaded: boolean; comic_download_dir: string }
 export type CommandError = { err_title: string; err_message: string }
-export type Config = { username: string; password: string; downloadDir: string; exportDir: string; downloadFormat: DownloadFormat; dirFmt: string; proxyMode: ProxyMode; proxyHost: string; proxyPort: number; enableFileLogger: boolean; chapterConcurrency: number; chapterDownloadIntervalSec: number; imgConcurrency: number; imgDownloadIntervalSec: number; downloadAllFavoritesIntervalSec: number; updateDownloadedComicsIntervalSec: number; apiDomainMode: ApiDomainMode; customApiDomain: string }
+export type Config = { username: string; password: string; downloadDir: string; exportDir: string; downloadFormat: DownloadFormat; dirFmt: string; proxyMode: ProxyMode; proxyHost: string; proxyPort: number; enableFileLogger: boolean; chapterConcurrency: number; chapterDownloadIntervalSec: number; imgConcurrency: number; imgDownloadIntervalSec: number; downloadAllFavoritesIntervalSec: number; updateDownloadedComicsIntervalSec: number; apiDomainMode: ApiDomainMode; customApiDomain: string; shouldDownloadCover: boolean }
 export type DownloadAllFavoritesEvent = { event: "GetFavoritesStart" } | { event: "GetComicsProgress"; data: { current: number; total: number } } | { event: "StartCreateDownloadTasks"; data: { comicId: number; comicTitle: string; current: number; total: number } } | { event: "CreatingDownloadTask"; data: { comicId: number; current: number } } | { event: "EndCreateDownloadTasks"; data: { comicId: number } } | { event: "GetComicsEnd" }
 export type DownloadFormat = "Jpeg" | "Png" | "Webp"
 export type DownloadSleepingEvent = { id: number; remainingSec: number }