fix: mark expired by mistake when fetching resources without network

kingwingfly · May 5, 2024 · ee5ba49 · ee5ba49
1 parent fb5459e
commit ee5ba49
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,9 +10,10 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
 
 ## [Unreleased]
 
-## [0.2.15] - 2024-05-04
+## [0.2.15] - 2024-05-06
 
 - utils: remove duplicated status change.
+- fix: `fav fetch` will mark all resources as `expired` if no network. This command fetches sets before resources, so the bug only happens when network disconnected after fetching sets successfully, it's rare.
 
 ## [0.2.14] - 2024-04-25
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,7 @@ resolver = "2"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [workspace.package]
-version = "0.2.14"
+version = "0.2.15"
 authors = ["Louis <836250617@qq.com>"]
 description = "Back up your favorite online resources with CLI."
 license = "MIT"

diff --git a/fav_utils/src/bili/ops.rs b/fav_utils/src/bili/ops.rs
@@ -88,7 +88,8 @@ impl ResOps for Bili {
             res = self.request_proto::<BiliRes>(ApiKind::FetchRes, params, "/data") => {
                     match res {
                         Ok(res) => *resource |= res,
-                        Err(_) => resource.on_status(StatusFlags::EXPIRED),
+                        Err(e) if matches!(e, FavCoreError::NetworkError(_)) => Err(e)?,
+                        _ => resource.on_status(StatusFlags::EXPIRED),
                     }
                     resource.on_status(StatusFlags::FETCHED);
                 },