diff --git a/.github/workflows/docker-image-cuttingedge.yml b/.github/workflows/docker-image-cuttingedge.yml index 32277fd..a606743 100644 --- a/.github/workflows/docker-image-cuttingedge.yml +++ b/.github/workflows/docker-image-cuttingedge.yml @@ -22,7 +22,7 @@ jobs: # https://github.com/marketplace/actions/docker-setup-buildx - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.6.1 + uses: docker/setup-buildx-action@v3.7.1 # https://github.com/docker/login-action#docker-hub - name: Login to Docker Hub @@ -33,7 +33,7 @@ jobs: # https://github.com/docker/build-push-action#multi-platform-image - name: Build and push API - uses: docker/build-push-action@v6.7.0 + uses: docker/build-push-action@v6.9.0 with: context: ./ file: ./Dockerfile diff --git a/.github/workflows/docker-image-dev.yml b/.github/workflows/docker-image-dev.yml index 3387bcf..ee1e72a 100644 --- a/.github/workflows/docker-image-dev.yml +++ b/.github/workflows/docker-image-dev.yml @@ -22,7 +22,7 @@ jobs: # https://github.com/marketplace/actions/docker-setup-buildx - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.6.1 + uses: docker/setup-buildx-action@v3.7.1 # https://github.com/docker/login-action#docker-hub - name: Login to Docker Hub @@ -33,7 +33,7 @@ jobs: # https://github.com/docker/build-push-action#multi-platform-image - name: Build and push API - uses: docker/build-push-action@v6.7.0 + uses: docker/build-push-action@v6.9.0 with: context: ./ file: ./Dockerfile diff --git a/.github/workflows/docker-image-master.yml b/.github/workflows/docker-image-master.yml index dd98c5e..671132a 100644 --- a/.github/workflows/docker-image-master.yml +++ b/.github/workflows/docker-image-master.yml @@ -22,7 +22,7 @@ jobs: # https://github.com/marketplace/actions/docker-setup-buildx - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.6.1 + uses: docker/setup-buildx-action@v3.7.1 # https://github.com/docker/login-action#docker-hub - name: Login to Docker Hub @@ -33,7 +33,7 @@ jobs: # https://github.com/docker/build-push-action#multi-platform-image - name: Build and push API - uses: docker/build-push-action@v6.7.0 + uses: docker/build-push-action@v6.9.0 with: context: ./ file: ./Dockerfile diff --git a/.github/workflows/docker-image-serverv2.yml b/.github/workflows/docker-image-serverv2.yml index 23d2c2f..dc1fcef 100644 --- a/.github/workflows/docker-image-serverv2.yml +++ b/.github/workflows/docker-image-serverv2.yml @@ -22,7 +22,7 @@ jobs: # https://github.com/marketplace/actions/docker-setup-buildx - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.6.1 + uses: docker/setup-buildx-action@v3.7.1 # https://github.com/docker/login-action#docker-hub - name: Login to Docker Hub @@ -33,7 +33,7 @@ jobs: # https://github.com/docker/build-push-action#multi-platform-image - name: Build and push API - uses: docker/build-push-action@v6.7.0 + uses: docker/build-push-action@v6.9.0 with: context: ./ file: ./Dockerfile diff --git a/Tranga/Chapter.cs b/Tranga/Chapter.cs index 6ae48a2..6e40c6b 100644 --- a/Tranga/Chapter.cs +++ b/Tranga/Chapter.cs @@ -1,5 +1,7 @@ -using System.Text.RegularExpressions; +using System.Runtime.InteropServices; +using System.Text.RegularExpressions; using System.Xml.Linq; +using static System.IO.UnixFileMode; namespace Tranga; @@ -17,23 +19,21 @@ namespace Tranga; public string url { get; } // ReSharper disable once MemberCanBePrivate.Global public string fileName { get; } + public string? id { get; } private static readonly Regex LegalCharacters = new (@"([A-z]*[0-9]* *\.*-*,*\]*\[*'*\'*\)*\(*~*!*)*"); private static readonly Regex IllegalStrings = new(@"(Vol(ume)?|Ch(apter)?)\.?", RegexOptions.IgnoreCase); private static readonly Regex Digits = new(@"[0-9\.]*"); - public Chapter(Manga parentManga, string? name, string? volumeNumber, string chapterNumber, string url) + public Chapter(Manga parentManga, string? name, string? volumeNumber, string chapterNumber, string url, string? id = null) { this.parentManga = parentManga; this.name = name; this.volumeNumber = volumeNumber is not null ? string.Concat(Digits.Matches(volumeNumber).Select(x => x.Value)) : "0"; this.chapterNumber = string.Concat(Digits.Matches(chapterNumber).Select(x => x.Value)); this.url = url; + this.id = id; - string chapterVolNumStr; - if (volumeNumber is not null && volumeNumber.Length > 0) - chapterVolNumStr = $"Vol.{volumeNumber} Ch.{chapterNumber}"; - else - chapterVolNumStr = $"Ch.{chapterNumber}"; + string chapterVolNumStr = $"Vol.{this.volumeNumber} Ch.{chapterNumber}"; if (name is not null && name.Length > 0) { @@ -87,24 +87,44 @@ internal bool CheckChapterIsDownloaded() string mangaDirectory = Path.Join(TrangaSettings.downloadLocation, parentManga.folderName); if (!Directory.Exists(mangaDirectory)) return false; - FileInfo[] archives = new DirectoryInfo(mangaDirectory).GetFiles("*.cbz"); - Regex volChRex = new(@"(?:Vol(?:ume)?\.([0-9]+)\D*)?Ch(?:apter)?\.([0-9]+(?:\.[0-9]+)*)"); + FileInfo? mangaArchive = null; + string markerPath = Path.Join(mangaDirectory, $".{id}"); + if (this.id is not null + && File.Exists(markerPath) + && File.Exists(File.ReadAllText(markerPath))) + { + mangaArchive = new FileInfo(File.ReadAllText(markerPath)); + } + else + { + FileInfo[] archives = new DirectoryInfo(mangaDirectory).GetFiles("*.cbz"); + Regex volChRex = new(@"(?:Vol(?:ume)?\.([0-9]+)\D*)?Ch(?:apter)?\.([0-9]+(?:\.[0-9]+)*)"); - Chapter t = this; + Chapter t = this; + mangaArchive = archives.FirstOrDefault(archive => + { + Match m = volChRex.Match(archive.Name); + if (m.Groups[1].Success) + return m.Groups[1].Value == t.volumeNumber && m.Groups[2].Value == t.chapterNumber; + else + return m.Groups[2].Value == t.chapterNumber; + }); + } string correctPath = GetArchiveFilePath(); - FileInfo? archive = archives.FirstOrDefault(archive => - { - Match m = volChRex.Match(archive.Name); - /*Uncommenting this section will only allow *Version without Volume number* -> *Version with Volume number* but not the other way - if (m.Groups[1].Success) - return m.Groups[1].Value == t.volumeNumber && m.Groups[2].Value == t.chapterNumber; - else*/ - return m.Groups[2].Value == t.chapterNumber; - }); - if(archive is not null && archive.FullName != correctPath) - archive.MoveTo(correctPath, true); - return (archive is not null); + if(mangaArchive is not null && mangaArchive.FullName != correctPath) + mangaArchive.MoveTo(correctPath, true); + return (mangaArchive is not null); + } + + public void CreateChapterMarker() + { + string path = Path.Join(TrangaSettings.downloadLocation, parentManga.folderName, $".{id}"); + File.WriteAllText(path, GetArchiveFilePath()); + File.SetAttributes(path, FileAttributes.Hidden); + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + File.SetUnixFileMode(path, UserRead | UserWrite | UserExecute | GroupRead | GroupWrite | GroupExecute | OtherRead | OtherExecute); } + /// /// Creates full file path of chapter-archive /// diff --git a/Tranga/MangaConnectors/Bato.cs b/Tranga/MangaConnectors/Bato.cs index 161789f..431ae9e 100644 --- a/Tranga/MangaConnectors/Bato.cs +++ b/Tranga/MangaConnectors/Bato.cs @@ -150,7 +150,7 @@ private List ParseChaptersFromHtml(Manga manga, string mangaUrl) HtmlNode chapterList = result.htmlDocument.DocumentNode.SelectSingleNode("/html/body/div/main/div[3]/astro-island/div/div[2]/div/div/astro-slot"); - Regex numberRex = new(@"\/title\/.+\/[0-9]+(-vol_([0-9]+))?-ch_([0-9\.]+)"); + Regex numberRex = new(@"\/title\/.+\/([0-9])+(?:-vol_([0-9]+))?-ch_([0-9\.]+)"); foreach (HtmlNode chapterInfo in chapterList.SelectNodes("div")) { @@ -158,6 +158,7 @@ private List ParseChaptersFromHtml(Manga manga, string mangaUrl) string chapterUrl = infoNode.GetAttributeValue("href", ""); Match match = numberRex.Match(chapterUrl); + string id = match.Groups[1].Value; string? volumeNumber = match.Groups[2].Success ? match.Groups[2].Value : null; string chapterNumber = match.Groups[3].Value; string chapterName = chapterNumber; @@ -189,11 +190,8 @@ public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? p } string[] imageUrls = ParseImageUrlsFromHtml(requestUrl); - - string comicInfoPath = Path.GetTempFileName(); - File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString()); - - return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, "https://mangakatana.com/", progressToken:progressToken); + + return DownloadChapterImages(imageUrls, chapter, RequestType.MangaImage, progressToken:progressToken); } private string[] ParseImageUrlsFromHtml(string mangaUrl) diff --git a/Tranga/MangaConnectors/MangaConnector.cs b/Tranga/MangaConnectors/MangaConnector.cs index 34cd717..607b7a6 100644 --- a/Tranga/MangaConnectors/MangaConnector.cs +++ b/Tranga/MangaConnectors/MangaConnector.cs @@ -216,8 +216,10 @@ private HttpStatusCode DownloadImage(string imageUrl, string fullPath, RequestTy return requestResult.statusCode; } - protected HttpStatusCode DownloadChapterImages(string[] imageUrls, string saveArchiveFilePath, RequestType requestType, string? comicInfoPath = null, string? referrer = null, ProgressToken? progressToken = null) + protected HttpStatusCode DownloadChapterImages(string[] imageUrls, Chapter chapter, RequestType requestType, string? referrer = null, ProgressToken? progressToken = null) { + string saveArchiveFilePath = chapter.GetArchiveFilePath(); + if (progressToken?.cancellationRequested ?? false) return HttpStatusCode.RequestTimeout; Log($"Downloading Images for {saveArchiveFilePath}"); @@ -241,7 +243,7 @@ protected HttpStatusCode DownloadChapterImages(string[] imageUrls, string saveAr //Create a temporary folder to store images string tempFolder = Directory.CreateTempSubdirectory("trangatemp").FullName; - int chapter = 0; + int chapterNum = 0; //Download all Images to temporary Folder if (imageUrls.Length == 0) { @@ -255,9 +257,9 @@ protected HttpStatusCode DownloadChapterImages(string[] imageUrls, string saveAr foreach (string imageUrl in imageUrls) { string extension = imageUrl.Split('.')[^1].Split('?')[0]; - Log($"Downloading image {chapter + 1:000}/{imageUrls.Length:000}"); //TODO - HttpStatusCode status = DownloadImage(imageUrl, Path.Join(tempFolder, $"{chapter++}.{extension}"), requestType, referrer); - Log($"{saveArchiveFilePath} {chapter + 1:000}/{imageUrls.Length:000} {status}"); + Log($"Downloading image {chapterNum + 1:000}/{imageUrls.Length:000}"); //TODO + HttpStatusCode status = DownloadImage(imageUrl, Path.Join(tempFolder, $"{chapterNum++}.{extension}"), requestType, referrer); + Log($"{saveArchiveFilePath} {chapterNum + 1:000}/{imageUrls.Length:000} {status}"); if ((int)status < 200 || (int)status >= 300) { progressToken?.Complete(); @@ -271,16 +273,14 @@ protected HttpStatusCode DownloadChapterImages(string[] imageUrls, string saveAr progressToken?.Increment(); } - if(comicInfoPath is not null){ - File.Copy(comicInfoPath, Path.Join(tempFolder, "ComicInfo.xml")); - File.Delete(comicInfoPath); //Delete tmp-file - } + File.WriteAllText(Path.Join(tempFolder, "ComicInfo.xml"), chapter.GetComicInfoXmlString()); Log($"Creating archive {saveArchiveFilePath}"); //ZIP-it and ship-it ZipFile.CreateFromDirectory(tempFolder, saveArchiveFilePath); - if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) - File.SetUnixFileMode(saveArchiveFilePath, UserRead | UserWrite | UserExecute | GroupRead | GroupWrite | GroupExecute); + chapter.CreateChapterMarker(); + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + File.SetUnixFileMode(saveArchiveFilePath, UserRead | UserWrite | UserExecute | GroupRead | GroupWrite | GroupExecute | OtherRead | OtherExecute); Directory.Delete(tempFolder, true); //Cleanup progressToken?.Complete(); diff --git a/Tranga/MangaConnectors/MangaDex.cs b/Tranga/MangaConnectors/MangaDex.cs index 5698229..d70c825 100644 --- a/Tranga/MangaConnectors/MangaDex.cs +++ b/Tranga/MangaConnectors/MangaDex.cs @@ -248,7 +248,7 @@ public override Chapter[] GetChapters(Manga manga, string language="en") } if(chapterNum is not "null" && !chapters.Any(chp => chp.volumeNumber.Equals(volume) && chp.chapterNumber.Equals(chapterNum))) - chapters.Add(new Chapter(manga, title, volume, chapterNum, chapterId)); + chapters.Add(new Chapter(manga, title, volume, chapterNum, chapterId, chapterId)); } } @@ -289,11 +289,8 @@ public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? p HashSet imageUrls = new(); foreach (JsonNode? image in imageFileNames) imageUrls.Add($"{baseUrl}/data/{hash}/{image!.GetValue()}"); - - string comicInfoPath = Path.GetTempFileName(); - File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString()); //Download Chapter-Images - return DownloadChapterImages(imageUrls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken); + return DownloadChapterImages(imageUrls.ToArray(), chapter, RequestType.MangaImage, progressToken:progressToken); } } \ No newline at end of file diff --git a/Tranga/MangaConnectors/MangaHere.cs b/Tranga/MangaConnectors/MangaHere.cs index a680e3d..27a7dbb 100644 --- a/Tranga/MangaConnectors/MangaHere.cs +++ b/Tranga/MangaConnectors/MangaHere.cs @@ -117,7 +117,7 @@ public override Chapter[] GetChapters(Manga manga, string language="en") if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300 || requestResult.htmlDocument is null) return Array.Empty(); - List urls = requestResult.htmlDocument.DocumentNode.SelectNodes("//div[@id='list-2']/ul//li//a[contains(@href, '/manga/')]") + List urls = requestResult.htmlDocument.DocumentNode.SelectNodes("//div[@id='list-1']/ul//li//a[contains(@href, '/manga/')]") .Select(node => node.GetAttributeValue("href", "")).ToList(); Regex chapterRex = new(@".*\/manga\/[a-zA-Z0-9\-\._\~\!\$\&\'\(\)\*\+\,\;\=\:\@]+\/v([0-9(TBD)]+)\/c([0-9\.]+)\/.*"); @@ -181,12 +181,9 @@ public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? p } } while (downloaded++ <= images); - string comicInfoPath = Path.GetTempFileName(); - File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString()); - if (progressToken is not null) progressToken.increments = images;//we blip to normal length, in downloadchapterimages it is increasaed by the amount of urls again - return DownloadChapterImages(imageUrls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken); + return DownloadChapterImages(imageUrls.ToArray(), chapter, RequestType.MangaImage, progressToken:progressToken); } private string[] ParseImageUrlsFromHtml(HtmlDocument document) diff --git a/Tranga/MangaConnectors/MangaKatana.cs b/Tranga/MangaConnectors/MangaKatana.cs index 37d9805..1cedbbb 100644 --- a/Tranga/MangaConnectors/MangaKatana.cs +++ b/Tranga/MangaConnectors/MangaKatana.cs @@ -213,11 +213,8 @@ public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? p } string[] imageUrls = ParseImageUrlsFromHtml(requestUrl); - - string comicInfoPath = Path.GetTempFileName(); - File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString()); - - return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, "https://mangakatana.com/", progressToken:progressToken); + + return DownloadChapterImages(imageUrls, chapter, RequestType.MangaImage, progressToken:progressToken); } private string[] ParseImageUrlsFromHtml(string mangaUrl) diff --git a/Tranga/MangaConnectors/MangaLife.cs b/Tranga/MangaConnectors/MangaLife.cs index 02ff605..685f989 100644 --- a/Tranga/MangaConnectors/MangaLife.cs +++ b/Tranga/MangaConnectors/MangaLife.cs @@ -194,6 +194,6 @@ public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? p string comicInfoPath = Path.GetTempFileName(); File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString()); - return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken); + return DownloadChapterImages(urls.ToArray(), chapter, RequestType.MangaImage, progressToken:progressToken); } } \ No newline at end of file diff --git a/Tranga/MangaConnectors/Manganato.cs b/Tranga/MangaConnectors/Manganato.cs index 3ab24a4..033f6a4 100644 --- a/Tranga/MangaConnectors/Manganato.cs +++ b/Tranga/MangaConnectors/Manganato.cs @@ -214,10 +214,7 @@ public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? p string[] imageUrls = ParseImageUrlsFromHtml(requestResult.htmlDocument); - string comicInfoPath = Path.GetTempFileName(); - File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString()); - - return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, "https://chapmanganato.com/", progressToken:progressToken); + return DownloadChapterImages(imageUrls, chapter, RequestType.MangaImage, "https://chapmanganato.com/", progressToken:progressToken); } private string[] ParseImageUrlsFromHtml(HtmlDocument document) diff --git a/Tranga/MangaConnectors/Mangasee.cs b/Tranga/MangaConnectors/Mangasee.cs index fd5de86..10a3db6 100644 --- a/Tranga/MangaConnectors/Mangasee.cs +++ b/Tranga/MangaConnectors/Mangasee.cs @@ -220,10 +220,7 @@ public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? p List urls = new(); foreach(HtmlNode galleryImage in images) urls.Add(galleryImage.GetAttributeValue("src", "")); - - string comicInfoPath = Path.GetTempFileName(); - File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString()); - return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken); + return DownloadChapterImages(urls.ToArray(), chapter, RequestType.MangaImage, progressToken:progressToken); } } \ No newline at end of file diff --git a/Tranga/MangaConnectors/Mangaworld.cs b/Tranga/MangaConnectors/Mangaworld.cs index 245e87c..36ebd9f 100644 --- a/Tranga/MangaConnectors/Mangaworld.cs +++ b/Tranga/MangaConnectors/Mangaworld.cs @@ -149,19 +149,21 @@ private List ParseChaptersFromHtml(Manga manga, HtmlDocument document) document.DocumentNode.SelectSingleNode( "//div[contains(concat(' ',normalize-space(@class),' '),'chapters-wrapper')]"); + Regex volumeRex = new(@"[Vv]olume ([0-9]+).*"); + Regex chapterRex = new(@"[Cc]apitolo ([0-9]+).*"); + Regex idRex = new(@".*\/read\/([a-z0-9]+)(?:[?\/].*)?"); if (chaptersWrapper.Descendants("div").Any(descendant => descendant.HasClass("volume-element"))) { foreach (HtmlNode volNode in document.DocumentNode.SelectNodes("//div[contains(concat(' ',normalize-space(@class),' '),'volume-element')]")) { - string volume = Regex.Match(volNode.SelectNodes("div").First(node => node.HasClass("volume")).SelectSingleNode("p").InnerText, - @"[Vv]olume ([0-9]+).*").Groups[1].Value; + string volume = volumeRex.Match(volNode.SelectNodes("div").First(node => node.HasClass("volume")).SelectSingleNode("p").InnerText).Groups[1].Value; foreach (HtmlNode chNode in volNode.SelectNodes("div").First(node => node.HasClass("volume-chapters")).SelectNodes("div")) { - string number = Regex.Match(chNode.SelectSingleNode("a").SelectSingleNode("span").InnerText, - @"[Cc]apitolo ([0-9]+).*").Groups[1].Value; + string number = chapterRex.Match(chNode.SelectSingleNode("a").SelectSingleNode("span").InnerText).Groups[1].Value; string url = chNode.SelectSingleNode("a").GetAttributeValue("href", ""); - ret.Add(new Chapter(manga, null, volume, number, url)); + string id = idRex.Match(chNode.SelectSingleNode("a").GetAttributeValue("href", "")).Groups[1].Value; + ret.Add(new Chapter(manga, null, volume, number, url, id)); } } } @@ -169,10 +171,10 @@ private List ParseChaptersFromHtml(Manga manga, HtmlDocument document) { foreach (HtmlNode chNode in chaptersWrapper.SelectNodes("div").Where(node => node.HasClass("chapter"))) { - string number = Regex.Match(chNode.SelectSingleNode("a").SelectSingleNode("span").InnerText, - @"[Cc]apitolo ([0-9]+).*").Groups[1].Value; + string number = chapterRex.Match(chNode.SelectSingleNode("a").SelectSingleNode("span").InnerText).Groups[1].Value; string url = chNode.SelectSingleNode("a").GetAttributeValue("href", ""); - ret.Add(new Chapter(manga, null, null, number, url)); + string id = idRex.Match(chNode.SelectSingleNode("a").GetAttributeValue("href", "")).Groups[1].Value; + ret.Add(new Chapter(manga, null, null, number, url, id)); } } @@ -207,10 +209,7 @@ public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? p string[] imageUrls = ParseImageUrlsFromHtml(requestResult.htmlDocument); - string comicInfoPath = Path.GetTempFileName(); - File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString()); - - return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, "https://www.mangaworld.bz/", progressToken:progressToken); + return DownloadChapterImages(imageUrls, chapter, RequestType.MangaImage,"https://www.mangaworld.bz/", progressToken:progressToken); } private string[] ParseImageUrlsFromHtml(HtmlDocument document) diff --git a/Tranga/MangaConnectors/ManhuaPlus.cs b/Tranga/MangaConnectors/ManhuaPlus.cs index 41ce7ce..67cca62 100644 --- a/Tranga/MangaConnectors/ManhuaPlus.cs +++ b/Tranga/MangaConnectors/ManhuaPlus.cs @@ -189,10 +189,7 @@ public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? p HtmlNode[] images = document.DocumentNode.SelectNodes("//a[contains(concat(' ',normalize-space(@class),' '),' readImg ')]/img").ToArray(); List urls = images.Select(node => node.GetAttributeValue("src", "")).ToList(); - - string comicInfoPath = Path.GetTempFileName(); - File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString()); - return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken); + return DownloadChapterImages(urls.ToArray(), chapter, RequestType.MangaImage, progressToken:progressToken); } } \ No newline at end of file