Redesign fetch image logic to fix not working with local archives

luigi311 · luigi311 · commit 186d33d8b040 · 2026-02-21T22:26:33.000Z
Signed-off-by: Luis Garcia &lt;git@luigi311.com&gt;
diff --git a/crates/tanoshi-schema/graphql/fetch_chapter.graphql b/crates/tanoshi-schema/graphql/fetch_chapter.graphql
@@ -5,6 +5,7 @@ query FetchChapter($chapterId:Int) {
     prev
     next
     source {
+      id
       url
     }
     manga {
diff --git a/crates/tanoshi-schema/graphql/fetch_histories.graphql b/crates/tanoshi-schema/graphql/fetch_histories.graphql
@@ -1,20 +1,23 @@
 query FetchHistories($first: Int, $cursor: String) {
- recentChapters(first: $first, after: $cursor) {
-   edges {
-     node {
-       mangaId
-   		mangaTitle
-   		coverUrl
-   		chapterId
-   		chapterTitle
-   		readAt
- 	 	lastPageRead
-     }
-     cursor
-   }
-   pageInfo {
-     hasNextPage
-     hasPreviousPage
-   }
- }
-}
+  recentChapters(first: $first, after: $cursor) {
+    edges {
+      node {
+        mangaId
+        mangaTitle
+        coverUrl
+        chapterId
+        chapterTitle
+        readAt
+        lastPageRead
+        source {
+          id
+        }
+      }
+      cursor
+    }
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+    }
+  }
+}
diff --git a/crates/tanoshi-schema/graphql/fetch_recent_updates.graphql b/crates/tanoshi-schema/graphql/fetch_recent_updates.graphql
@@ -1,19 +1,22 @@
 query FetchRecentUpdates($first: Int, $cursor: String) {
- recentUpdates(first: $first, after: $cursor) {
-   edges {
-     node {
-       mangaId
-       mangaTitle
-       coverUrl
-       chapterId
-       chapterTitle
-       uploaded
-     }
-     cursor
-   }
-   pageInfo {
-     hasNextPage
-     hasPreviousPage
-   }
- }
-}
+  recentUpdates(first: $first, after: $cursor) {
+    edges {
+      node {
+        mangaId
+        mangaTitle
+        coverUrl
+        chapterId
+        chapterTitle
+        uploaded
+        source {
+          id
+        }
+      }
+      cursor
+    }
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+    }
+  }
+}
diff --git a/crates/tanoshi-schema/graphql/schema.graphql b/crates/tanoshi-schema/graphql/schema.graphql
@@ -335,6 +335,7 @@ type RecentChapter {
   chapterTitle: String!
   readAt: NaiveDateTime!
   lastPageRead: Int!
+  source: Source!
 }
 
 type RecentChapterConnection {
@@ -364,6 +365,7 @@ type RecentUpdate {
   coverUrl: String!
   chapterTitle: String!
   uploaded: NaiveDateTime!
+  source: Source!
 }
 
 type RecentUpdateConnection {
diff --git a/crates/tanoshi-tauri/src/server.rs b/crates/tanoshi-tauri/src/server.rs
@@ -160,9 +160,9 @@ impl<R: Runtime> Plugin<R> for Server {
       let tracker_repo = TrackerRepositoryImpl::new(pool.clone(), mal_client.clone(), al_client);
       let tracker_svc = TrackerService::new(tracker_repo.clone());
 
-      let image_repo = ImageRepositoryImpl::new();
+      let image_repo = ImageRepositoryImpl::new(extension_manager.clone());
       let image_cache_repo = ImageCacheRepositoryImpl::new(&config.cache_path);
-      let image_svc = ImageService::new(image_repo, image_cache_repo, extension_manager.clone());
+      let image_svc = ImageService::new(image_repo, image_cache_repo);
 
       let loader = DatabaseLoader::new(
         history_repo,
diff --git a/crates/tanoshi-web/src/common/cover.rs b/crates/tanoshi-web/src/common/cover.rs
@@ -30,7 +30,7 @@ impl Cover {
         last_read_at: Option<NaiveDateTime>,
         unread_chapter_count: i64,
     ) -> Self {
-        let cover_url = proxied_image_url(&cover_url);
+        let cover_url = proxied_image_url(&cover_url, source_id);
         Self {
             id,
             source_id,
diff --git a/crates/tanoshi-web/src/histories.rs b/crates/tanoshi-web/src/histories.rs
@@ -22,6 +22,7 @@ pub struct Entry {
     read_at: chrono::NaiveDateTime,
     last_page_read: i64,
     cursor: String,
+    source_id: i64
 }
 
 pub struct Histories {
@@ -57,6 +58,7 @@ impl Histories {
                             read_at: chrono::NaiveDateTime::parse_from_str(&edge.node.read_at, "%Y-%m-%dT%H:%M:%S%.f").unwrap_throw(),
                             last_page_read: edge.node.last_page_read,
                             cursor: edge.cursor.clone(),
+                            source_id: edge.node.source.id,
                         })
                     }
                     histories.is_entries_empty.set(histories.entries.lock_ref().is_empty());
@@ -100,7 +102,7 @@ impl Histories {
                                 .class("update-item-thumbnail")
                                 .children(&mut [
                                     html!("img", {
-                                        .attr("src", &proxied_image_url(&entry.cover_url))
+                                        .attr("src", &proxied_image_url(&entry.cover_url, entry.source_id))
                                     })
                                 ])
                             }),
diff --git a/crates/tanoshi-web/src/manga.rs b/crates/tanoshi-web/src/manga.rs
@@ -529,14 +529,14 @@ impl Manga {
                     // .class_signal("animate-pulse", manga.loader.is_loading())
                     .children(&mut [
                         html!("div", {
-                            .child_signal(manga.cover_url.signal_cloned().map(|x| {
+                            .child_signal(manga.cover_url.signal_cloned().map(clone!(manga => move |x| {
                                 x.map(|cover_url| html!("img", {
                                     .style("border-radius", "0.375rem")
                                     .style("width", "8rem")
                                     .style("height", "auto")
-                                    .attr("src", &proxied_image_url(&cover_url))
+                                    .attr("src", &proxied_image_url(&cover_url, manga.source_id.get()))
                                 }))
-                            }))
+                            })))
                         }),
                         html!("div", {
                             .style("display", "flex")
diff --git a/crates/tanoshi-web/src/reader.rs b/crates/tanoshi-web/src/reader.rs
@@ -66,6 +66,7 @@ pub struct Reader {
     spinner: Rc<Spinner>,
     timeout: Mutable<Option<Timeout>>,
     is_zooming: Mutable<bool>,
+    source_id: Mutable<i64>,
 }
 
 impl Reader {
@@ -94,6 +95,7 @@ impl Reader {
             spinner,
             timeout: Mutable::new(None),
             is_zooming: Mutable::new(false),
+            source_id: Mutable::new(0),
         })
     }
 
@@ -199,14 +201,15 @@ impl Reader {
         this.loader.load(clone!(this => async move {
             match query::fetch_chapter(chapter_id).await {
                 Ok(result) => {
+                    this.source_id.set_neq(result.source.id);
                     this.manga_id.set_neq(result.manga.id);
                     this.manga_title.set_neq(result.manga.title.clone());
                     this.chapter_title.set_neq(format_number_title(result.number, &result.title));
                     this.next_chapter.set_neq(result.next);
                     this.prev_chapter.set_neq(result.prev);
 
                     // Update the number of pages so the correct page can be loaded
-                    let pages = result.pages.iter().map(|page| (format!("{page}?referer={}", result.source.url), PageStatus::Initial)).collect();
+                    let pages = result.pages.iter().map(|page| (format!("{page}"), PageStatus::Initial)).collect();
                     this.pages.lock_mut().replace_cloned(pages);
 
                     this.reader_settings.load_by_manga_id(result.manga.id);
@@ -261,8 +264,7 @@ impl Reader {
 
                     this.pages_loaded.set(ContinousLoaded::Initial);
 
-                    let source_url = result.source.url;
-                    let pages = result.pages.iter().map(|page| (format!("{page}?referer={source_url}"), PageStatus::Initial)).collect();
+                    let pages = result.pages.iter().map(|page| (format!("{page}"), PageStatus::Initial)).collect();
                     this.pages.lock_mut().replace_cloned(pages);
                     
                     Self::replace_state_with_url(chapter_id, page + 1);
@@ -814,9 +816,10 @@ impl Reader {
     }
 
     fn image_src_signal(&self, index: usize, preload_prev: usize, preload_next: usize, page: String, status: PageStatus)-> impl Signal<Item = Option<String>> + use<> {
+        let source_id = self.source_id.get();
         self.current_page.signal_cloned().map(move |current_page| {
             if (index >= current_page.saturating_sub(preload_prev) && index <= current_page + preload_next) || matches!(status, PageStatus::Loaded) {
-                Some(proxied_image_url(&page))
+                Some(proxied_image_url(&page, source_id))
             } else {
                 None
             }
diff --git a/crates/tanoshi-web/src/updates.rs b/crates/tanoshi-web/src/updates.rs
@@ -21,6 +21,7 @@ pub struct Entry {
     chapter_title: String,
     uploaded: chrono::NaiveDateTime,
     cursor: String,
+    source_id: i64,
 }
 
 pub struct Updates {
@@ -65,6 +66,7 @@ impl Updates {
                             chapter_title: edge.node.chapter_title.clone(),
                             uploaded: chrono::NaiveDateTime::parse_from_str(&edge.node.uploaded, "%Y-%m-%dT%H:%M:%S%.f").unwrap_throw(),
                             cursor: edge.cursor.clone(),
+                            source_id: edge.node.source.id,
                         })
                     }
                     updates.is_entries_empty.set(updates.entries.lock_ref().is_empty());
@@ -136,7 +138,7 @@ impl Updates {
                                 .class("update-item-thumbnail")
                                 .children(&mut [
                                     html!("img", {
-                                        .attr("src", &proxied_image_url(&entry.cover_url))
+                                        .attr("src", &proxied_image_url(&entry.cover_url, entry.source_id))
                                     })
                                 ])
                             }),
diff --git a/crates/tanoshi-web/src/utils.rs b/crates/tanoshi-web/src/utils.rs
@@ -102,8 +102,9 @@ impl AsyncLoader {
     }
 }
 
-pub fn proxied_image_url(image_url: &str) -> String {
-    format!("{}/{image_url}", image_proxy_host())
+pub fn proxied_image_url(image_url: &str, source_id: i64) -> String {
+    debug!("proxied_image_url: image_url={}, source_id={}", image_url, source_id);
+    format!("{}/{image_url}?source_id={}", image_proxy_host(), source_id)
 }
 
 pub fn initialize_urls() {
diff --git a/crates/tanoshi/bin/tanoshi.rs b/crates/tanoshi/bin/tanoshi.rs
@@ -197,9 +197,9 @@ async fn main() -> Result<(), anyhow::Error> {
     let tracker_repo = TrackerRepositoryImpl::new(pool.clone(), mal_client.clone(), al_client);
     let tracker_svc = TrackerService::new(tracker_repo.clone());
 
-    let image_repo = ImageRepositoryImpl::new();
+    let image_repo = ImageRepositoryImpl::new(extension_manager.clone());
     let image_cache_repo = ImageCacheRepositoryImpl::new(&config.cache_path);
-    let image_svc = ImageService::new(image_repo, image_cache_repo, extension_manager.clone());
+    let image_svc = ImageService::new(image_repo, image_cache_repo);
 
     let loader = DatabaseLoader::new(
         history_repo,
diff --git a/crates/tanoshi/src/domain/entities/image.rs b/crates/tanoshi/src/domain/entities/image.rs
@@ -15,39 +15,14 @@ type Aes128CbcDec = cbc::Decryptor<aes::Aes128>;
 
 pub enum ImageUri {
     Remote(String),
-    ExtensionRemote {
-        source_id: i64,
-        url: String,
-    },
     File(String),
     Archive(String, String),
 }
 
 impl TryFrom<&str> for ImageUri {
     type Error = anyhow::Error;
 
-    fn try_from(uri: &str) -> Result<Self, Self::Error> {
-        // extension-backed remote
-        if let Some(rest) = uri.strip_prefix("ext:") {
-            // split into 2 parts: source_id and the remaining url
-            let (sid_str, url) = rest
-                .split_once(':')
-                .ok_or_else(|| anyhow!("invalid ext uri, expected ext:<source_id>:<url>"))?;
-
-            let source_id: i64 = sid_str
-                .parse()
-                .map_err(|_| anyhow!("invalid ext uri source_id"))?;
-
-            if !url.starts_with("http") {
-                return Err(anyhow!("invalid ext uri url, expected http(s) url"));
-            }
-
-            return Ok(ImageUri::ExtensionRemote {
-                source_id,
-                url: url.to_string(),
-            });
-        }
-        
+    fn try_from(uri: &str) -> Result<Self, Self::Error> {       
         let uri = if uri.starts_with("http") {
             Self::Remote(uri.to_string())
         } else if !uri.is_empty() {
@@ -115,7 +90,6 @@ impl ToString for ImageUri {
     fn to_string(&self) -> String {
         match self {
             ImageUri::Remote(url) => url.to_owned(),
-            ImageUri::ExtensionRemote { source_id, url } => format!("ext:{source_id}:{url}"),
             ImageUri::File(path) => path.to_owned(),
             ImageUri::Archive(archive, filename) => format!("{archive}/{filename}"),
         }
diff --git a/crates/tanoshi/src/domain/repositories/image.rs b/crates/tanoshi/src/domain/repositories/image.rs
@@ -19,7 +19,7 @@ pub trait ImageRepository: Send + Sync {
     async fn fetch_image_from_url(
         &self,
         url: &str,
-        referer: Option<&String>,
+        source_id: i64,
     ) -> Result<Image, ImageRepositoryError>;
     async fn fetch_image_from_file<P>(&self, path: P) -> Result<Image, ImageRepositoryError>
     where
diff --git a/crates/tanoshi/src/domain/services/image.rs b/crates/tanoshi/src/domain/services/image.rs
diff --git a/crates/tanoshi/src/infrastructure/domain/repositories/image.rs b/crates/tanoshi/src/infrastructure/domain/repositories/image.rs
diff --git a/crates/tanoshi/src/presentation/graphql/chapter.rs b/crates/tanoshi/src/presentation/graphql/chapter.rs
diff --git a/crates/tanoshi/src/presentation/graphql/manga.rs b/crates/tanoshi/src/presentation/graphql/manga.rs
diff --git a/crates/tanoshi/src/presentation/rest/image.rs b/crates/tanoshi/src/presentation/rest/image.rs

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ query FetchChapter($chapterId:Int) {`
`5`	`5`	`prev`
`6`	`6`	`next`
`7`	`7`	`source {`
	`8`	`+ id`
`8`	`9`	`url`
`9`	`10`	`}`
`10`	`11`	`manga {`
Original file line number	Diff line number	Diff line change
`@@ -335,6 +335,7 @@ type RecentChapter {`
`335`	`335`	`chapterTitle: String!`
`336`	`336`	`readAt: NaiveDateTime!`
`337`	`337`	`lastPageRead: Int!`
	`338`	`+ source: Source!`
`338`	`339`	`}`
`339`	`340`
`340`	`341`	`type RecentChapterConnection {`
`@@ -364,6 +365,7 @@ type RecentUpdate {`
`364`	`365`	`coverUrl: String!`
`365`	`366`	`chapterTitle: String!`
`366`	`367`	`uploaded: NaiveDateTime!`
	`368`	`+ source: Source!`
`367`	`369`	`}`
`368`	`370`
`369`	`371`	`type RecentUpdateConnection {`