many much more generic refactor

1 files changed, 20 insertions, 15 deletions

diff --git a/Cargo.lock b/Cargo.lock
index c2705b7..98a4879 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -342,9 +342,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64ct"
-version = "1.6.0"
+version = "1.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
 
 [[package]]
 name = "binascii"
@@ -1807,7 +1807,6 @@ dependencies = [
  "blake3",
  "chrono",
  "hex",
- "rocket",
  "serde",
 ]
 
@@ -1848,6 +1847,22 @@ dependencies = [
 ]
 
 [[package]]
+name = "jellylogic"
+version = "0.1.0"
+dependencies = [
+ "aes-gcm-siv",
+ "anyhow",
+ "argon2",
+ "base64",
+ "bincode",
+ "jellybase",
+ "jellycommon",
+ "log",
+ "rand 0.9.1",
+ "serde",
+]
+
+[[package]]
 name = "jellymatroska"
 version = "0.1.0"
 dependencies = [
@@ -1893,9 +1908,7 @@ dependencies = [
 name = "jellything"
 version = "0.1.1"
 dependencies = [
- "aes-gcm-siv",
  "anyhow",
- "argon2",
  "async-recursion",
  "base64",
  "bincode",
@@ -1908,8 +1921,10 @@ dependencies = [
  "jellycache",
  "jellycommon",
  "jellyimport",
+ "jellylogic",
  "jellystream",
  "jellytranscoder",
+ "jellyui",
  "log",
  "rand 0.9.1",
  "rocket",
@@ -2108,16 +2123,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
-name = "logic"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "jellybase",
- "jellycommon",
- "log",
-]
-
-[[package]]
 name = "loom"
 version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"