Refactor project structure and update dependencies

DataEraserC · DataEraserC · commit b6816d9cfcc3 · 2024-10-08T22:16:03.000+08:00
- Split the `file_classification` crate into `file_classification_core` and `file_classification_cli`.
- Reorganized project into a workspace with `file_classification_core` and `file_classification_cli`.
- Adjusted `diesel.toml` schema file location.
- Deleted `default.nix` and moved nix-related files to `nix/`.
- Added `.styluaignore` .
- Renamed and relocated binaries to the `file_classification_cli` folder.
diff --git a/.styluaignore b/.styluaignore
@@ -0,0 +1 @@
+# this file caused some issues with the build system
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,65 +1,19 @@
-[package]
-name = "file_classification"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
+[workspace]
+resolver = "2"
+members = ["file_classification_*"]
+default-members = ["file_classification_cli"]
+
+[profile.release]
+codegen-units = 1
+lto = true
+panic = "abort"
+strip = true
+
+[workspace.dependencies]
 diesel = { version = "2.2.0", features = [
     "sqlite",
     "chrono",
     "returning_clauses_for_sqlite_3_35",
 ] }
 dotenvy = "0.15"
 chrono = "0.4"
-
-[[bin]]
-name = "list_files"
-doc = false
-
-[[bin]]
-name = "create_file"
-doc = false
-
-[[bin]]
-name = "delete_file"
-doc = false
-
-[[bin]]
-name = "list_groups"
-doc = false
-
-[[bin]]
-name = "create_group"
-doc = false
-
-[[bin]]
-name = "delete_group"
-doc = false
-
-[[bin]]
-name = "list_tags"
-doc = false
-
-[[bin]]
-name = "create_tag"
-doc = false
-
-[[bin]]
-name = "delete_tag"
-doc = false
-
-[[bin]]
-name = "create_group_tag"
-doc = false
-
-[[bin]]
-name = "create_file_group"
-doc = false
-
-[[bin]]
-name = "webapi"
-doc = false
-
-[[bin]]
-name = "webui"
-doc = false
diff --git a/default.nix b/default.nix
diff --git a/diesel.toml b/diesel.toml
@@ -2,7 +2,7 @@
 # see https://diesel.rs/guides/configuring-diesel-cli
 
 [print_schema]
-file = "src/schema.rs"
+file = "file_classification_core/src/schema.rs"
 custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
 
 [migrations_directory]
