core and utils

kingwingfly · Feb 7, 2024 · 3cd2177 · 3cd2177
1 parent 0940607
commit 3cd2177
Show file tree

Hide file tree

Showing 31 changed files with 50 additions and 50 deletions.
diff --git a/fav/src/main.rs b/fav/src/main.rs
@@ -1,4 +1,4 @@
-use fav_core::Cli;
+use fav_utils::Cli;
 use tracing::Level;
 use tracing_subscriber::{filter, prelude::*};
 

diff --git a/fav_core/Cargo.toml b/fav_core/Cargo.toml
@@ -9,40 +9,3 @@ repository.workspace = true
 documentation.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-# CLI
-clap = { version = "4.4", features = ["derive"]}
-tabled = "0.15.0"
-indicatif = { version = "0.17", features = ["tokio"] }
-clap_complete = { version = "4" }
-# Error
-snafu = { version = "0.8" }
-# Serde
-serde = { version = "1", features = ["derive"] }
-serde_json = { version = "1" }
-# ProtoBuf
-protobuf = { version = "3", features = ["with-bytes"] }
-protobuf-json-mapping = { version = "3" }
-# Net
-reqwest = { version = "0.11", features = ["json", "cookies"] }
-# Runtime
-tokio = { version = "1", features = ["macros", "rt-multi-thread", "signal", "process"] }
-# tracing
-tracing = { version = "0.1" }
-tracing-subscriber = { version = "0.3" }
-# Tools
-qrcode = { version = "0.13", default-features = false }
-rand = "0.8.5"
-base64 = "0.21.7"
-tempfile = "3.9.0"
-sanitize-filename = "0.5.0"
-md5 = "0.7.0"
-chrono = "0.4.33"
-
-[build-dependencies]
-protobuf-codegen = { version = "3" }
-
-[features]
-default = ["bili"]
-bili = []
diff --git a/fav_core/src/lib.rs b/fav_core/src/lib.rs
@@ -1,12 +0,0 @@
-//! helper functions for the CLI
-
-#![deny(missing_docs)]
-
-mod api;
-mod cli;
-mod config;
-mod daemon;
-mod meta;
-mod proto;
-
-pub use cli::Cli;

diff --git a/fav_utils/Cargo.toml b/fav_utils/Cargo.toml
@@ -9,3 +9,40 @@ repository.workspace = true
 documentation.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+# CLI
