split base into asset_token and db

45 files changed, 221 insertions, 327 deletions

diff --git a/Cargo.lock b/Cargo.lock
index ccf4e74..461e8cf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1742,51 +1742,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
-name = "jellybase"
+name = "jellycache"
 version = "0.1.0"
 dependencies = [
- "aes-gcm-siv",
  "anyhow",
  "base64",
  "bincode",
  "humansize",
- "jellycache",
- "jellycommon",
  "log",
  "rand 0.9.1",
- "redb",
  "serde",
- "serde_json",
- "serde_yaml",
  "sha2",
- "tantivy",
  "tokio",
 ]
 
 [[package]]
-name = "jellycache"
+name = "jellycommon"
 version = "0.1.0"
 dependencies = [
- "anyhow",
- "base64",
  "bincode",
- "humansize",
- "log",
- "rand 0.9.1",
+ "blake3",
+ "chrono",
+ "hex",
  "serde",
- "sha2",
- "tokio",
 ]
 
 [[package]]
-name = "jellycommon"
+name = "jellydb"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "bincode",
- "blake3",
- "chrono",
- "hex",
+ "jellycommon",
+ "log",
+ "redb",
  "serde",
+ "tantivy",
 ]
 
 [[package]]
@@ -1799,8 +1790,10 @@ dependencies = [
  "bincode",
  "crossbeam-channel",
  "futures",
- "jellybase",
  "jellycache",
+ "jellycommon",
+ "jellydb",
+ "jellyimport-asset-token",
  "jellyimport-fallback-generator",
  "jellyremuxer",
  "log",
@@ -1815,6 +1808,26 @@ dependencies = [
 ]
 
 [[package]]
+name = "jellyimport-asset-token"
+version = "0.1.0"
+dependencies = [
+ "aes-gcm-siv",
+ "anyhow",
+ "base64",
+ "bincode",
+ "humansize",
+ "jellycache",
+ "jellycommon",
+ "log",
+ "rand 0.9.1",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "sha2",
+ "tokio",
+]
+
+[[package]]
 name = "jellyimport-fallback-generator"
 version = "0.1.0"
 dependencies = [
@@ -1834,8 +1847,9 @@ dependencies = [
  "base64",
  "bincode",
  "env_logger",
- "jellybase",
  "jellycommon",
+ "jellydb",
+ "jellyimport-asset-token",
  "log",
  "rand 0.9.1",
  "serde",
@@ -1895,7 +1909,6 @@ dependencies = [
  "env_logger",
  "futures",
  "glob",
- "jellybase",
  "jellycache",
  "jellycommon",
  "jellyimport",
diff --git a/Cargo.toml b/Cargo.toml
index 89259bc..da554f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,18 +1,19 @@
 [workspace]
 members = [
-    "server",
-    "remuxer",
+    "cache",
     "common",
-    "tool",
-    "matroska",
+    "database",
     "ebml_derive",
-    "transcoder",
-    "base",
     "import",
+    "import/asset_token",
     "import/fallback_generator",
-    "ui",
     "logic",
-    "cache",
+    "matroska",
+    "remuxer",
+    "server",
+    "tool",
+    "transcoder",
+    "ui",
 ]
 resolver = "2"
 
diff --git a/base/src/federation.rs b/base/src/federation.rs
deleted file mode 100644
index b24d113..0000000
--- a/base/src/federation.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-    This file is part of jellything (https://codeberg.org/metamuffin/jellything)
-    which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
-    Copyright (C) 2025 metamuffin <metamuffin.org>
-*/
-
-// use anyhow::anyhow;
-// use jellyclient::{Instance, Session};
-// use jellycommon::{config::FederationAccount, user::CreateSessionParams};
-// use std::{collections::HashMap, sync::Arc};
-// use tokio::sync::RwLock;
-
-// pub struct Federation {
-//     instances: HashMap<String, Instance>,
-//     sessions: RwLock<HashMap<String, Arc<Session>>>,
-// }
-
-// impl Federation {
-//     pub fn initialize() -> Self {
-//         let instances = SECRETS
-//             .federation
-//             .iter()
-//             .map(|(k, FederationAccount { tls, .. })| {
-//                 (k.to_owned(), Instance::new(k.to_owned(), *tls))
-//             })
-//             .collect::<HashMap<_, _>>();
-
-//         Self {
-//             instances,
-//             sessions: Default::default(),
-//         }
-//     }
-
-//     pub fn get_instance(&self, host: &String) -> anyhow::Result<&Instance> {
-//         self.instances.get(host).ok_or(anyhow!("unknown instance"))
-//     }
-
-//     pub async fn get_session(&self, host: &String) -> anyhow::Result<Arc<Session>> {
-//         let mut w = self.sessions.write().await;
-//         if let Some(s) = w.get(host) {
-//             Ok(s.to_owned())
-//         } else {
-//             let FederationAccount {
-//                 username, password, ..
-//             } = SECRETS
-//                 .federation
-//                 .get(host)
-//                 .ok_or(anyhow!("no credentials of the remote server"))?;
-//             let s = Arc::new(
-//                 self.get_instance(host)?
-//                     .to_owned()
-//                     .login(CreateSessionParams {
-//                         username: username.to_owned(),
-//                         password: password.to_owned(),
-//                         expire: None,
-//                         drop_permissions: None,
-//                     })
-//                     .await?,
-//             );
-//             w.insert(host.to_owned(), s.clone());
-//             Ok(s)
-//         }
-//     }
-// }
diff --git a/base/src/lib.rs b/base/src/lib.rs
deleted file mode 100644
index 55a9927..0000000
--- a/base/src/lib.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-    This file is part of jellything (https://codeberg.org/metamuffin/jellything)
-    which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
-    Copyright (C) 2025 metamuffin <metamuffin.org>
-*/
-pub mod assetfed;
-pub mod database;
-pub mod federation;
-pub mod permission;
-
-pub use jellycommon as common;
-use serde::{Deserialize, Serialize};
-use std::sync::LazyLock;
-use std::sync::Mutex;
-
-#[rustfmt::skip]
-#[derive(Debug, Deserialize, Serialize, Default)]
-pub struct Config {
-  asset_key: Option<String>,
-}
-
-pub static CONF_PRELOAD: Mutex<Option<Config>> = Mutex::new(None);
-static CONF: LazyLock<Config> = LazyLock::new(|| {
-    CONF_PRELOAD
-        .lock()
-        .unwrap()
-        .take()
-        .expect("cache config not preloaded. logic error")
-});
diff --git a/base/src/permission.rs b/base/src/permission.rs
deleted file mode 100644
index 7914f0b..0000000
--- a/base/src/permission.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-    This file is part of jellything (https://codeberg.org/metamuffin/jellything)
-    which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
-    Copyright (C) 2025 metamuffin <metamuffin.org>
-*/
-use anyhow::anyhow;
-use jellycommon::{
-    user::{PermissionSet, UserPermission},
-    Node,
-};
-
-pub trait PermissionSetExt {
-    fn check_explicit(&self, perm: &UserPermission) -> Option<bool>;
-    fn check(&self, perm: &UserPermission) -> bool {
-        self.check_explicit(perm).unwrap_or(perm.default_value())
-    }
-    fn assert(&self, perm: &UserPermission) -> Result<(), anyhow::Error>;
-}
-
-impl PermissionSetExt for PermissionSet {
-    fn check_explicit(&self, perm: &UserPermission) -> Option<bool> {
-        self.0
-            .get(perm)
-            // .or(CONF.default_permission_set.0.get(perm))
-            .copied()
-    }
-    fn assert(&self, perm: &UserPermission) -> Result<(), anyhow::Error> {
-        if self.check(perm) {
-            Ok(())
-        } else {
-            Err(anyhow!(
-                "sorry, you need special permission {perm:?} for this action."
-            ))
-        }
-    }
-}
-
-pub trait NodePermissionExt {
-    fn only_if_permitted(self, perms: &PermissionSet) -> Self;
-}
-impl NodePermissionExt for Option<Node> {
-    fn only_if_permitted(self, perms: &PermissionSet) -> Self {
-        self.and_then(|node| {
-            if check_node_permission(perms, &node) {
-                Some(node)
-            } else {
-                None
-            }
-        })
-    }
-}
-fn check_node_permission(_perms: &PermissionSet, _node: &Node) -> bool {
-    // if let Some(v) = perms.check_explicit(&UserPermission::AccessNode(node.id.clone().unwrap())) {
-    //     v
-    // } else {
-    // TODO
-    // for com in node.parents.clone().into_iter() {
-    //     if let Some(v) = perms.check_explicit(&UserPermission::AccessNode(com.to_owned())) {
-    //         return v;
-    //     }
-    // }
-    true
-    // }
-}
diff --git a/database/Cargo.toml b/database/Cargo.toml
new file mode 100644
index 0000000..6e5ddcf
--- /dev/null
+++ b/database/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "jellydb"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+tantivy = "0.22.0"
+jellycommon = { path = "../common" }
+serde = { version = "1.0.217", features = ["derive"] }
+log = { workspace = true }
+bincode = "2.0.0-rc.3"
+redb = "2.4.0"
+anyhow = "1.0.95"
+
+[features]
+db_json = []
diff --git a/base/src/database.rs b/database/src/lib.rs
index c3ca5d4..b84ddc9 100644
--- a/base/src/database.rs
+++ b/database/src/lib.rs
@@ -3,29 +3,31 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
-use anyhow::{anyhow, bail, Context, Result};
-use bincode::{config::standard, Decode, Encode};
+pub mod search;
+
+use anyhow::{Context, Result, anyhow, bail};
+use bincode::{Decode, Encode, config::standard};
 use jellycommon::{
-    user::{NodeUserData, User},
     Node, NodeID,
+    user::{NodeUserData, User},
 };
 use log::info;
 use redb::{Durability, ReadableTable, StorageError, TableDefinition};
+use search::NodeTextSearchIndex;
 use std::{
     fs::create_dir_all,
     hash::{DefaultHasher, Hasher},
     path::{Path, PathBuf},
     str::FromStr,
-    sync::{Arc, RwLock},
+    sync::Arc,
     time::SystemTime,
 };
 use tantivy::{
+    DateTime, TantivyDocument,
     collector::{Count, TopDocs},
-    directory::MmapDirectory,
     doc,
     query::QueryParser,
-    schema::{Field, Schema, Value, FAST, INDEXED, STORED, STRING, TEXT},
-    DateOptions, DateTime, Index, IndexReader, IndexWriter, ReloadPolicy, TantivyDocument,
+    schema::Value,
 };
 
 const T_USER: TableDefinition<&str, Ser<User>> = TableDefinition::new("user");
@@ -466,58 +468,6 @@ impl Database {
     }
 }
 
-pub struct NodeTextSearchIndex {
-    pub schema: Schema,
-    pub reader: IndexReader,
-    pub writer: RwLock<IndexWriter>,
-    pub index: Index,
-    pub id: Field,
-    pub title: Field,
-    pub releasedate: Field,
-    pub description: Field,
-    pub parent: Field,
-    pub f_index: Field,
-}
-impl NodeTextSearchIndex {
-    fn new(path: &Path) -> anyhow::Result<Self> {
-        let mut schema = Schema::builder();
-        let id = schema.add_text_field("id", TEXT | STORED | FAST);
-        let title = schema.add_text_field("title", TEXT);
-        let description = schema.add_text_field("description", TEXT);
-        let parent = schema.add_text_field("parent", STRING | FAST);
-        let f_index = schema.add_u64_field("index", FAST);
-        let releasedate = schema.add_date_field(
-            "releasedate",
-            DateOptions::from(INDEXED)
-                .set_fast()
-                .set_precision(tantivy::DateTimePrecision::Seconds),
-        );
-        let schema = schema.build();
-        create_dir_all(path.join("node_index"))?;
-        let directory =
-            MmapDirectory::open(path.join("node_index")).context("opening index directory")?;
-        let index = Index::open_or_create(directory, schema.clone()).context("creating index")?;
-        let reader = index
-            .reader_builder()
-            .reload_policy(ReloadPolicy::OnCommitWithDelay)
-            .try_into()
-            .context("creating reader")?;
-        let writer = index.writer(30_000_000).context("creating writer")?;
-        Ok(Self {
-            index,
-            writer: writer.into(),
-            reader,
-            schema,
-            parent,
-            f_index,
-            releasedate,
-            id,
-            description,
-            title,
-        })
-    }
-}
-
 pub struct HashWriter(DefaultHasher);
 impl bincode::enc::write::Writer for HashWriter {
     fn write(&mut self, bytes: &[u8]) -> std::result::Result<(), bincode::error::EncodeError> {
diff --git a/database/src/search.rs b/database/src/search.rs
new file mode 100644
index 0000000..a7c074f
--- /dev/null
+++ b/database/src/search.rs
@@ -0,0 +1,64 @@
+/*
+    This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+    which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+    Copyright (C) 2025 metamuffin <metamuffin.org>
+*/
+use anyhow::Context;
+use std::{fs::create_dir_all, path::Path, sync::RwLock};
+use tantivy::{
+    DateOptions, Index, IndexReader, IndexWriter, ReloadPolicy,
+    directory::MmapDirectory,
+    schema::{FAST, Field, INDEXED, STORED, STRING, Schema, TEXT},
+};
+
+pub struct NodeTextSearchIndex {
+    pub schema: Schema,
+    pub reader: IndexReader,
+    pub writer: RwLock<IndexWriter>,
+    pub index: Index,
+    pub id: Field,
+    pub title: Field,
+    pub releasedate: Field,
+    pub description: Field,
+    pub parent: Field,
+    pub f_index: Field,
+}
+impl NodeTextSearchIndex {
+    pub(crate) fn new(path: &Path) -> anyhow::Result<Self> {
+        let mut schema = Schema::builder();
+        let id = schema.add_text_field("id", TEXT | STORED | FAST);
+        let title = schema.add_text_field("title", TEXT);
+        let description = schema.add_text_field("description", TEXT);
+        let parent = schema.add_text_field("parent", STRING | FAST);
+        let f_index = schema.add_u64_field("index", FAST);
+        let releasedate = schema.add_date_field(
+            "releasedate",
+            DateOptions::from(INDEXED)
+                .set_fast()
+                .set_precision(tantivy::DateTimePrecision::Seconds),
+        );
+        let schema = schema.build();
+        create_dir_all(path.join("node_index"))?;
+        let directory =
+            MmapDirectory::open(path.join("node_index")).context("opening index directory")?;
+        let index = Index::open_or_create(directory, schema.clone()).context("creating index")?;
+        let reader = index
+            .reader_builder()
+            .reload_policy(ReloadPolicy::OnCommitWithDelay)
+            .try_into()
+            .context("creating reader")?;
+        let writer = index.writer(30_000_000).context("creating writer")?;
+        Ok(Self {
+            index,
+            writer: writer.into(),
+            reader,
+            schema,
+            parent,
+            f_index,
+            releasedate,
+            id,
+            description,
+            title,
+        })
+    }
+}
diff --git a/import/Cargo.toml b/import/Cargo.toml
index 112df40..d0b16b4 100644
--- a/import/Cargo.toml
+++ b/import/Cargo.toml
@@ -4,10 +4,12 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-jellybase = { path = "../base" }
 jellyremuxer = { path = "../remuxer" }
 jellycache = { path = "../cache" }
+jellycommon = { path = "../common" }
+jellydb = { path = "../database" }
 jellyimport-fallback-generator = { path = "fallback_generator" }
+jellyimport-asset-token = { path = "asset_token" }
 
 rayon = "1.10.0"
 crossbeam-channel = "0.5.14"
diff --git a/base/Cargo.toml b/import/asset_token/Cargo.toml
index ca4f454..95615ce 100644
--- a/base/Cargo.toml
+++ b/import/asset_token/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "jellybase"
+name = "jellyimport-asset-token"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-jellycommon = { path = "../common" }
-jellycache = { path = "../cache" }
+jellycommon = { path = "../../common" }
+jellycache = { path = "../../cache" }
 serde = { version = "1.0.217", features = ["derive"] }
 serde_yaml = "0.9.34"
 log = { workspace = true }
@@ -15,11 +15,6 @@ tokio = { workspace = true }
 anyhow = "1.0.95"
 bincode = "2.0.0-rc.3"
 rand = "0.9.0"
-redb = "2.4.0"
-tantivy = "0.22.0"
 serde_json = "1.0.138"
 aes-gcm-siv = "0.11.1"
 humansize = "2.1.3"
-
-[features]
-db_json = []
diff --git a/base/src/assetfed.rs b/import/asset_token/src/lib.rs
index ea62e0d..87ea261 100644
--- a/base/src/assetfed.rs
+++ b/import/asset_token/src/lib.rs
@@ -3,7 +3,8 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
-use crate::CONF;
+pub mod assetfed;
+
 use aes_gcm_siv::{
     aead::{generic_array::GenericArray, Aead},
     Aes256GcmSiv, KeyInit,
@@ -12,11 +13,28 @@ use anyhow::{anyhow, bail, Context};
 use base64::Engine;
 use bincode::{Decode, Encode};
 use jellycache::CachePath;
+pub use jellycommon as common;
 use jellycommon::{Asset, LocalTrack};
 use log::warn;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
+use std::sync::Mutex;
 use std::{path::PathBuf, sync::LazyLock};
 
+#[rustfmt::skip]
+#[derive(Debug, Deserialize, Serialize, Default)]
+pub struct Config {
+  asset_key: Option<String>,
+}
+
+pub static CONF_PRELOAD: Mutex<Option<Config>> = Mutex::new(None);
+static CONF: LazyLock<Config> = LazyLock::new(|| {
+    CONF_PRELOAD
+        .lock()
+        .unwrap()
+        .take()
+        .expect("cache config not preloaded. logic error")
+});
+
 const VERSION: u32 = 3;
 
 static ASSET_KEY: LazyLock<Aes256GcmSiv> = LazyLock::new(|| {
diff --git a/import/src/infojson.rs b/import/src/infojson.rs
index 1efbae9..e0ebc43 100644
--- a/import/src/infojson.rs
+++ b/import/src/infojson.rs
@@ -5,7 +5,7 @@
 */
 use anyhow::Context;
 use bincode::{Decode, Encode};
-use jellybase::common::chrono::{format::Parsed, Utc};
+use jellycommon::chrono::{format::Parsed, Utc};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
diff --git a/import/src/lib.rs b/import/src/lib.rs
index 784b717..426a96a 100644
--- a/import/src/lib.rs
+++ b/import/src/lib.rs
@@ -14,18 +14,18 @@ pub mod vgmdb;
 pub mod wikidata;
 pub mod wikimedia_commons;
 
+use jellydb::Database;
+pub use jellyimport_asset_token as asset_token;
+use jellyimport_asset_token::AssetInner;
+
 use acoustid::{acoustid_fingerprint, AcoustID};
 use anyhow::{anyhow, bail, Context, Result};
 use infojson::YVideo;
-use jellybase::{
-    assetfed::AssetInner,
-    common::{
-        Appearance, Chapter, LocalTrack, MediaInfo, Node, NodeID, NodeKind, ObjectIds, PeopleGroup,
-        Person, Rating, SourceTrack, SourceTrackKind, TmdbKind, TrackSource, TraktKind, Visibility,
-    },
-    database::Database,
-};
 use jellycache::cache_file;
+use jellycommon::{
+    Appearance, Chapter, LocalTrack, MediaInfo, Node, NodeID, NodeKind, ObjectIds, PeopleGroup,
+    Person, Rating, SourceTrack, SourceTrackKind, TmdbKind, TrackSource, TraktKind, Visibility,
+};
 use jellyimport_fallback_generator::generate_fallback;
 use jellyremuxer::metadata::checked_matroska_metadata;
 use log::info;
diff --git a/import/src/tmdb.rs b/import/src/tmdb.rs
index dff0e95..ceb1650 100644
--- a/import/src/tmdb.rs
+++ b/import/src/tmdb.rs
@@ -6,11 +6,11 @@
 use crate::USER_AGENT;
 use anyhow::{anyhow, bail, Context};
 use bincode::{Decode, Encode};
-use jellybase::common::{
+use jellycache::{async_cache_file, async_cache_memory, CachePath};
+use jellycommon::{
     chrono::{format::Parsed, Utc},
     TmdbKind,
 };
-use jellycache::{async_cache_file, async_cache_memory, CachePath};
 use log::info;
 use reqwest::{
     header::{HeaderMap, HeaderName, HeaderValue},
diff --git a/import/src/trakt.rs b/import/src/trakt.rs
index 434a3a0..f25fa9e 100644
--- a/import/src/trakt.rs
+++ b/import/src/trakt.rs
@@ -6,8 +6,8 @@
 use crate::USER_AGENT;
 use anyhow::Context;
 use bincode::{Decode, Encode};
-use jellybase::common::{Appearance, ObjectIds, PeopleGroup, Person, TraktKind};
 use jellycache::async_cache_memory;
+use jellycommon::{Appearance, ObjectIds, PeopleGroup, Person, TraktKind};
 use log::info;
 use reqwest::{
     header::{HeaderMap, HeaderName, HeaderValue},
diff --git a/logic/Cargo.toml b/logic/Cargo.toml
index ec5ee2b..23016f9 100644
--- a/logic/Cargo.toml
+++ b/logic/Cargo.toml
@@ -4,8 +4,9 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-jellybase = { path = "../base" }
+jellyimport-asset-token = { path = "../import/asset_token" }
 jellycommon = { path = "../common" }
+jellydb = { path = "../database" }
 log = "0.4.27"
 anyhow = "1.0.98"
 base64 = "0.22.1"
diff --git a/logic/src/admin/user.rs b/logic/src/admin/user.rs
index 2d788cb..3ec3852 100644
--- a/logic/src/admin/user.rs
+++ b/logic/src/admin/user.rs
@@ -6,8 +6,8 @@
 
 use crate::session::AdminSession;
 use anyhow::Result;
-use jellybase::database::Database;
 use jellycommon::api::ApiAdminUsersResponse;
+use jellydb::Database;
 
 pub fn admin_users(db: &Database, _session: &AdminSession) -> Result<ApiAdminUsersResponse> {
     // TODO dont return useless info like passwords
diff --git a/logic/src/home.rs b/logic/src/home.rs
index b774a9f..ad3fee5 100644
--- a/logic/src/home.rs
+++ b/logic/src/home.rs
@@ -6,13 +6,13 @@
 
 use crate::{node::DatabaseNodeUserDataExt, session::Session};
 use anyhow::{Context, Result};
-use jellybase::database::Database;
 use jellycommon::{
     NodeID, NodeKind, Rating, Visibility,
     api::ApiHomeResponse,
     chrono::{Datelike, Utc},
     user::WatchedState,
 };
+use jellydb::Database;
 
 pub fn home(db: &Database, session: &Session) -> Result<ApiHomeResponse> {
     let mut items = db.list_nodes_with_udata(&session.user.name)?;
diff --git a/logic/src/items.rs b/logic/src/items.rs
index 67c45cb..99fb767 100644
--- a/logic/src/items.rs
+++ b/logic/src/items.rs
@@ -6,11 +6,11 @@
 
 use crate::{filter_sort::filter_and_sort_nodes, session::Session};
 use anyhow::Result;
-use jellybase::database::Database;
 use jellycommon::{
     Visibility,
     api::{ApiItemsResponse, NodeFilterSort, SortOrder, SortProperty},
 };
+use jellydb::Database;
 
 pub fn all_items(
     db: &Database,
diff --git a/logic/src/lib.rs b/logic/src/lib.rs
index 64656f5..79d27d9 100644
--- a/logic/src/lib.rs
+++ b/logic/src/lib.rs
@@ -15,6 +15,8 @@ pub mod search;
 pub mod session;
 pub mod stats;
 
+pub use jellydb::Database;
+
 use serde::{Deserialize, Serialize};
 use std::sync::LazyLock;
 use std::sync::Mutex;
diff --git a/logic/src/login.rs b/logic/src/login.rs
index 26a6b7f..72a5903 100644
--- a/logic/src/login.rs
+++ b/logic/src/login.rs
@@ -6,8 +6,8 @@
 use crate::{CONF, session::create};
 use anyhow::{Result, anyhow};
 use argon2::{Argon2, PasswordHasher, password_hash::Salt};
-use jellybase::database::Database;
 use jellycommon::user::UserPermission;
+use jellydb::Database;
 use log::info;
 use std::{collections::HashSet, time::Duration};
 
diff --git a/logic/src/node.rs b/logic/src/node.rs
index 8a53bec..c8ff820 100644
--- a/logic/src/node.rs
+++ b/logic/src/node.rs
@@ -5,12 +5,12 @@
 */
 use crate::{filter_sort::filter_and_sort_nodes, session::Session};
 use anyhow::{Result, anyhow};
-use jellybase::database::Database;
 use jellycommon::{
     Node, NodeID, NodeKind, Visibility,
     api::{ApiNodeResponse, NodeFilterSort, SortOrder, SortProperty},
     user::NodeUserData,
 };
+use jellydb::Database;
 use std::{cmp::Reverse, collections::BTreeMap, sync::Arc};
 
 pub fn get_node(
diff --git a/logic/src/search.rs b/logic/src/search.rs
index 8e41e27..68975f1 100644
--- a/logic/src/search.rs
+++ b/logic/src/search.rs
@@ -5,8 +5,8 @@
 */
 use crate::{node::DatabaseNodeUserDataExt, session::Session};
 use anyhow::Result;
-use jellybase::database::Database;
 use jellycommon::{Visibility, api::ApiSearchResponse};
+use jellydb::Database;
 use std::time::Instant;
 
 pub fn search(
diff --git a/logic/src/stats.rs b/logic/src/stats.rs
index 2569180..2e962e2 100644
--- a/logic/src/stats.rs
+++ b/logic/src/stats.rs
@@ -6,11 +6,11 @@
 
 use crate::session::Session;
 use anyhow::Result;
-use jellybase::database::Database;
 use jellycommon::{
     Node, NodeKind, Visibility,
     api::{ApiStatsResponse, StatsBin},
 };
+use jellydb::Database;
 use std::collections::BTreeMap;
 
 pub fn stats(db: &Database, session: &Session) -> Result<ApiStatsResponse> {
@@ -34,7 +34,6 @@ pub fn stats(db: &Database, session: &Session) -> Result<ApiStatsResponse> {
                 }
             }
         }
-      
     }
 
     let mut total = StatsBin::default();
diff --git a/server/Cargo.toml b/server/Cargo.toml
index be8abdb..0bc1960 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 
 [dependencies]
 jellycommon = { path = "../common" }
-jellybase = { path = "../base" }
 jellystream = { path = "../stream" }
 jellytranscoder = { path = "../transcoder" }
 jellyimport = { path = "../import" }
diff --git a/server/src/api.rs b/server/src/api.rs
index fb5ee88..5ec3c5c 100644
--- a/server/src/api.rs
+++ b/server/src/api.rs
@@ -4,12 +4,13 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use super::ui::error::MyResult;
-use crate::{database::Database, helper::A};
-use jellybase::assetfed::AssetInner;
+use crate::helper::A;
 use jellycommon::{user::CreateSessionParams, NodeID, Visibility};
+use jellyimport::asset_token::AssetInner;
 use jellylogic::{
     login::login_logic,
     session::{AdminSession, Session},
+    Database,
 };
 use rocket::{
     get,
diff --git a/server/src/compat/jellyfin/mod.rs b/server/src/compat/jellyfin/mod.rs
index 1c602ca..e8a74d7 100644
--- a/server/src/compat/jellyfin/mod.rs
+++ b/server/src/compat/jellyfin/mod.rs
@@ -7,7 +7,6 @@ pub mod models;
 
 use crate::{helper::A, ui::error::MyResult};
 use anyhow::{anyhow, Context};
-use jellybase::database::Database;
 use jellycommon::{
     api::{FilterProperty, NodeFilterSort, SortOrder, SortProperty},
     routes::{u_asset, u_node_slug_backdrop, u_node_slug_poster},
@@ -17,7 +16,7 @@ use jellycommon::{
 };
 use jellylogic::{
     filter_sort::filter_and_sort_nodes, login::login_logic, node::DatabaseNodeUserDataExt,
-    session::Session,
+    session::Session, Database,
 };
 use jellyui::{get_brand, get_slogan, node_page::aspect_class};
 use models::*;
diff --git a/server/src/compat/youtube.rs b/server/src/compat/youtube.rs
index 67a34fc..0a69d14 100644
--- a/server/src/compat/youtube.rs
+++ b/server/src/compat/youtube.rs
@@ -5,9 +5,8 @@
 */
 use crate::{helper::A, ui::error::MyResult};
 use anyhow::anyhow;
-use jellybase::database::Database;
 use jellycommon::routes::{u_node_slug, u_node_slug_player};
-use jellylogic::session::Session;
+use jellylogic::{session::Session, Database};
 use rocket::{get, response::Redirect, State};
 
 #[get("/watch?<v>")]
diff --git a/server/src/config.rs b/server/src/config.rs
index 68148dd..202948a 100644
--- a/server/src/config.rs
+++ b/server/src/config.rs
@@ -16,7 +16,7 @@ struct Config {
     stream: jellystream::Config,
     cache: jellycache::Config,
     server: crate::Config,
-    base: jellybase::Config,
+    base: jellyimport::asset_token::Config,
     logic: jellylogic::Config,
     import: jellyimport::Config,
 }
@@ -36,7 +36,7 @@ pub async fn load_config() -> Result<()> {
     *jellytranscoder::CONF_PRELOAD.lock().unwrap() = Some(config.transcoder);
     *jellycache::CONF_PRELOAD.lock().unwrap() = Some(config.cache);
     *jellylogic::CONF_PRELOAD.lock().unwrap() = Some(config.logic);
-    *jellybase::CONF_PRELOAD.lock().unwrap() = Some(config.base);
+    *jellyimport::asset_token::CONF_PRELOAD.lock().unwrap() = Some(config.base);
     *jellyimport::CONF_PRELOAD.lock().unwrap() = Some(config.import);
     *crate::CONF_PRELOAD.lock().unwrap() = Some(config.server);
     *jellyui::CONF_PRELOAD.lock().unwrap() = Some(config.ui);
diff --git a/server/src/helper/session.rs b/server/src/helper/session.rs
index b77f9fa..7e23152 100644
--- a/server/src/helper/session.rs
+++ b/server/src/helper/session.rs
@@ -5,8 +5,10 @@
 */
 use crate::ui::error::MyError;
 use anyhow::anyhow;
-use jellybase::database::Database;
-use jellylogic::session::{validate, AdminSession, Session};
+use jellylogic::{
+    session::{validate, AdminSession, Session},
+    Database,
+};
 use log::warn;
 use rocket::{
     async_trait,
diff --git a/server/src/logic/stream.rs b/server/src/logic/stream.rs
index 89589c7..c21edaa 100644
--- a/server/src/logic/stream.rs
+++ b/server/src/logic/stream.rs
@@ -3,11 +3,11 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
-use crate::{database::Database, helper::A, ui::error::MyError};
+use crate::{helper::A, ui::error::MyError};
 use anyhow::{anyhow, Result};
-use jellybase::assetfed::AssetInner;
 use jellycommon::{stream::StreamSpec, TrackSource};
-use jellylogic::session::Session;
+use jellyimport::asset_token::AssetInner;
+use jellylogic::{session::Session, Database};
 use jellystream::SMediaInfo;
 use log::{info, warn};
 use rocket::{
diff --git a/server/src/logic/userdata.rs b/server/src/logic/userdata.rs
index 25d3893..ac3cb83 100644
--- a/server/src/logic/userdata.rs
+++ b/server/src/logic/userdata.rs
@@ -4,13 +4,12 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use crate::{helper::A, ui::error::MyResult};
-use jellybase::database::Database;
 use jellycommon::{
     routes::u_node_id,
     user::{NodeUserData, WatchedState},
     NodeID,
 };
-use jellylogic::session::Session;
+use jellylogic::{session::Session, Database};
 use rocket::{
     form::Form, get, post, response::Redirect, serde::json::Json, FromForm, FromFormField, State,
     UriDisplayQuery,
diff --git a/server/src/main.rs b/server/src/main.rs
index ea75208..0e237f9 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -9,7 +9,7 @@
 
 use anyhow::Context;
 use config::load_config;
-use database::Database;
+use jellylogic::Database;
 use jellylogic::{admin::log::enable_logging, login::create_admin_account};
 use log::{error, info, warn};
 use routes::build_rocket;
@@ -17,7 +17,6 @@ use serde::{Deserialize, Serialize};
 use std::sync::Mutex;
 use std::{path::PathBuf, process::exit, sync::LazyLock};
 
-pub use jellybase::database;
 pub mod api;
 pub mod compat;
 pub mod config;
diff --git a/server/src/routes.rs b/server/src/routes.rs
index da3a389..cc68067 100644
--- a/server/src/routes.rs
+++ b/server/src/routes.rs
@@ -3,7 +3,6 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
-use crate::database::Database;
 use crate::logic::playersync::{r_playersync, PlayersyncChannels};
 use crate::ui::account::{r_account_login, r_account_logout, r_account_register};
 use crate::ui::{
@@ -62,6 +61,7 @@ use crate::{
     },
 };
 use base64::Engine;
+use jellylogic::Database;
 use log::warn;
 use rand::random;
 use rocket::{
diff --git a/server/src/ui/account/mod.rs b/server/src/ui/account/mod.rs
index a9c28ea..f3cd450 100644
--- a/server/src/ui/account/mod.rs
+++ b/server/src/ui/account/mod.rs
@@ -7,7 +7,6 @@ pub mod settings;
 
 use super::error::MyError;
 use crate::{
-    database::Database,
     helper::A,
     locale::AcceptLanguage,
     ui::{error::MyResult, home::rocket_uri_macro_r_home},
@@ -18,6 +17,7 @@ use jellyimport::is_importing;
 use jellylogic::{
     login::{hash_password, login_logic},
     session::Session,
+    Database,
 };
 use jellyui::{
     account::{AccountLogin, AccountLogout, AccountRegister, AccountRegisterSuccess},
diff --git a/server/src/ui/account/settings.rs b/server/src/ui/account/settings.rs
index 5355321..93f442c 100644
--- a/server/src/ui/account/settings.rs
+++ b/server/src/ui/account/settings.rs
@@ -4,11 +4,10 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use super::{format_form_error, hash_password};
-use crate::{database::Database, helper::A, locale::AcceptLanguage, ui::error::MyResult};
-use jellybase::permission::PermissionSetExt;
-use jellycommon::user::{PlayerKind, Theme, UserPermission};
+use crate::{helper::A, locale::AcceptLanguage, ui::error::MyResult};
+use jellycommon::user::{PlayerKind, Theme};
 use jellyimport::is_importing;
-use jellylogic::session::Session;
+use jellylogic::{session::Session, Database};
 use jellyui::{
     account::settings::SettingsPage,
     locale::{tr, Language},
@@ -74,10 +73,6 @@ pub fn r_account_settings_post(
 ) -> MyResult<RawHtml<String>> {
     let AcceptLanguage(lang) = lang;
     let A(session) = session;
-    session
-        .user
-        .permissions
-        .assert(&UserPermission::ManageSelf)?;
 
     let form = match &form.value {
         Some(v) => v,
diff --git a/server/src/ui/admin/mod.rs b/server/src/ui/admin/mod.rs
index 62c5940..9bf85b5 100644
--- a/server/src/ui/admin/mod.rs
+++ b/server/src/ui/admin/mod.rs
@@ -10,12 +10,11 @@ use super::{
     assets::{resolve_asset, AVIF_QUALITY, AVIF_SPEED},
     error::MyResult,
 };
-use crate::{database::Database, helper::A, locale::AcceptLanguage};
+use crate::{helper::A, locale::AcceptLanguage};
 use anyhow::{anyhow, Context};
-use jellybase::assetfed::AssetInner;
 use jellycommon::routes::u_admin_dashboard;
-use jellyimport::{import_wrap, is_importing, IMPORT_ERRORS};
-use jellylogic::session::AdminSession;
+use jellyimport::{asset_token::AssetInner, import_wrap, is_importing, IMPORT_ERRORS};
+use jellylogic::{session::AdminSession, Database};
 use jellyui::{
     admin::AdminDashboardPage,
     render_page,
diff --git a/server/src/ui/admin/user.rs b/server/src/ui/admin/user.rs
index fb646ab..eedf66c 100644
--- a/server/src/ui/admin/user.rs
+++ b/server/src/ui/admin/user.rs
@@ -3,11 +3,11 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
-use crate::{database::Database, helper::A, locale::AcceptLanguage, ui::error::MyResult};
+use crate::{helper::A, locale::AcceptLanguage, ui::error::MyResult};
 use anyhow::{anyhow, Context};
 use jellycommon::user::UserPermission;
 use jellyimport::is_importing;
-use jellylogic::{admin::user::admin_users, session::AdminSession};
+use jellylogic::{admin::user::admin_users, session::AdminSession, Database};
 use jellyui::{
     admin::user::{AdminUserPage, AdminUsersPage},
     render_page,
diff --git a/server/src/ui/assets.rs b/server/src/ui/assets.rs
index 596661a..4e09417 100644
--- a/server/src/ui/assets.rs
+++ b/server/src/ui/assets.rs
@@ -6,9 +6,9 @@
 use super::error::MyResult;
 use crate::{helper::{cache::CacheControlFile, A}, CONF};
 use anyhow::{anyhow, bail, Context};
-use jellybase::{assetfed::AssetInner, database::Database};
 use jellycommon::{LocalTrack, NodeID, PeopleGroup, SourceTrackKind, TrackSource};
-use jellylogic::session::Session;
+use jellyimport::asset_token::AssetInner;
+use jellylogic::{session::Session, Database};
 use log::info;
 use rocket::{get, http::ContentType, response::Redirect, State};
 use std::path::PathBuf;
diff --git a/server/src/ui/home.rs b/server/src/ui/home.rs
index 9c9c1ca..d323b11 100644
--- a/server/src/ui/home.rs
+++ b/server/src/ui/home.rs
@@ -6,10 +6,9 @@
 
 use super::error::MyResult;
 use crate::{api::AcceptJson, helper::A, locale::AcceptLanguage};
-use jellybase::database::Database;
 use jellycommon::api::ApiHomeResponse;
 use jellyimport::is_importing;
-use jellylogic::session::Session;
+use jellylogic::{session::Session, Database};
 use jellyui::{
     home::HomePage,
     render_page,
diff --git a/server/src/ui/items.rs b/server/src/ui/items.rs
index e5aa050..31902f8 100644
--- a/server/src/ui/items.rs
+++ b/server/src/ui/items.rs
@@ -4,10 +4,10 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use super::error::MyError;
-use crate::{api::AcceptJson, database::Database, helper::A, locale::AcceptLanguage};
+use crate::{api::AcceptJson, helper::A, locale::AcceptLanguage};
 use jellycommon::api::{ApiItemsResponse, NodeFilterSort};
 use jellyimport::is_importing;
-use jellylogic::{items::all_items, session::Session};
+use jellylogic::{items::all_items, session::Session, Database};
 use jellyui::{
     items::ItemsPage,
     render_page,
diff --git a/server/src/ui/node.rs b/server/src/ui/node.rs
index 1441cfc..eced16a 100644
--- a/server/src/ui/node.rs
+++ b/server/src/ui/node.rs
@@ -4,13 +4,13 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use super::error::MyResult;
-use crate::{api::AcceptJson, database::Database, helper::A, locale::AcceptLanguage};
+use crate::{api::AcceptJson, helper::A, locale::AcceptLanguage};
 use jellycommon::{
     api::{ApiNodeResponse, NodeFilterSort},
     NodeID,
 };
 use jellyimport::is_importing;
-use jellylogic::{node::get_node, session::Session};
+use jellylogic::{node::get_node, session::Session, Database};
 use jellyui::{
     node_page::NodePage,
     render_page,
diff --git a/server/src/ui/player.rs b/server/src/ui/player.rs
index 300e9d2..614bf4a 100644
--- a/server/src/ui/player.rs
+++ b/server/src/ui/player.rs
@@ -4,7 +4,7 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use super::error::MyResult;
-use crate::{database::Database, helper::A, locale::AcceptLanguage, CONF};
+use crate::{helper::A, locale::AcceptLanguage, CONF};
 use jellycommon::{
     api::NodeFilterSort,
     stream::{StreamContainer, StreamSpec},
@@ -12,7 +12,7 @@ use jellycommon::{
     NodeID,
 };
 use jellyimport::is_importing;
-use jellylogic::{node::get_node, session::Session};
+use jellylogic::{node::get_node, session::Session, Database};
 use jellyui::{
     node_page::NodePage,
     render_page,
diff --git a/server/src/ui/search.rs b/server/src/ui/search.rs
index 1c2ea70..92fcfce 100644
--- a/server/src/ui/search.rs
+++ b/server/src/ui/search.rs
@@ -6,10 +6,9 @@
 use super::error::MyResult;
 use crate::{api::AcceptJson, helper::A, locale::AcceptLanguage};
 use anyhow::anyhow;
-use jellybase::database::Database;
 use jellycommon::api::ApiSearchResponse;
 use jellyimport::is_importing;
-use jellylogic::{search::search, session::Session};
+use jellylogic::{search::search, session::Session, Database};
 use jellyui::{
     render_page,
     scaffold::{RenderInfo, SessionInfo},
diff --git a/server/src/ui/stats.rs b/server/src/ui/stats.rs
index b6a74e5..d991fa0 100644
--- a/server/src/ui/stats.rs
+++ b/server/src/ui/stats.rs
@@ -4,10 +4,10 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use super::error::MyError;
-use crate::{api::AcceptJson, database::Database, helper::A, locale::AcceptLanguage};
+use crate::{api::AcceptJson, helper::A, locale::AcceptLanguage};
 use jellycommon::api::ApiStatsResponse;
 use jellyimport::is_importing;
-use jellylogic::{session::Session, stats::stats};
+use jellylogic::{session::Session, stats::stats, Database};
 use jellyui::{
     render_page,
     scaffold::{RenderInfo, SessionInfo},