remove ctrl c handler of pull

fav_cli/src/bili/action.rs

@@ -2,9 +2,9 @@ use fav_core::ops::{ResOpsExt as _, SetOpsExt as _};
 use fav_core::prelude::*;
 use fav_core::status::SetStatusExt as _;
 use fav_core::visual::{TableRes as _, TableSet as _, TableSets as _};
-use fav_utils::bili::{Bili, BiliRes, BiliSet, BiliSets};
+use fav_utils::bili::{Bili, BiliSets};
 use std::io::Write as _;
-use tracing::{info, warn};
+use tracing::{error, info, warn};
 
 pub(super) fn init() -> FavCoreResult<()> {
  let path = std::path::PathBuf::from(BiliSets::PATH);
@@ -37,17 +37,23 @@ pub(super) async fn logout() -> FavCoreResult<()> {
 }
 
 pub(super) fn status(sets: &mut BiliSets, id: String) -> FavCoreResult<()> {
- let id_ = Id::from(&id);
- if let Some(s) = find_set(sets, &id_) {
- s.table();
- } else if let Some(r) = find_res(sets, &id_) {
- r.table();
- } else {
- return Err(FavCoreError::IdNotUsable {
- id,
- msg: "ID not found".to_string(),
- });
+ let id = Id::from(&id);
+ for set in sets.iter_mut() {
+ if set.id() == id {
+ set.table();
+ } else if let Some(res) = set.iter().find(|r| r.id() == id) {
+ res.table();
+ } else {
+ error!(
+ "{}",
+ FavCoreError::IdNotUsable {
+ id: id.to_string(),
+ msg: "ID not found".to_string(),
+ }
+ );
+ }
  }
+
  Ok(())
 }
 
@@ -86,37 +92,53 @@ pub(super) async fn fetch(sets: &mut BiliSets) -> FavCoreResult<()> {
  Ok(())
 }
 
-pub(super) fn track(sets: &mut BiliSets, id: String) -> FavCoreResult<()> {
- let id_ = Id::from(&id);
- if let Some(s) = find_set(sets, &id_) {
- s.on_status(StatusFlags::TRACK);
- s.on_res_status(StatusFlags::TRACK);
- } else if let Some(r) = find_res(sets, &id_) {
- r.on_status(StatusFlags::TRACK);
- } else {
- return Err(FavCoreError::IdNotUsable {
- id,
- msg: "ID not found".to_string(),
- });
+pub(super) fn track(sets: &mut BiliSets, ids: Vec<String>) -> FavCoreResult<()> {
+ for id in ids.iter().map(Id::from) {
+ for set in sets.iter_mut() {
+ if set.id() == id {
+ set.on_status(StatusFlags::TRACK);
+ set.on_res_status(StatusFlags::TRACK);
+ info!("Tracked set ID: {id}");
+ } else if let Some(res) = set.iter_mut().find(|r| r.id() == id) {
+ res.on_status(StatusFlags::TRACK);
+ info!("Tracked resource ID: {id}");
+ } else {
+ error!(
+ "{}",
+ FavCoreError::IdNotUsable {
+ id: id.to_string(),
+ msg: "ID not found".to_string(),
+ }
+ );
+ }
+ }
  }
- info!("Tracked ID: {id}");
+
  Ok(())
 }
 
-pub(super) fn untrack(sets: &mut BiliSets, id: String) -> FavCoreResult<()> {
- let id_ = Id::from(&id);
- if let Some(s) = find_set(sets, &id_) {
- s.off_status(StatusFlags::TRACK);
- s.medias.clear();
- } else if let Some(r) = find_res(sets, &id_) {
- r.off_status(StatusFlags::TRACK);
- } else {
- return Err(FavCoreError::IdNotUsable {
- id,
- msg: "ID not found".to_string(),
- });
+pub(super) fn untrack(sets: &mut BiliSets, ids: Vec<String>) -> FavCoreResult<()> {
+ for id in ids.iter().map(Id::from) {
+ for set in sets.iter_mut() {
+ if set.id() == id {
+ set.off_status(StatusFlags::TRACK);
+ set.off_res_status(StatusFlags::TRACK);
+ info!("Untracked set ID: {id}");
+ } else if let Some(res) = set.iter_mut().find(|r| r.id() == id) {
+ res.off_status(StatusFlags::TRACK);
+ info!("Untracked resource ID: {id}");
+ } else {
+ error!(
+ "{}",
+ FavCoreError::IdNotUsable {
+ id: id.to_string(),
+ msg: "ID not found".to_string(),
+ }
+ );
+ }
+ }
  }
- info!("Untracked ID: {id}");
+
  Ok(())
 }
 
@@ -135,34 +157,31 @@ pub(super) async fn pull_all(sets: &mut BiliSets) -> FavCoreResult<()> {
  Ok(())
 }
 
-pub(super) async fn pull(sets: &mut BiliSets, id: String) -> FavCoreResult<()> {
+pub(super) async fn pull(sets: &mut BiliSets, ids: Vec<String>) -> FavCoreResult<()> {
  fetch(sets).await?;
+ let ids: Vec<_> = ids.iter().map(Id::from).collect();
  let bili = Bili::read()?;
- let id_ = Id::from(&id);
- if let Some(s) = find_set(sets, &id_) {
- let mut sub = s.subset(|r| {
+ for id in ids.iter() {
+ if let Some(s) = sets.iter_mut().find(|s| s.id() == *id) {
+ let mut sub = s.subset(|r| {
+ !r.check_status(StatusFlags::SAVED)
+ & !r.check_status(StatusFlags::EXPIRED)
+ & r.check_status(StatusFlags::TRACK | StatusFlags::FETCHED)
+ });
+ bili.batch_pull_res(&mut sub).await?;
+ }
+ }
+ let mut sub = sets.subset(|s| s.check_status(StatusFlags::TRACK));
+ for set in sub.iter_mut() {
+ let mut sub = set.subset(|r| {
  !r.check_status(StatusFlags::SAVED)
  & !r.check_status(StatusFlags::EXPIRED)
  & r.check_status(StatusFlags::TRACK | StatusFlags::FETCHED)
+ & ids.contains(&r.id())
  });
  bili.batch_pull_res(&mut sub).await?;
- } else if let Some(r) = find_res(sets, &id_) {
- if !r.check_status(StatusFlags::EXPIRED)
- & r.check_status(StatusFlags::TRACK | StatusFlags::FETCHED)
- {
- bili.pull_res(r).await?;
- } else {
- return Err(FavCoreError::IdNotUsable {
- id,
- msg: "EXPIRED or UNTRACK, unable to fetch".to_string(),
- });
- }
- } else {
- return Err(FavCoreError::IdNotUsable {
- id,
- msg: "Not Found".to_string(),
- });
  }
+
  Ok(())
 }
 
@@ -197,16 +216,3 @@ pub(super) async fn daemon(sets: &mut BiliSets, interval: u64) -> FavCoreResult<
  }
  Ok(())
 }
-
-fn find_set<'a>(sets: &'a mut BiliSets, id: &Id) -> Option<&'a mut BiliSet> {
- sets.iter_mut().find(|s| s.id() == *id)
-}
-
-fn find_res<'a>(sets: &'a mut BiliSets, id: &Id) -> Option<&'a mut BiliRes> {
- for set in sets.iter_mut() {
- if let Some(r) = set.iter_mut().find(|r| r.id() == *id) {
- return Some(r);
- }
- }
- None
-}

fav_cli/src/bili/mod.rs

@@ -6,7 +6,7 @@ use action::*;
 use clap::{error::ErrorKind, CommandFactory as _, Parser, Subcommand, ValueHint};
 use fav_core::{local::ProtoLocal as _, FavCoreResult};
 use fav_utils::bili::BiliSets;
-use tracing::{error, info};
+use tracing::info;
 
 const VERSION: &str = const_format::formatcp!(
  "{}\nRUSTC: {} {} {}",
@@ -150,31 +150,10 @@ impl Cli {
  },
  },
  Commands::Fetch => fetch(&mut sets).await,
- Commands::Track { id } => {
- for id in id {
- if let Err(e) = track(&mut sets, id) {
- error!("{e}");
- }
- }
- Ok(())
- }
- Commands::Untrack { id } => {
- for id in id {
- if let Err(e) = untrack(&mut sets, id) {
- error!("{e}");
- }
- }
- Ok(())
- }
+ Commands::Track { id: ids } => track(&mut sets, ids),
+ Commands::Untrack { id: ids } => untrack(&mut sets, ids),
  Commands::Pull { id } => match id {
- Some(id) => {
- for id in id {
- if let Err(e) = pull(&mut sets, id).await {
- error!("{e}");
- }
- }
- Ok(())
- }
+ Some(ids) => pull(&mut sets, ids).await,
  None => pull_all(&mut sets).await,
  },
  Commands::Daemon { interval } => daemon(&mut sets, interval).await,

fav_core/src/attr.rs

@@ -1,6 +1,8 @@
 //! Attribute,
 //! managing the resources' attributes
 
+use std::fmt::Display;
+
 #[cfg(feature = "derive")]
 pub use fav_derive::Attr;
 
@@ -154,3 +156,13 @@ impl From<Id<'_>> for String {
  }
  }
 }
+
+impl Display for Id<'_> {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ Id::I64(id) => write!(f, "{}", id),
+ Id::I32(id) => write!(f, "{}", id),
+ Id::String(id) => write!(f, "{}", id),
+ }
+ }
+}

fav_utils/src/bili/local.rs

@@ -62,11 +62,6 @@ impl SaveLocal for Bili {
  None => finish_a = true,
  }
  },
- _ = tokio::signal::ctrl_c() => {
- file_v.into_inner().unwrap().close()?;
- file_a.into_inner().unwrap().close()?;
- return Err(FavCoreError::Cancel)
- }
  }
  if finish_v && finish_a {
  break;