- enhance: fav -d /path to set working directory.

- enhance: `fav auth reuse` can receive path both containing or not containing `.fav`.
- enhance: add a systemd service example in README.

CHANGELOG.md

@@ -9,6 +9,12 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
 -->
 
 ## [Unreleased]
+## [0.2.35] - 2024-11-10
+
+- enhance: `fav -d /path` to set working directory.
+- enhance: `fav auth reuse` can receive path both containing or not containing `.fav`.
+- enhance: add a systemd service example in README.
+
 ## [0.2.34] - 2024-11-06
 
 - bump dependencies

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.34"
+version = "0.2.35"
 authors = ["Louis <[email protected]>"]
 description = "Back up your favorite online resources with CLI."
 license = "MIT"
@@ -14,10 +14,10 @@ repository = "https://github.com/kingwingfly/fav"
 documentation = ""
 
 [workspace.dependencies]
-fav_core = { path = "fav_core", version = "0.1.5" }
+fav_core = { path = "fav_core", version = "0.1.6" }
 fav_derive = { path = "fav_derive", version = "0.0.3" }
 fav_utils = { path = "fav_utils", version = "0.0.14" }
-fav_cli = { path = "fav_cli", version = "0.2.34" }
+fav_cli = { path = "fav_cli", version = "0.2.35" }
 
 [profile.release]
 lto = "fat"

README.md

@@ -164,6 +164,24 @@ $ fav daemon 30
 $ fav status -r | awk -F '│' '{print $3}' | grep -v '^\s*$' | sort | uniq -c | sort -n
 ```
 
+Service example:
+```ini
+# fav.service
+[Unit]
+Description=Fav Daemon Service
+After=network-online.target
+
+[Service]
+Type=simple
+User=your_user
+WorkingDirectory=/path/to/fav_set
+ExecStart=/usr/local/bin/fav daemon 180
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+```
+
 _For more examples, please refer to the [Documentation](https://github.com/kingwingfly/fav)_
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>

fav_cli/Cargo.toml

@@ -18,7 +18,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 fav_core = { workspace = true }
 fav_utils = { workspace = true }
 # CLI
-clap = { version = "4.5", features = ["derive"] }
+clap = { version = "4.5", features = ["derive", "string"] }
 clap_complete = { version = "4" }
 # Async
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }

fav_cli/src/bili/mod.rs

@@ -6,6 +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 std::env::{current_dir, set_current_dir};
 use tracing::info;
 
 const VERSION: &str = const_format::formatcp!(
@@ -23,6 +24,8 @@ const VERSION: &str = const_format::formatcp!(
 #[derive(Parser)]
 #[command(author, version = VERSION, about)]
 pub struct Cli {
+    #[clap(short = 'd', long, default_value = current_dir().unwrap().into_os_string())]
+    working_dir: std::path::PathBuf,
     #[clap(subcommand)]
     subcmd: Commands,
 }
@@ -97,7 +100,7 @@ enum AuthCommand {
     Logout,
     /// Reuse the login info
     Reuse {
-        /// The path of .fav folder, example: /path/to/.fav
+        /// The path of .fav folder, example: /path/to/dir_containing_`.fav`
         #[arg(value_hint = ValueHint::DirPath)]
         path: std::path::PathBuf,
     },
@@ -107,6 +110,7 @@ impl Cli {
     /// Run the CLI.
     pub async fn run() -> FavCoreResult<()> {
         let args = Self::parse();
+        set_current_dir(args.working_dir)?;
         match args.subcmd {
             Commands::Init => init()?,
             Commands::Auth {
@@ -123,7 +127,8 @@ impl Cli {
                         match authcmd {
                             AuthCommand::Login => login().await?,
                             AuthCommand::Reuse { path } => {
-                                std::fs::hard_link(path.join("bili"), ".fav/bili")?;
+                                std::fs::hard_link(path.join("bili"), ".fav/bili")
+                                    .or(std::fs::hard_link(path.join(".fav/bili"), ".fav/bili"))?;
                                 info!("Reuse the login info from {}", path.display());
                             }
                             _ => unreachable!(),

fav_core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fav_core"
-version = "0.1.5"
+version = "0.1.6"
 authors.workspace = true
 description = "Fav's core crate; A collection of traits."
 license.workspace = true

fav_core/src/config.rs

@@ -1,10 +1,9 @@
 //! Config,
 //! helping managing the configuration
 
-use std::collections::HashMap;
-
 use crate::local::ProtoLocal;
 use reqwest::header::{HeaderMap, HeaderValue};
+use std::collections::HashMap;
 
 /// A HttpConfig, including headers and cookies.
 /// # Example

fav_core/src/local.rs

@@ -4,6 +4,7 @@
 use crate::{ops::Net, res::Res, FavCoreResult};
 use core::future::Future;
 use protobuf::MessageFull;
+use std::path::PathBuf;
 use url::Url;
 
 /// Refer to a path on disk;
@@ -36,7 +37,7 @@ pub trait ProtoLocal: PathInfo + MessageFull {
     /// Write the protobuf to file, which is at `PathInfo::PATH`
     /// Create the parent directory if not exists
     fn write(&self) -> FavCoreResult<()> {
-        let path = std::path::PathBuf::from(Self::PATH);
+        let path = PathBuf::from(Self::PATH);
         if let Some(parent) = path.parent() {
             std::fs::create_dir_all(parent)?;
         }
@@ -47,14 +48,14 @@ pub trait ProtoLocal: PathInfo + MessageFull {
 
     /// Read the protobuf from file, which is at `PathInfo::PATH`
     fn read() -> FavCoreResult<Self> {
-        let path = std::path::PathBuf::from(Self::PATH);
+        let path = PathBuf::from(Self::PATH);
         let mut file = std::fs::File::open(path)?;
         Ok(Self::parse_from_reader(&mut file)?)
     }
 
     /// Remove the resource, which is at `PathInfo::PATH`
     fn remove() {
-        let path = std::path::PathBuf::from(Self::PATH);
+        let path = PathBuf::from(Self::PATH);
         std::fs::remove_file(path).ok(); // Just omit the result
     }
 }