Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge

db-2001 · Apr 22, 2024 · aaf06da · aaf06da
2 parents 762da4c + 51a26a3
commit aaf06da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Tranga/MangaConnectors/MangaConnector.cs b/Tranga/MangaConnectors/MangaConnector.cs
@@ -175,7 +175,7 @@ public void CopyCoverFromCacheToDownloadLocation(Manga manga, int? retries = 1)
             return;
         }
 
-        string fileInCache = Path.Join(settings.coverImageCache, manga.coverFileNameInCache);
+        string fileInCache = manga.coverFileNameInCache ?? Path.Join(settings.coverImageCache, manga.coverFileNameInCache);
         if (!File.Exists(fileInCache))
         {
             Log($"Cloning cover failed: File missing {fileInCache}.");
@@ -299,6 +299,6 @@ protected string SaveCoverImageToCache(string url, RequestType requestType)
         coverResult.result.CopyTo(ms);
         File.WriteAllBytes(saveImagePath, ms.ToArray());
         Log($"Saving cover to {saveImagePath}");
-        return filename;
+        return saveImagePath;
     }
 }
diff --git a/Tranga/Server.cs b/Tranga/Server.cs
@@ -122,7 +122,7 @@ private void HandleGet(HttpListenerRequest request, HttpListenerResponse respons
                     break;
                 }
 
-                string filePath = settings.GetFullCoverPath((Manga)manga!);
+                string filePath = manga?.coverFileNameInCache ?? "";
                 if (File.Exists(filePath))
                 {
                     FileStream coverStream = new(filePath, FileMode.Open);