snapshot

Author: DataEraserC

Cargo.toml

@@ -1,7 +1,6 @@
 [workspace]
 resolver = "2"
 members = ["file_classification_*"]
-default-members = ["file_classification_cli"]
 
 [profile.release]
 codegen-units = 1

file_classification_webapi/Cargo.toml

@@ -13,3 +13,7 @@ diesel = { version = "2.2.12", features = ["r2d2"] }
 serde_json = "1.0.142"
 once_cell = "1.21.3"
 env_logger = "0.11.8"
+
+[[bin]]
+name = "file_classification_webapi"
+doc = false

…le_classification_webapi/src/bin/main.rs …pi/src/bin/file_classification_webapi.rsfile_classification_webapi/src/bin/main.rs renamed to file_classification_webapi/src/bin/file_classification_webapi.rs file_classification_webapi/src/bin/main.rs renamed to file_classification_webapi/src/bin/file_classification_webapi.rs

@@ -1,40 +1,40 @@
-use actix_web::{web, App, HttpServer, middleware::Logger};
-use file_classification_core::utils::database::establish_connection;
-mod handlers;
-mod utils;
-#[actix_web::main]
-async fn main() -> std::io::Result<()> {
-    env_logger::init();
-
-    println!("正在启动文件分类 Web API...");
-
-    HttpServer::new(|| {
-        App::new()
-            .app_data(web::Data::new(establish_connection()))
-            .wrap(Logger::default())
-            .service(handlers::files::api_list_files)
-            .service(handlers::files::api_list_files_by_conditions)
-            // .service(handlers::files::api_create_file)
-            .service(handlers::files::api_update_files_by_conditions)
-            .service(handlers::files::api_delete_file)
-            .service(handlers::groups::api_list_groups)
-            .service(handlers::groups::api_list_groups_by_conditions)
-            .service(handlers::groups::api_create_group)
-            .service(handlers::groups::api_update_groups_by_conditions)
-            .service(handlers::groups::api_delete_group)
-            .service(handlers::tags::api_list_tags)
-            .service(handlers::tags::api_list_tags_by_conditions)
-            .service(handlers::tags::api_create_tag)
-            .service(handlers::tags::api_update_tags_by_conditions)
-            .service(handlers::tags::api_delete_tag)
-            .service(handlers::file_groups::api_list_file_groups_by_conditions)
-            .service(handlers::file_groups::api_create_file_group)
-            .service(handlers::file_groups::api_delete_file_group)
-            .service(handlers::group_tags::api_list_group_tags_by_conditions)
-            .service(handlers::group_tags::api_create_group_tag)
-            .service(handlers::group_tags::api_delete_group_tag)
-    })
-    .bind("127.0.0.1:8080")?
-    .run()
-    .await
-}
+use actix_web::{web, App, HttpServer, middleware::Logger};
+use file_classification_core::utils::database::establish_connection;
+mod handlers;
+mod utils;
+#[actix_web::main]
+async fn main() -> std::io::Result<()> {
+    env_logger::init();
+
+    println!("正在启动文件分类 Web API...");
+
+    HttpServer::new(|| {
+        App::new()
+            .app_data(web::Data::new(establish_connection()))
+            .wrap(Logger::default())
+            .service(handlers::files::api_list_files)
+            .service(handlers::files::api_list_files_by_conditions)
+            // .service(handlers::files::api_create_file)
+            .service(handlers::files::api_update_files_by_conditions)
+            .service(handlers::files::api_delete_file)
+            .service(handlers::groups::api_list_groups)
+            .service(handlers::groups::api_list_groups_by_conditions)
+            .service(handlers::groups::api_create_group)
+            .service(handlers::groups::api_update_groups_by_conditions)
+            .service(handlers::groups::api_delete_group)
+            .service(handlers::tags::api_list_tags)
+            .service(handlers::tags::api_list_tags_by_conditions)
+            .service(handlers::tags::api_create_tag)
+            .service(handlers::tags::api_update_tags_by_conditions)
+            .service(handlers::tags::api_delete_tag)
+            .service(handlers::file_groups::api_list_file_groups_by_conditions)
+            .service(handlers::file_groups::api_create_file_group)
+            .service(handlers::file_groups::api_delete_file_group)
+            .service(handlers::group_tags::api_list_group_tags_by_conditions)
+            .service(handlers::group_tags::api_create_group_tag)
+            .service(handlers::group_tags::api_delete_group_tag)
+    })
+    .bind("127.0.0.1:8080")?
+    .run()
+    .await
+}

flake.nix

@@ -46,6 +46,14 @@
               rustPlatform
               ;
           };
+          file_classification_webapi = pkgs.callPackage ./nix/file_classification_webapi.nix {
+            inherit
+              version
+              rev
+              date
+              rustPlatform
+              ;
+          };
           default = self.packages.${system}.file_classification_cli;
         };
 

nix/file_classification_cli.nix

@@ -16,7 +16,9 @@
     fileset = lib.fileset.unions [
       ../Cargo.toml
       ../Cargo.lock
-      (lib.fileset.fromSource (lib.sources.sourceByRegex ../. ["^file_classification_.*"]))
+#      (lib.fileset.fromSource (lib.sources.sourceByRegex ../. ["^file_classification_.*"]))
+      ../file_classification_core
+      ../file_classification_cli
     ];
   };
 in

nix/file_classification_webapi.nix

@@ -0,0 +1,33 @@
+{
+  rustPlatform,
+  version ? "git",
+  rev ? "unknown",
+  date ? "19700101",
+  sqlite,
+  mysql80,
+  postgresql,
+  pkg-config,
+  lib,
+  ...
+}: let
+  manifest = (lib.importTOML ../file_classification_webapi/Cargo.toml).package;
+  src = lib.fileset.toSource {
+    root = ../.;
+    fileset = lib.fileset.unions [
+      ../Cargo.toml
+      ../Cargo.lock
+      ../file_classification_core
+      ../file_classification_webapi
+    ];
+  };
+in
+  rustPlatform.buildRustPackage rec {
+    inherit src;
+    nativeBuildInputs = [sqlite];
+    buildInputs = [sqlite];
+    # nativeBuildInputs = [pkg-config sqlite mysql80 postgresql];
+    # buildInputs = [pkg-config sqlite mysql80 postgresql];
+    pname = manifest.name;
+    version = manifest.version;
+    cargoLock.lockFile = ../Cargo.lock;
+  }