diff --git a/file_classification_cli/Cargo.toml b/file_classification_cli/Cargo.toml
@@ -0,0 +1,59 @@
+[package]
+name = "file_classification_cli"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+file_classification_core = { path = "../file_classification_core" }
+
+[[bin]]
+name = "list_files"
+doc = false
+
+[[bin]]
+name = "create_file"
+doc = false
+
+[[bin]]
+name = "delete_file"
+doc = false
+
+[[bin]]
+name = "list_groups"
+doc = false
+
+[[bin]]
+name = "create_group"
+doc = false
+
+[[bin]]
+name = "delete_group"
+doc = false
+
+[[bin]]
+name = "list_tags"
+doc = false
+
+[[bin]]
+name = "create_tag"
+doc = false
+
+[[bin]]
+name = "delete_tag"
+doc = false
+
+[[bin]]
+name = "create_group_tag"
+doc = false
+
+[[bin]]
+name = "create_file_group"
+doc = false
+
+[[bin]]
+name = "webapi"
+doc = false
+
+[[bin]]
+name = "webui"
+doc = false
diff --git a/file_classification_cli/src/bin/create_file.rs b/file_classification_cli/src/bin/create_file.rs
@@ -1,5 +1,5 @@
-use file_classification::create_file;
-use file_classification::establish_connection;
+use file_classification_core::create_file;
+use file_classification_core::establish_connection;
 use std::io::stdin;
 
 fn main() {
diff --git a/file_classification_cli/src/bin/create_file_group.rs b/file_classification_cli/src/bin/create_file_group.rs
@@ -1,5 +1,5 @@
-use file_classification::create_file_group;
-use file_classification::establish_connection;
+use file_classification_core::create_file_group;
+use file_classification_core::establish_connection;
 use std::io::{stdin, stdout, Write};
 
 fn main() {
diff --git a/file_classification_cli/src/bin/create_group.rs b/file_classification_cli/src/bin/create_group.rs
@@ -1,5 +1,5 @@
-use file_classification::create_group;
-use file_classification::establish_connection;
+use file_classification_core::create_group;
+use file_classification_core::establish_connection;
 use std::io::stdin;
 
 fn main() {
diff --git a/file_classification_cli/src/bin/create_group_tag.rs b/file_classification_cli/src/bin/create_group_tag.rs
@@ -1,5 +1,5 @@
-use file_classification::create_group_tag;
-use file_classification::establish_connection;
+use file_classification_core::create_group_tag;
+use file_classification_core::establish_connection;
 use std::io::{stdin, stdout, Write};
 
 fn main() {
diff --git a/file_classification_cli/src/bin/create_tag.rs b/file_classification_cli/src/bin/create_tag.rs
@@ -1,5 +1,5 @@
-use file_classification::create_tag;
-use file_classification::establish_connection;
+use file_classification_core::create_tag;
+use file_classification_core::establish_connection;
 use std::io::stdin;
 
 fn main() {
diff --git a/file_classification_cli/src/bin/delete_file.rs b/file_classification_cli/src/bin/delete_file.rs
@@ -1,5 +1,5 @@
-use file_classification::delete_file;
-use file_classification::establish_connection;
+use file_classification_core::delete_file;
+use file_classification_core::establish_connection;
 use std::io;
 fn main() {
     let connection = &mut establish_connection();
diff --git a/file_classification_cli/src/bin/delete_group.rs b/file_classification_cli/src/bin/delete_group.rs
@@ -1,5 +1,5 @@
-use file_classification::delete_group;
-use file_classification::establish_connection;
+use file_classification_core::delete_group;
+use file_classification_core::establish_connection;
 use std::io;
 fn main() {
     let connection = &mut establish_connection();
diff --git a/file_classification_cli/src/bin/delete_tag.rs b/file_classification_cli/src/bin/delete_tag.rs
@@ -1,5 +1,5 @@
-use file_classification::delete_tag;
-use file_classification::establish_connection;
+use file_classification_core::delete_tag;
+use file_classification_core::establish_connection;
 use std::io;
 fn main() {
     let connection = &mut establish_connection();
diff --git a/file_classification_cli/src/bin/list_files.rs b/file_classification_cli/src/bin/list_files.rs
@@ -1,5 +1,5 @@
-use file_classification::establish_connection;
-use file_classification::{select_files, models::SearchFile};  // 引入select_files和SearchFile
+use file_classification_core::establish_connection;
+use file_classification_core::{select_files, models::SearchFile};  // 引入select_files和SearchFile
 
 fn main() {
     let connection = &mut establish_connection();
diff --git a/file_classification_cli/src/bin/list_groups.rs b/file_classification_cli/src/bin/list_groups.rs
@@ -1,5 +1,5 @@
-use file_classification::establish_connection;
-use file_classification::{select_groups, models::SearchGroup};  // 引入select_groups和SearchGroup
+use file_classification_core::establish_connection;
+use file_classification_core::{select_groups, models::SearchGroup};  // 引入select_groups和SearchGroup
 
 fn main() {
     let connection = &mut establish_connection();
diff --git a/file_classification_cli/src/bin/list_tags.rs b/file_classification_cli/src/bin/list_tags.rs
@@ -1,5 +1,5 @@
-use file_classification::establish_connection;
-use file_classification::{select_tags, models::SearchTag};  // 引入select_tags和SearchTag
+use file_classification_core::establish_connection;
+use file_classification_core::{select_tags, models::SearchTag};  // 引入select_tags和SearchTag
 
 fn main() {
     let connection = &mut establish_connection();
diff --git a/file_classification_cli/src/bin/webapi.rs b/file_classification_cli/src/bin/webapi.rs
diff --git a/file_classification_cli/src/bin/webui.rs b/file_classification_cli/src/bin/webui.rs
diff --git a/file_classification_core/Cargo.toml b/file_classification_core/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "file_classification_core"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+diesel = { workspace = true }
+dotenvy = { workspace = true }
+chrono = { workspace = true }
diff --git a/file_classification_core/src/lib.rs b/file_classification_core/src/lib.rs
diff --git a/file_classification_core/src/models.rs b/file_classification_core/src/models.rs
diff --git a/file_classification_core/src/schema.rs b/file_classification_core/src/schema.rs
diff --git a/flake.nix b/flake.nix
@@ -17,11 +17,12 @@
     forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
     pkgsFor = nixpkgs.legacyPackages;
   in {
-    packages = forAllSystems (system: {
-      default = pkgsFor.${system}.callPackage ./default.nix {};
+    packages = forAllSystems (system: rec {
+      file_classification_cli = pkgsFor.${system}.callPackage ./nix/file_classification_cli.nix {};
+      default = file_classification_cli;
     });
     devShells = forAllSystems (system: {
-      default = pkgsFor.${system}.callPackage ./shell.nix {};
+      default = pkgsFor.${system}.callPackage ./nix/shell.nix {};
     });
   };
 }
diff --git a/nix/file_classification_cli.nix b/nix/file_classification_cli.nix
@@ -0,0 +1,19 @@
+{rustPlatform, sqlite, lib, ...}: let
+  manifest = (lib.importTOML ../file_classification_cli/Cargo.toml).package;
+  src = lib.fileset.toSource {
+    root = ../.;
+    fileset = lib.fileset.unions [
+      ../Cargo.toml
+      ../Cargo.lock
+      (lib.fileset.fromSource (lib.sources.sourceByRegex ../. [ "^file_classification_.*" ]))
+    ];
+  };
+in
+  rustPlatform.buildRustPackage rec {
+    inherit src;
+    nativeBuildInputs = [sqlite];
+    buildInputs = [sqlite];
+    pname = manifest.name;
+    version = manifest.version;
+    cargoLock.lockFile = ../Cargo.lock;
+  }
diff --git a/nix/shell.nix b/nix/shell.nix
@@ -1,7 +1,5 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs, ...}:
 pkgs.mkShell {
-  # Get dependencies from the main package
-  inputsFrom = [(pkgs.callPackage ./default.nix {})];
   # Additional tooling
   buildInputs = with pkgs; [
     rust-analyzer # LSP Server
diff --git a/rustfmt.toml b/rustfmt.toml
diff --git a/stylua.toml b/stylua.toml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# this file caused some issues with the build system`