chore: 修改项目路径结构，使用 workspace 组织包 (#118)

amtoaer · Jun 7, 2024 · 1744f86 · 1744f86
1 parent c4db12b
commit 1744f86
Show file tree

Hide file tree

Showing 44 changed files with 181 additions and 4,753 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,47 +1,55 @@
-[package]
-name = "bili-sync-rs"
+[workspace]
+members = ["crates/*"]
+default-members = ["crates/bili_sync"]
+resolver = "2"
+
+[workspace.package]
 version = "2.0.3"
-edition = "2021"
 authors = ["amtoaer <amtoaer@gmail.com>"]
 license = "MIT"
 description = "基于 rust tokio 编写的 bilibili 收藏夹同步下载工具"
+edition = "2021"
+publish = false
+
+[workspace.dependencies]
+bili_sync_entity = { path = "crates/bili_sync_entity" }
+bili_sync_migration = { path = "crates/bili_sync_migration" }
 
-[dependencies]
 anyhow = { version = "1.0.81", features = ["backtrace"] }
 arc-swap = { version = "1.7", features = ["serde"] }
+async-std = { version = "1", features = ["attributes", "tokio1"] }
 async-stream = "0.3.5"
 chrono = { version = "0.4.35", features = ["serde"] }
 cookie = "0.18.0"
 dirs = "5.0.1"
-entity = { path = "entity" }
 filenamify = "0.1.0"
 float-ord = "0.3.2"
 futures = "0.3.30"
 handlebars = "5.1.2"
 hex = "0.4.3"
 log = "0.4.21"
 memchr = "2.5.0"
-migration = { path = "migration" }
 once_cell = "1.19.0"
 prost = "0.12.4"
 quick-xml = { version = "0.31.0", features = ["async-tokio"] }
 rand = "0.8.5"
 regex = "1.10.3"
 reqwest = { version = "0.12.4", features = [
-  "json",
-  "stream",
+  "charset",
   "cookies",
   "gzip",
-  "charset",
   "http2",
+  "json",
   "rustls-tls",
+  "stream",
 ], default-features = false }
 rsa = { version = "0.9.6", features = ["sha2"] }
 sea-orm = { version = "0.12", features = [
-  "sqlx-sqlite",
-  "runtime-tokio-rustls",
   "macros",
+  "runtime-tokio-rustls",
+  "sqlx-sqlite",
 ] }
+sea-orm-migration = { version = "0.12.0", features = [] }
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0"
 strum = { version = "0.26", features = ["derive"] }
@@ -51,9 +59,6 @@ toml = "0.8.12"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["chrono"] }
 
-[workspace]
-members = [".", "entity", "migration"]
-
 [profile.release]
 strip = true
 lto = "thin"

