bbn: Use workspace

bouzuya · Jan 20, 2023 · 4ba697b · 4ba697b
1 parent 7dde25e
commit 4ba697b
Show file tree

Hide file tree

Showing 67 changed files with 33 additions and 31 deletions.
diff --git a/bbn/Cargo.toml b/bbn/Cargo.toml
@@ -1,30 +1,2 @@
-[package]
-name = "bbn"
-version = "0.35.1"
-authors = ["bouzuya <m@bouzuya.net>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-anyhow = "1.0.41"
-chrono = "0.4.19"
-console = "0.14.1"
-date-range = { path = "../date-range/" }
-dialoguer = "0.8.0"
-diff = "0.1.12"
-hatena-blog-api = { git = "https://github.com/bouzuya/rust-hatena-blog-api", tag = "0.1.0" }
-nom = "6.1.2"
-open = "1.7.0"
-serde = { version = "1.0.126", features = ["derive"] }
-serde_json = "1.0.64"
-sqlx = { version = "0.5.5", features = [ "runtime-tokio-rustls", "sqlite" ] }
-structopt = "0.3.21"
-thiserror = "1.0.30"
-tokio = { version = "1.7.1", features = ["full"] }
-xdg = "2.2.0"
-
-[dev-dependencies]
-assert_cmd = "1.0.4"
-predicates = "2.0.2"
-tempfile = "3.2.0"
+[workspace]
+members = ["crates/*"]
diff --git a/bbn/crates/bbn/Cargo.toml b/bbn/crates/bbn/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "bbn"
+version = "0.35.1"
+authors = ["bouzuya <m@bouzuya.net>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.41"
+chrono = "0.4.19"
+console = "0.14.1"
+date-range = { path = "../../../date-range/" }
+dialoguer = "0.8.0"
+diff = "0.1.12"
+hatena-blog-api = { git = "https://github.com/bouzuya/rust-hatena-blog-api", tag = "0.1.0" }
+nom = "6.1.2"
+open = "1.7.0"
+serde = { version = "1.0.126", features = ["derive"] }
+serde_json = "1.0.64"
+sqlx = { version = "0.5.5", features = [ "runtime-tokio-rustls", "sqlite" ] }
+structopt = "0.3.21"
+thiserror = "1.0.30"
+tokio = { version = "1.7.1", features = ["full"] }
+xdg = "2.2.0"
+
+[dev-dependencies]
+assert_cmd = "1.0.4"
+predicates = "2.0.2"
+tempfile = "3.2.0"
diff --git a/bbn/sql/create_collection_response.sql → ...es/bbn/sql/create_collection_response.sql b/bbn/sql/create_collection_response.sql → ...es/bbn/sql/create_collection_response.sql
diff --git a/bbn/sql/create_entry.sql → bbn/crates/bbn/sql/create_entry.sql b/bbn/sql/create_entry.sql → bbn/crates/bbn/sql/create_entry.sql
diff --git a/bbn/sql/create_indexing.sql → bbn/crates/bbn/sql/create_indexing.sql b/bbn/sql/create_indexing.sql → bbn/crates/bbn/sql/create_indexing.sql
diff --git a/...l/create_indexing_collection_response.sql → ...l/create_indexing_collection_response.sql b/...l/create_indexing_collection_response.sql → ...l/create_indexing_collection_response.sql
diff --git a/bbn/sql/create_member_request.sql → bbn/crates/bbn/sql/create_member_request.sql b/bbn/sql/create_member_request.sql → bbn/crates/bbn/sql/create_member_request.sql
diff --git a/bbn/sql/create_member_request_result.sql → .../bbn/sql/create_member_request_result.sql b/bbn/sql/create_member_request_result.sql → .../bbn/sql/create_member_request_result.sql
diff --git a/bbn/sql/create_member_response.sql → ...crates/bbn/sql/create_member_response.sql b/bbn/sql/create_member_response.sql → ...crates/bbn/sql/create_member_response.sql
diff --git a/bbn/sql/create_successful_indexing.sql → ...es/bbn/sql/create_successful_indexing.sql b/bbn/sql/create_successful_indexing.sql → ...es/bbn/sql/create_successful_indexing.sql
diff --git a/...sql/create_table_collection_responses.sql → ...sql/create_table_collection_responses.sql b/...sql/create_table_collection_responses.sql → ...sql/create_table_collection_responses.sql
diff --git a/bbn/sql/create_table_entries.sql → bbn/crates/bbn/sql/create_table_entries.sql b/bbn/sql/create_table_entries.sql → bbn/crates/bbn/sql/create_table_entries.sql
diff --git a/...e_table_indexing_collection_responses.sql → ...e_table_indexing_collection_responses.sql b/...e_table_indexing_collection_responses.sql → ...e_table_indexing_collection_responses.sql
diff --git a/bbn/sql/create_table_indexings.sql → ...crates/bbn/sql/create_table_indexings.sql b/bbn/sql/create_table_indexings.sql → ...crates/bbn/sql/create_table_indexings.sql
diff --git a/...l/create_table_member_request_results.sql → ...l/create_table_member_request_results.sql b/...l/create_table_member_request_results.sql → ...l/create_table_member_request_results.sql
diff --git a/bbn/sql/create_table_member_requests.sql → .../bbn/sql/create_table_member_requests.sql b/bbn/sql/create_table_member_requests.sql → .../bbn/sql/create_table_member_requests.sql
diff --git a/bbn/sql/create_table_member_responses.sql → ...bbn/sql/create_table_member_responses.sql b/bbn/sql/create_table_member_responses.sql → ...bbn/sql/create_table_member_responses.sql
diff --git a/...sql/create_table_successful_indexings.sql → ...sql/create_table_successful_indexings.sql b/...sql/create_table_successful_indexings.sql → ...sql/create_table_successful_indexings.sql
diff --git a/bbn/sql/delete_entry.sql → bbn/crates/bbn/sql/delete_entry.sql b/bbn/sql/delete_entry.sql → bbn/crates/bbn/sql/delete_entry.sql
diff --git a/...d_collection_responses_by_indexing_id.sql → ...d_collection_responses_by_indexing_id.sql b/...d_collection_responses_by_indexing_id.sql → ...d_collection_responses_by_indexing_id.sql
diff --git a/bbn/sql/find_entries_by_updated_range.sql → ...bbn/sql/find_entries_by_updated_range.sql b/bbn/sql/find_entries_by_updated_range.sql → ...bbn/sql/find_entries_by_updated_range.sql
diff --git a/bbn/sql/find_entries_updated_and_title.sql → ...bn/sql/find_entries_updated_and_title.sql b/bbn/sql/find_entries_updated_and_title.sql → ...bn/sql/find_entries_updated_and_title.sql
diff --git a/bbn/sql/find_entries_waiting_for_parsing.sql → .../sql/find_entries_waiting_for_parsing.sql b/bbn/sql/find_entries_waiting_for_parsing.sql → .../sql/find_entries_waiting_for_parsing.sql
diff --git a/bbn/sql/find_entry_by_id.sql → bbn/crates/bbn/sql/find_entry_by_id.sql b/bbn/sql/find_entry_by_id.sql → bbn/crates/bbn/sql/find_entry_by_id.sql
diff --git a/bbn/sql/find_entry_by_updated.sql → bbn/crates/bbn/sql/find_entry_by_updated.sql b/bbn/sql/find_entry_by_updated.sql → bbn/crates/bbn/sql/find_entry_by_updated.sql
diff --git a/bbn/sql/find_incomplete_member_requests.sql → ...n/sql/find_incomplete_member_requests.sql b/bbn/sql/find_incomplete_member_requests.sql → ...n/sql/find_incomplete_member_requests.sql
diff --git a/bbn/sql/find_indexing.sql → bbn/crates/bbn/sql/find_indexing.sql b/bbn/sql/find_indexing.sql → bbn/crates/bbn/sql/find_indexing.sql
diff --git a/bbn/sql/find_last_parsed_at.sql → bbn/crates/bbn/sql/find_last_parsed_at.sql b/bbn/sql/find_last_parsed_at.sql → bbn/crates/bbn/sql/find_last_parsed_at.sql
diff --git a/...d_last_successful_indexing_started_at.sql → ...d_last_successful_indexing_started_at.sql b/...d_last_successful_indexing_started_at.sql → ...d_last_successful_indexing_started_at.sql
diff --git a/bbn/src/bbn_date_range.rs → bbn/crates/bbn/src/bbn_date_range.rs b/bbn/src/bbn_date_range.rs → bbn/crates/bbn/src/bbn_date_range.rs
diff --git a/bbn/src/bbn_repository.rs → bbn/crates/bbn/src/bbn_repository.rs b/bbn/src/bbn_repository.rs → bbn/crates/bbn/src/bbn_repository.rs
@@ -252,7 +252,7 @@ fn list_posts_day(path: &Path, query: &Query) -> Result<Vec<Post>, ListPostsErro
             .file_stem()
             .and_then(|s| s.to_str())
             .and_then(|s| s.get(8..8 + 2))
-            .map(|s| OsStr::new(s))
+            .map(OsStr::new)
         {
             if query.match_day(day) {
                 if let Some(date) = path_buf

diff --git a/bbn/src/command.rs → bbn/crates/bbn/src/command.rs b/bbn/src/command.rs → bbn/crates/bbn/src/command.rs
diff --git a/bbn/src/command/config.rs → bbn/crates/bbn/src/command/config.rs b/bbn/src/command/config.rs → bbn/crates/bbn/src/command/config.rs
diff --git a/bbn/src/command/date_range.rs → bbn/crates/bbn/src/command/date_range.rs b/bbn/src/command/date_range.rs → bbn/crates/bbn/src/command/date_range.rs
diff --git a/bbn/src/command/hatena_blog.rs → bbn/crates/bbn/src/command/hatena_blog.rs b/bbn/src/command/hatena_blog.rs → bbn/crates/bbn/src/command/hatena_blog.rs
diff --git a/bbn/src/command/hatena_blog/diff.rs → ...rates/bbn/src/command/hatena_blog/diff.rs b/bbn/src/command/hatena_blog/diff.rs → ...rates/bbn/src/command/hatena_blog/diff.rs
diff --git a/bbn/src/command/hatena_blog/download.rs → ...s/bbn/src/command/hatena_blog/download.rs b/bbn/src/command/hatena_blog/download.rs → ...s/bbn/src/command/hatena_blog/download.rs
diff --git a/bbn/src/command/hatena_blog/list.rs → ...rates/bbn/src/command/hatena_blog/list.rs b/bbn/src/command/hatena_blog/list.rs → ...rates/bbn/src/command/hatena_blog/list.rs
diff --git a/bbn/src/command/hatena_blog/upload.rs → ...tes/bbn/src/command/hatena_blog/upload.rs b/bbn/src/command/hatena_blog/upload.rs → ...tes/bbn/src/command/hatena_blog/upload.rs
diff --git a/bbn/src/command/hatena_blog/view.rs → ...rates/bbn/src/command/hatena_blog/view.rs b/bbn/src/command/hatena_blog/view.rs → ...rates/bbn/src/command/hatena_blog/view.rs
diff --git a/bbn/src/command/list.rs → bbn/crates/bbn/src/command/list.rs b/bbn/src/command/list.rs → bbn/crates/bbn/src/command/list.rs
diff --git a/bbn/src/command/view.rs → bbn/crates/bbn/src/command/view.rs b/bbn/src/command/view.rs → bbn/crates/bbn/src/command/view.rs
diff --git a/bbn/src/config.rs → bbn/crates/bbn/src/config.rs b/bbn/src/config.rs → bbn/crates/bbn/src/config.rs
diff --git a/bbn/src/config_repository.rs → bbn/crates/bbn/src/config_repository.rs b/bbn/src/config_repository.rs → bbn/crates/bbn/src/config_repository.rs
diff --git a/bbn/src/credentials.rs → bbn/crates/bbn/src/credentials.rs b/bbn/src/credentials.rs → bbn/crates/bbn/src/credentials.rs
diff --git a/bbn/src/data.rs → bbn/crates/bbn/src/data.rs b/bbn/src/data.rs → bbn/crates/bbn/src/data.rs
diff --git a/bbn/src/data/datetime.rs → bbn/crates/bbn/src/data/datetime.rs b/bbn/src/data/datetime.rs → bbn/crates/bbn/src/data/datetime.rs
diff --git a/bbn/src/data/entry.rs → bbn/crates/bbn/src/data/entry.rs b/bbn/src/data/entry.rs → bbn/crates/bbn/src/data/entry.rs
diff --git a/bbn/src/data/entry_id.rs → bbn/crates/bbn/src/data/entry_id.rs b/bbn/src/data/entry_id.rs → bbn/crates/bbn/src/data/entry_id.rs
diff --git a/bbn/src/data/entry_meta.rs → bbn/crates/bbn/src/data/entry_meta.rs b/bbn/src/data/entry_meta.rs → bbn/crates/bbn/src/data/entry_meta.rs
diff --git a/bbn/src/data/timestamp.rs → bbn/crates/bbn/src/data/timestamp.rs b/bbn/src/data/timestamp.rs → bbn/crates/bbn/src/data/timestamp.rs
diff --git a/bbn/src/hatena_blog.rs → bbn/crates/bbn/src/hatena_blog.rs b/bbn/src/hatena_blog.rs → bbn/crates/bbn/src/hatena_blog.rs
diff --git a/bbn/src/hatena_blog/download_entry.rs → ...tes/bbn/src/hatena_blog/download_entry.rs b/bbn/src/hatena_blog/download_entry.rs → ...tes/bbn/src/hatena_blog/download_entry.rs
diff --git a/bbn/src/hatena_blog/hatena_blog_client.rs → ...bbn/src/hatena_blog/hatena_blog_client.rs b/bbn/src/hatena_blog/hatena_blog_client.rs → ...bbn/src/hatena_blog/hatena_blog_client.rs
diff --git a/bbn/src/hatena_blog/hatena_blog_entry.rs → .../bbn/src/hatena_blog/hatena_blog_entry.rs b/bbn/src/hatena_blog/hatena_blog_entry.rs → .../bbn/src/hatena_blog/hatena_blog_entry.rs
diff --git a/bbn/src/hatena_blog/hatena_blog_entry_id.rs → ...n/src/hatena_blog/hatena_blog_entry_id.rs b/bbn/src/hatena_blog/hatena_blog_entry_id.rs → ...n/src/hatena_blog/hatena_blog_entry_id.rs
diff --git a/...blog/hatena_blog_list_entries_response.rs → ...blog/hatena_blog_list_entries_response.rs b/...blog/hatena_blog_list_entries_response.rs → ...blog/hatena_blog_list_entries_response.rs
diff --git a/...src/hatena_blog/hatena_blog_repository.rs → ...src/hatena_blog/hatena_blog_repository.rs b/...src/hatena_blog/hatena_blog_repository.rs → ...src/hatena_blog/hatena_blog_repository.rs
diff --git a/bbn/src/hatena_blog/indexing.rs → bbn/crates/bbn/src/hatena_blog/indexing.rs b/bbn/src/hatena_blog/indexing.rs → bbn/crates/bbn/src/hatena_blog/indexing.rs
diff --git a/bbn/src/hatena_blog/indexing_id.rs → ...crates/bbn/src/hatena_blog/indexing_id.rs b/bbn/src/hatena_blog/indexing_id.rs → ...crates/bbn/src/hatena_blog/indexing_id.rs
diff --git a/bbn/src/hatena_blog/member_request.rs → ...tes/bbn/src/hatena_blog/member_request.rs b/bbn/src/hatena_blog/member_request.rs → ...tes/bbn/src/hatena_blog/member_request.rs
diff --git a/bbn/src/hatena_blog/member_request_id.rs → .../bbn/src/hatena_blog/member_request_id.rs b/bbn/src/hatena_blog/member_request_id.rs → .../bbn/src/hatena_blog/member_request_id.rs
diff --git a/bbn/src/hatena_blog/member_response_id.rs → ...bbn/src/hatena_blog/member_response_id.rs b/bbn/src/hatena_blog/member_response_id.rs → ...bbn/src/hatena_blog/member_response_id.rs
diff --git a/bbn/src/hatena_blog/upload_entry.rs → ...rates/bbn/src/hatena_blog/upload_entry.rs b/bbn/src/hatena_blog/upload_entry.rs → ...rates/bbn/src/hatena_blog/upload_entry.rs
diff --git a/bbn/src/main.rs → bbn/crates/bbn/src/main.rs b/bbn/src/main.rs → bbn/crates/bbn/src/main.rs
diff --git a/bbn/src/query.rs → bbn/crates/bbn/src/query.rs b/bbn/src/query.rs → bbn/crates/bbn/src/query.rs
diff --git a/bbn/tests/bbn.rs → bbn/crates/bbn/tests/bbn.rs b/bbn/tests/bbn.rs → bbn/crates/bbn/tests/bbn.rs