diff options
| author | metamuffin <metamuffin@disroot.org> | 2026-02-18 03:41:05 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2026-02-18 03:41:05 +0100 |
| commit | b39e1a10c731fd0e61a566a0668abc33ae821b49 (patch) | |
| tree | 6e2e48b5e56a2cf4b4f966b6f2e014c446a242a1 /server | |
| parent | 95606a9deed45ae285c2d4dee01de9d21a43b044 (diff) | |
| download | jellything-b39e1a10c731fd0e61a566a0668abc33ae821b49.tar jellything-b39e1a10c731fd0e61a566a0668abc33ae821b49.tar.bz2 jellything-b39e1a10c731fd0e61a566a0668abc33ae821b49.tar.zst | |
use fourcc as object tags (bad idea); store type info within objects
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/main.rs | 4 | ||||
| -rw-r--r-- | server/src/ui_responder.rs | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/server/src/main.rs b/server/src/main.rs index b180d79..335b960 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -14,7 +14,7 @@ use crate::{ use anyhow::{Result, anyhow}; use jellycache::Cache; use jellycommon::{ - TAGREG, USER_ADMIN, USER_LOGIN, USER_PASSWORD, + USER_ADMIN, USER_LOGIN, USER_PASSWORD, jellyobject::{ObjectBuffer, Path}, }; use jellydb::{Database, Filter, Query, Sort}; @@ -37,8 +37,6 @@ pub mod ui_responder; #[rocket::main] async fn main() { setup_logger(); - jellydb::DEBUG_TAGREG.set(TAGREG.clone()).ok().unwrap(); - let state = match create_state() { Ok(s) => s, Err(e) => { diff --git a/server/src/ui_responder.rs b/server/src/ui_responder.rs index aed91a2..7333175 100644 --- a/server/src/ui_responder.rs +++ b/server/src/ui_responder.rs @@ -6,7 +6,6 @@ use crate::request_info::RequestInfo; use jellycommon::{ - TAGREG, jellyobject::{ObjectBuffer, json::object_to_json}, }; use jellyui::render_view; @@ -24,7 +23,7 @@ pub enum UiResponse { impl RequestInfo<'_> { pub fn respond_ui(&self, view: ObjectBuffer) -> UiResponse { if self.debug == "json" { - let value = object_to_json(&TAGREG, view.as_object()); + let value = object_to_json(view.as_object()); UiResponse::Json(serde_json::to_string(&value).unwrap()) } else if self.debug == "raw" { UiResponse::Object(view) |