From 7323709537c6ff14136cd79fb07606cd79391758 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Wed, 24 Jan 2024 18:11:23 +0100
Subject: refactor asset system pt. 1

---
 base/src/lib.rs | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

(limited to 'base/src/lib.rs')

diff --git a/base/src/lib.rs b/base/src/lib.rs
index 015b62b..90ac27b 100644
--- a/base/src/lib.rs
+++ b/base/src/lib.rs
@@ -8,13 +8,10 @@ pub mod cache;
 pub mod database;
 pub mod federation;
 pub mod permission;
-pub mod temp;
+pub mod assetfed;
 
-use jellycommon::{
-    config::{GlobalConfig, SecretsConfig},
-    AssetLocation,
-};
-use std::{fs::File, path::PathBuf, sync::LazyLock};
+use jellycommon::config::{GlobalConfig, SecretsConfig};
+use std::{fs::File, sync::LazyLock};
 
 pub static CONF: LazyLock<GlobalConfig> = LazyLock::new(|| {
     serde_yaml::from_reader(
@@ -39,18 +36,3 @@ pub static SECRETS: LazyLock<SecretsConfig> = LazyLock::new(|| {
     serde_yaml::from_reader(File::open(&CONF.secrets_path).expect("secrets file missing"))
         .expect("secrets config invalid")
 });
-
-pub trait AssetLocationExt {
-    fn path(&self) -> PathBuf;
-}
-impl AssetLocationExt for AssetLocation {
-    fn path(&self) -> PathBuf {
-        match self {
-            AssetLocation::Assets(p) => CONF.asset_path.join(p),
-            AssetLocation::Cache(p) => CONF.cache_path.join(p),
-            AssetLocation::Library(p) => CONF.library_path.join(p),
-            AssetLocation::Temp(p) => CONF.temp_path.join(p),
-            AssetLocation::Media(p) => CONF.media_path.join(p),
-        }
-    }
-}
-- 
cgit v1.2.3-70-g09d2