diff --git a/crates/bili_sync/Cargo.toml b/crates/bili_sync/Cargo.toml
@@ -0,0 +1,46 @@
+[package]
+name = "bili_sync"
+version = { workspace = true }
+edition = { workspace = true }
+authors = { workspace = true }
+license = { workspace = true }
+description = { workspace = true }
+publish = { workspace = true }
+readme = "../../README.md"
+
+[dependencies]
+anyhow = { workspace = true }
+arc-swap = { workspace = true }
+async-stream = { workspace = true }
+bili_sync_entity = { workspace = true }
+bili_sync_migration = { workspace = true }
+chrono = { workspace = true }
+cookie = { workspace = true }
+dirs = { workspace = true }
+filenamify = { workspace = true }
+float-ord = { workspace = true }
+futures = { workspace = true }
+handlebars = { workspace = true }
+hex = { workspace = true }
+log = { workspace = true }
+memchr = { workspace = true }
+once_cell = { workspace = true }
+prost = { workspace = true }
+quick-xml = { workspace = true }
+rand = { workspace = true }
+regex = { workspace = true }
+reqwest = { workspace = true }
+rsa = { workspace = true }
+sea-orm = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+strum = { workspace = true }
+thiserror = { workspace = true }
+tokio = { workspace = true }
+toml = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+
+[[bin]]
+name = "bili-sync-rs"
+path = "src/main.rs"
diff --git a/src/bilibili/analyzer.rs → crates/bili_sync/src/bilibili/analyzer.rs b/src/bilibili/analyzer.rs → crates/bili_sync/src/bilibili/analyzer.rs
diff --git a/src/bilibili/client.rs → crates/bili_sync/src/bilibili/client.rs b/src/bilibili/client.rs → crates/bili_sync/src/bilibili/client.rs
diff --git a/src/bilibili/credential.rs → crates/bili_sync/src/bilibili/credential.rs b/src/bilibili/credential.rs → crates/bili_sync/src/bilibili/credential.rs
diff --git a/src/bilibili/danmaku/ass_writer.rs → ...i_sync/src/bilibili/danmaku/ass_writer.rs b/src/bilibili/danmaku/ass_writer.rs → ...i_sync/src/bilibili/danmaku/ass_writer.rs
diff --git a/src/bilibili/danmaku/canvas/lane.rs → ..._sync/src/bilibili/danmaku/canvas/lane.rs b/src/bilibili/danmaku/canvas/lane.rs → ..._sync/src/bilibili/danmaku/canvas/lane.rs
diff --git a/src/bilibili/danmaku/canvas/mod.rs → ...i_sync/src/bilibili/danmaku/canvas/mod.rs b/src/bilibili/danmaku/canvas/mod.rs → ...i_sync/src/bilibili/danmaku/canvas/mod.rs
diff --git a/src/bilibili/danmaku/danmu.rs → ...s/bili_sync/src/bilibili/danmaku/danmu.rs b/src/bilibili/danmaku/danmu.rs → ...s/bili_sync/src/bilibili/danmaku/danmu.rs
diff --git a/src/bilibili/danmaku/drawable.rs → ...ili_sync/src/bilibili/danmaku/drawable.rs b/src/bilibili/danmaku/drawable.rs → ...ili_sync/src/bilibili/danmaku/drawable.rs
diff --git a/src/bilibili/danmaku/mod.rs → crates/bili_sync/src/bilibili/danmaku/mod.rs b/src/bilibili/danmaku/mod.rs → crates/bili_sync/src/bilibili/danmaku/mod.rs
diff --git a/src/bilibili/danmaku/model.rs → ...s/bili_sync/src/bilibili/danmaku/model.rs b/src/bilibili/danmaku/model.rs → ...s/bili_sync/src/bilibili/danmaku/model.rs
diff --git a/src/bilibili/danmaku/writer.rs → .../bili_sync/src/bilibili/danmaku/writer.rs b/src/bilibili/danmaku/writer.rs → .../bili_sync/src/bilibili/danmaku/writer.rs
diff --git a/src/bilibili/error.rs → crates/bili_sync/src/bilibili/error.rs b/src/bilibili/error.rs → crates/bili_sync/src/bilibili/error.rs
diff --git a/src/bilibili/favorite_list.rs → ...s/bili_sync/src/bilibili/favorite_list.rs b/src/bilibili/favorite_list.rs → ...s/bili_sync/src/bilibili/favorite_list.rs
diff --git a/src/bilibili/mod.rs → crates/bili_sync/src/bilibili/mod.rs b/src/bilibili/mod.rs → crates/bili_sync/src/bilibili/mod.rs
diff --git a/src/bilibili/video.rs → crates/bili_sync/src/bilibili/video.rs b/src/bilibili/video.rs → crates/bili_sync/src/bilibili/video.rs
diff --git a/src/config.rs → crates/bili_sync/src/config.rs b/src/config.rs → crates/bili_sync/src/config.rs
diff --git a/src/core/command.rs → crates/bili_sync/src/core/command.rs b/src/core/command.rs → crates/bili_sync/src/core/command.rs
@@ -4,7 +4,7 @@ use std::path::{Path, PathBuf};
 use std::pin::Pin;
 
 use anyhow::{bail, Result};
-use entity::{favorite, page, video};
+use bili_sync_entity::{favorite, page, video};
 use filenamify::filenamify;
 use futures::stream::{FuturesOrdered, FuturesUnordered};
 use futures::{pin_mut, Future, StreamExt};

