From b39e1a10c731fd0e61a566a0668abc33ae821b49 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Wed, 18 Feb 2026 03:41:05 +0100 Subject: use fourcc as object tags (bad idea); store type info within objects --- server/src/main.rs | 4 +--- server/src/ui_responder.rs | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'server') 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) -- cgit v1.3