Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: 配置文件存在但读取失败时应该仅报错，不覆盖配置 #71

Merged
merged 1 commit into from
Apr 22, 2024
Merged

fix: 配置文件存在但读取失败时应该仅报错，不覆盖配置 #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ use crate::bilibili::{Credential, DanmakuOption, FilterOption};

pub static CONFIG: Lazy<Config> = Lazy::new(|| {
let config = Config::load().unwrap_or_else(|err| {
warn!("加载配置失败，错误为： {err}，将使用默认配置...");
if err
.downcast_ref::<std::io::Error>()
.map_or(true, |e| e.kind() != std::io::ErrorKind::NotFound)
{
panic!("加载配置文件失败，错误为： {err}");
}
warn!("配置文件不存在，使用默认配置...");
Config::new()
});
// 放到外面，确保新的配置项被保存
Expand Down