diff --git a/src/core/mod.rs → crates/bili_sync/src/core/mod.rs b/src/core/mod.rs → crates/bili_sync/src/core/mod.rs
diff --git a/src/core/status.rs → crates/bili_sync/src/core/status.rs b/src/core/status.rs → crates/bili_sync/src/core/status.rs
diff --git a/src/core/utils.rs → crates/bili_sync/src/core/utils.rs b/src/core/utils.rs → crates/bili_sync/src/core/utils.rs
@@ -2,10 +2,10 @@ use std::collections::HashSet;
 use std::path::Path;
 
 use anyhow::Result;
-use entity::*;
+use bili_sync_entity::*;
+use bili_sync_migration::OnConflict;
 use filenamify::filenamify;
 use handlebars::handlebars_helper;
-use migration::OnConflict;
 use once_cell::sync::Lazy;
 use quick_xml::events::{BytesCData, BytesText};
 use quick_xml::writer::Writer;

diff --git a/src/database.rs → crates/bili_sync/src/database.rs b/src/database.rs → crates/bili_sync/src/database.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use migration::{Migrator, MigratorTrait};
+use bili_sync_migration::{Migrator, MigratorTrait};
 use sea_orm::{ConnectOptions, Database, DatabaseConnection};
 use tokio::fs;
 

diff --git a/src/downloader.rs → crates/bili_sync/src/downloader.rs b/src/downloader.rs → crates/bili_sync/src/downloader.rs
diff --git a/src/error.rs → crates/bili_sync/src/error.rs b/src/error.rs → crates/bili_sync/src/error.rs
diff --git a/src/main.rs → crates/bili_sync/src/main.rs b/src/main.rs → crates/bili_sync/src/main.rs
diff --git a/crates/bili_sync_entity/Cargo.toml b/crates/bili_sync_entity/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "bili_sync_entity"
+version = { workspace = true }
+edition = { workspace = true }
+publish = { workspace = true }
+
+[dependencies]
+sea-orm = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
diff --git a/entity/src/entities/favorite.rs → ...bili_sync_entity/src/entities/favorite.rs b/entity/src/entities/favorite.rs → ...bili_sync_entity/src/entities/favorite.rs
diff --git a/entity/src/entities/mod.rs → crates/bili_sync_entity/src/entities/mod.rs b/entity/src/entities/mod.rs → crates/bili_sync_entity/src/entities/mod.rs
diff --git a/entity/src/entities/page.rs → crates/bili_sync_entity/src/entities/page.rs b/entity/src/entities/page.rs → crates/bili_sync_entity/src/entities/page.rs
diff --git a/entity/src/entities/prelude.rs → .../bili_sync_entity/src/entities/prelude.rs b/entity/src/entities/prelude.rs → .../bili_sync_entity/src/entities/prelude.rs
diff --git a/entity/src/entities/video.rs → ...es/bili_sync_entity/src/entities/video.rs b/entity/src/entities/video.rs → ...es/bili_sync_entity/src/entities/video.rs
diff --git a/entity/src/lib.rs → crates/bili_sync_entity/src/lib.rs b/entity/src/lib.rs → crates/bili_sync_entity/src/lib.rs
diff --git a/crates/bili_sync_migration/Cargo.toml b/crates/bili_sync_migration/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "bili_sync_migration"
+version = { workspace = true }
+edition = { workspace = true }
+publish = { workspace = true }
+
+[dependencies]
+async-std = { workspace = true }
+sea-orm-migration = { workspace = true }
diff --git a/migration/src/lib.rs → crates/bili_sync_migration/src/lib.rs b/migration/src/lib.rs → crates/bili_sync_migration/src/lib.rs
diff --git a/...tion/src/m20240322_000001_create_table.rs → ...tion/src/m20240322_000001_create_table.rs b/...tion/src/m20240322_000001_create_table.rs → ...tion/src/m20240322_000001_create_table.rs
diff --git a/migration/src/main.rs → crates/bili_sync_migration/src/main.rs b/migration/src/main.rs → crates/bili_sync_migration/src/main.rs
@@ -2,5 +2,5 @@ use sea_orm_migration::prelude::*;
 
 #[async_std::main]
 async fn main() {
-    cli::run_cli(migration::Migrator).await;
+    cli::run_cli(bili_sync_migration::Migrator).await;
 }