refactor asset system pt. 1

1 files changed, 5 insertions, 9 deletions

diff --git a/import/src/tmdb.rs b/import/src/tmdb.rs
index 5dbc335..3470b90 100644
--- a/import/src/tmdb.rs
+++ b/import/src/tmdb.rs
@@ -1,23 +1,19 @@
-use std::{fmt::Display, sync::Arc};
-
 /*
     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) 2023 metamuffin <metamuffin.org>
+    Copyright (C) 2024 metamuffin <metamuffin.org>
 */
 use anyhow::{anyhow, bail, Context};
 use bincode::{Decode, Encode};
-use jellybase::cache::{async_cache_file, async_cache_memory};
-use jellycommon::{
-    chrono::{format::Parsed, Utc},
-    AssetLocation,
-};
+use jellybase::cache::{async_cache_file, async_cache_memory, CachePath};
+use jellycommon::chrono::{format::Parsed, Utc};
 use log::info;
 use reqwest::{
     header::{HeaderMap, HeaderName, HeaderValue},
     Client, ClientBuilder,
 };
 use serde::Deserialize;
+use std::{fmt::Display, sync::Arc};
 use tokio::io::AsyncWriteExt;
 
 pub struct Tmdb {
@@ -99,7 +95,7 @@ impl Tmdb {
         })
         .await
     }
-    pub async fn image(&self, path: &str) -> anyhow::Result<AssetLocation> {
+    pub async fn image(&self, path: &str) -> anyhow::Result<CachePath> {
         async_cache_file(&["api-tmdb-image", path], |mut file| async move {
             info!("downloading image {path:?}");
             let mut res = self