Merge branch 'main' into release

Author: zhanglun

docs/architecture.md

@@ -0,0 +1,53 @@
+# Pavo 项目架构设计
+
+Pavo 是一款基于 Tauri 的跨平台桌面壁纸应用，采用前后端分离架构，前端使用 Svelte，后端核心逻辑用 Rust 实现。
+
+## 架构总览
+
+```mermaid
+graph TD
+  subgraph 前端Svelte
+    FE1[壁纸页 Bing]
+    FE2[设置页 Settings]
+    FE3[关于页 About]
+    FE4[Updater 检查更新]
+  end
+  subgraph Tauri 后端Rust
+    CMD[命令接口 cmd.rs]
+    CONF[配置管理 config.rs]
+    SCHED[调度器 scheduler.rs]
+    BG[后台服务 background.rs]
+    TRAY[托盘交互 tray.rs]
+    PLUG[插件系统 plugins.rs]
+    SVCS[服务 services/mod.rs]
+    BING[壁纸服务 bing.rs]
+    SHUFFLE[自动切换 shuffle_thread.rs]
+  end
+  FE1--invoke-->CMD
+  FE2--invoke-->CMD
+  FE3--invoke-->CMD
+  FE4--invoke-->CMD
+  CMD--读写配置-->CONF
+  CMD--调度壁纸-->SCHED
+  CMD--调用服务-->SVCS
+  CMD--托盘交互-->TRAY
+  CMD--插件注册-->PLUG
+  SCHED--调用Bing服务-->BING
+  SCHED--自动切换-->SHUFFLE
+  BG--消息调度-->SCHED
+  BG--消息调度-->SHUFFLE
+  SVCS--下载/保存壁纸-->BING
+  TRAY--发送消息-->BG
+```
+
+## 说明
+- **前端（Svelte）**：负责 UI 展示和用户交互，通过 Tauri invoke 与后端通信。
+- **Tauri 后端（Rust）**：实现所有业务逻辑，包括配置管理、壁纸调度、后台服务、托盘菜单、插件注册、壁纸下载与切换等。
+- **核心流程**：
+  1. 前端页面通过 invoke 调用后端命令（如获取壁纸列表、设置、关于等）。
+  2. 后端命令分发到对应模块（如 scheduler、services、config）。
+  3. 调度器负责壁纸的获取、缓存、切换，支持自动定时切换（shuffle_thread）。
+  4. 托盘菜单和后台服务通过消息通道与调度器联动，实现快捷操作和自动化。
+  5. 插件系统用于扩展功能，如日志、更新、文件系统等。
+
+---

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pavo",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "bing daily wallpaper",
   "type": "module",
   "scripts": {

public/yew.png

@@ -1,6 +1,6 @@
 [package]
 name = "pavo"
-version = "0.0.10"
+version = "0.0.11"
 description = "wallpaper"
 authors = ["you"]
 license = ""

src-tauri/Cargo.lock

@@ -1,14 +1,11 @@
 use chrono::offset::Utc;
 use chrono::Local;
 use once_cell::sync::Lazy;
-use reqwest::Client;
 use serde::{Deserialize, Serialize};
-use std::path::Path;
-use tokio::{self, sync::Mutex};
+use tokio::{sync::Mutex};
 
-use crate::config;
 use crate::services::bing;
-use crate::services::download_file;
+use crate::services::{save_wallpaper};
 
 #[allow(dead_code)]
 fn now() -> String {
@@ -149,71 +146,65 @@ impl Scheduler {
     list
   }
 
-  pub async fn save_wallpaper(url: &str, filename: &str) -> Result<String, String> {
-    let app_folder = config::PavoConfig::get_app_folder().unwrap();
-    let path = Path::new(&app_folder).join(&*filename);
-    let res = download_file(&Client::new(), &url, path.clone().to_str().unwrap())
-      .await
-      .unwrap();
-
-    println!("{:?}", res);
-
-    Ok(res)
-  }
-
-  pub async fn set_wallpaper_from_local(a: String) -> String {
-    wallpaper::set_from_path(a.as_str()).unwrap();
+  pub async fn set_wallpaper_from_local(path: &str) -> Result<&str, Box<dyn std::error::Error + Send + Sync>> {
+    wallpaper::set_from_path(path).map_err(|e| e.to_string())?;
 
     if cfg!(not(target_os = "macos")) {
-      wallpaper::set_mode(wallpaper::Mode::Crop).unwrap();
+      wallpaper::set_mode(wallpaper::Mode::Crop).map_err(|e| e.to_string())?;
     }
 
-    a
+    Ok(path)
   }
 
-  pub async fn set_wallpaper(url: &str, filename: &str) -> Result<String, String> {
-    let a = Self::save_wallpaper(url, filename).await;
+  pub async fn set_wallpaper(url: &str, filename: &str) -> Result<String, Box<dyn std::error::Error + Send + Sync>> {
+    let file_path = save_wallpaper(url, filename).await?;
 
-    match a {
-      Ok(a) => {
-        Self::set_wallpaper_from_local(a).await;
+    Self::set_wallpaper_from_local(&file_path).await
+      .map_err(|e| format!("Failed to set wallpaper from local file: {}", e))?;
 
-        Ok(String::from("OK"))
-      }
-      Err(e) => Err(e.to_string().into()),
-    }
+    Ok(String::from("Ok"))
   }
 
-  pub async fn previous_photo(&mut self) {
+  pub async fn previous_photo(&mut self) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     let list = self.cache_list.clone();
 
+    if list.is_empty() {
+      return Err("No wallpapers available in cache".into());
+    }
+
     if self.current_idx <= 0 {
       self.current_idx = list.len() - 1;
     } else {
       self.current_idx -= 1;
     }
 
-    let item = list[self.current_idx].clone();
+    let item = &list[self.current_idx];
 
     Self::set_wallpaper(&item.urls[0], &item.filename)
-      .await
-      .unwrap();
+      .await?;
+
+    Ok(())
   }
 
-  pub async fn next_photo(&mut self) {
+  pub async fn next_photo(&mut self) -> Result<(), Box<dyn std::error::Error + Send + Sync>>{
     let list = self.cache_list.clone();
 
+    if list.is_empty() {
+      return Err("No wallpapers available in cache".into());
+    }
+
     if self.current_idx >= list.len() - 1 {
       self.current_idx = 0;
     } else {
       self.current_idx += 1;
     }
 
-    let item = list[self.current_idx].clone();
+    let item = &list[self.current_idx];
 
     Self::set_wallpaper(&item.urls[0], &item.filename)
-      .await
-      .unwrap();
+      .await?;
+
+    Ok(())
   }
 }
 

src-tauri/Cargo.toml

@@ -7,6 +7,13 @@ use crate::config;
 
 pub type Result<T> = std::result::Result<T, Box<dyn std::error::Error + Send + Sync>>;
 
+use once_cell::sync::Lazy;
+use std::sync::Arc;
+
+static GLOBAL_CLIENT: Lazy<Arc<Client>> = Lazy::new(|| {
+    Arc::new(Client::new())
+});
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct UrlParams {
   pub index: u8,
@@ -87,24 +94,29 @@ impl Wallpaper {
       index,
       number,
       files: vec![],
-      json,
+      json
     })
   }
 
-  pub async fn save_wallpaper(url: &str, filename: Option<&str>) -> Result<String> {
+  pub async fn save_wallpaper(
+    url: &str,
+    filename: Option<&str>,
+  ) -> Result<String> {
     let filename = match filename {
       Some(filename) => filename,
       None => Images::get_filename(url),
     };
-    let app_folder = config::PavoConfig::get_app_folder().unwrap();
+    let app_folder = config::PavoConfig::get_app_folder()
+        .map_err(|e| -> Box<dyn std::error::Error + Send + Sync> {
+            Box::new(std::io::Error::new(std::io::ErrorKind::Other, format!("Error code: {}, message: {}", e.0, e.1)))
+        })?;
     let path = Path::new(&app_folder).join(&*filename);
-    let res = download_file(&Client::new(), &url, path.clone().to_str().unwrap())
-      .await
-      .unwrap();
+    let client = GLOBAL_CLIENT.clone();
+    let res = download_file(&client, &url, path.clone().to_str().unwrap()).await;
 
     println!("{:?}", res);
 
-    Ok(res)
+    return res;
   }
 
   /// set wallpaper from local file