+clap = { version = "4.4", features = ["derive"]}
+tabled = "0.15.0"
+indicatif = { version = "0.17", features = ["tokio"] }
+clap_complete = { version = "4" }
+# Error
+snafu = { version = "0.8" }
+# Serde
+serde = { version = "1", features = ["derive"] }
+serde_json = { version = "1" }
+# ProtoBuf
+protobuf = { version = "3", features = ["with-bytes"] }
+protobuf-json-mapping = { version = "3" }
+# Net
+reqwest = { version = "0.11", features = ["json", "cookies"] }
+# Runtime
+tokio = { version = "1", features = ["macros", "rt-multi-thread", "signal", "process"] }
+# tracing
+tracing = { version = "0.1" }
+tracing-subscriber = { version = "0.3" }
+# Tools
+qrcode = { version = "0.13", default-features = false }
+rand = "0.8.5"
+base64 = "0.21.7"
+tempfile = "3.9.0"
+sanitize-filename = "0.5.0"
+md5 = "0.7.0"
+chrono = "0.4.33"
+
+[build-dependencies]
+protobuf-codegen = { version = "3" }
+
+[features]
+default = ["bili"]
+bili = []
diff --git a/fav_core/build.rs → fav_utils/build.rs b/fav_core/build.rs → fav_utils/build.rs
diff --git a/fav_core/proto/data.proto → fav_utils/proto/data.proto b/fav_core/proto/data.proto → fav_utils/proto/data.proto
diff --git a/fav_core/src/api/auth/activate.rs → fav_utils/src/api/auth/activate.rs b/fav_core/src/api/auth/activate.rs → fav_utils/src/api/auth/activate.rs
diff --git a/fav_core/src/api/auth/login.rs → fav_utils/src/api/auth/login.rs b/fav_core/src/api/auth/login.rs → fav_utils/src/api/auth/login.rs
diff --git a/fav_core/src/api/auth/logout.rs → fav_utils/src/api/auth/logout.rs b/fav_core/src/api/auth/logout.rs → fav_utils/src/api/auth/logout.rs
diff --git a/fav_core/src/api/auth/mod.rs → fav_utils/src/api/auth/mod.rs b/fav_core/src/api/auth/mod.rs → fav_utils/src/api/auth/mod.rs
diff --git a/fav_core/src/api/auth/payload.json → fav_utils/src/api/auth/payload.json b/fav_core/src/api/auth/payload.json → fav_utils/src/api/auth/payload.json
diff --git a/fav_core/src/api/auth/utils.rs → fav_utils/src/api/auth/utils.rs b/fav_core/src/api/auth/utils.rs → fav_utils/src/api/auth/utils.rs
diff --git a/fav_core/src/api/error.rs → fav_utils/src/api/error.rs b/fav_core/src/api/error.rs → fav_utils/src/api/error.rs
diff --git a/fav_core/src/api/fetch.rs → fav_utils/src/api/fetch.rs b/fav_core/src/api/fetch.rs → fav_utils/src/api/fetch.rs
diff --git a/fav_core/src/api/init.rs → fav_utils/src/api/init.rs b/fav_core/src/api/init.rs → fav_utils/src/api/init.rs
diff --git a/fav_core/src/api/like.rs → fav_utils/src/api/like.rs b/fav_core/src/api/like.rs → fav_utils/src/api/like.rs
diff --git a/fav_core/src/api/mod.rs → fav_utils/src/api/mod.rs b/fav_core/src/api/mod.rs → fav_utils/src/api/mod.rs
diff --git a/fav_core/src/api/modify.rs → fav_utils/src/api/modify.rs b/fav_core/src/api/modify.rs → fav_utils/src/api/modify.rs
diff --git a/fav_core/src/api/pull.rs → fav_utils/src/api/pull.rs b/fav_core/src/api/pull.rs → fav_utils/src/api/pull.rs
diff --git a/fav_core/src/api/status.rs → fav_utils/src/api/status.rs b/fav_core/src/api/status.rs → fav_utils/src/api/status.rs
diff --git a/fav_core/src/api/track.rs → fav_utils/src/api/track.rs b/fav_core/src/api/track.rs → fav_utils/src/api/track.rs
diff --git a/fav_core/src/api/untrack.rs → fav_utils/src/api/untrack.rs b/fav_core/src/api/untrack.rs → fav_utils/src/api/untrack.rs
diff --git a/fav_core/src/api/wbi.rs → fav_utils/src/api/wbi.rs b/fav_core/src/api/wbi.rs → fav_utils/src/api/wbi.rs
diff --git a/fav_core/src/cli/mod.rs → fav_utils/src/cli/mod.rs b/fav_core/src/cli/mod.rs → fav_utils/src/cli/mod.rs
diff --git a/fav_core/src/cli/utils.rs → fav_utils/src/cli/utils.rs b/fav_core/src/cli/utils.rs → fav_utils/src/cli/utils.rs
diff --git a/fav_core/src/config/mod.rs → fav_utils/src/config/mod.rs b/fav_core/src/config/mod.rs → fav_utils/src/config/mod.rs
diff --git a/fav_core/src/daemon.rs → fav_utils/src/daemon.rs b/fav_core/src/daemon.rs → fav_utils/src/daemon.rs
diff --git a/fav_utils/src/lib.rs b/fav_utils/src/lib.rs
@@ -0,0 +1,12 @@
+//! helper functions for the CLI
+
+#![deny(missing_docs)]
+
+mod api;
+mod cli;
+mod config;
+mod daemon;
+mod meta;
+mod proto;
+
+pub use cli::Cli;
diff --git a/fav_core/src/meta/mod.rs → fav_utils/src/meta/mod.rs b/fav_core/src/meta/mod.rs → fav_utils/src/meta/mod.rs
diff --git a/fav_core/src/proto/data.rs → fav_utils/src/proto/data.rs b/fav_core/src/proto/data.rs → fav_utils/src/proto/data.rs
diff --git a/fav_core/src/proto/mod.rs → fav_utils/src/proto/mod.rs b/fav_core/src/proto/mod.rs → fav_utils/src/proto/mod.rs