Merge pull request #407 from C9Glax/dependabot/github_actions/docker/setup-buildx-action-3.11.1

Bump docker/setup-buildx-action from 3.11.0 to 3.11.1

.github/ISSUE_TEMPLATE/new_connector.yml

@@ -12,7 +12,7 @@ body:
   - type: checkboxes
     attributes:
       label: Is the Website free to access?
-      description: We can't support pay-to-use sites.
+      description: We can't support pay-to-use sites, or captcha-proxied sites as Cloudflare.
       options:
         - label: The Website is freely accessible.
           required: true
@@ -20,4 +20,4 @@ body:
     attributes:
       label: Anything else?
     validations:
-      required: false
+      required: false

.github/workflows/docker-image-cuttingedge.yml

@@ -17,12 +17,12 @@ jobs:
 
       # https://github.com/docker/setup-qemu-action#usage
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.5.0
+        uses: docker/setup-qemu-action@v3.6.0
 
       # https://github.com/marketplace/actions/docker-setup-buildx
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.10.0
+        uses: docker/setup-buildx-action@v3.11.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.15.0
+        uses: docker/build-push-action@v6.18.0
         with:
           context: ./
           file: ./Dockerfile

.github/workflows/docker-image-dev.yml

@@ -1,45 +0,0 @@
-name: Docker Image CI
-
-on:
-  push:
-    branches: [ "dev" ]
-  workflow_dispatch:
-
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      # https://github.com/docker/setup-qemu-action#usage
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.5.0
-
-      # https://github.com/marketplace/actions/docker-setup-buildx
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3.10.0
-      
-      # https://github.com/docker/login-action#docker-hub
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      
-      # https://github.com/docker/build-push-action#multi-platform-image
-      - name: Build and push API
-        uses: docker/build-push-action@v6.15.0
-        with:
-          context: ./
-          file: ./Dockerfile
-          #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
-          platforms: linux/amd64,linux/arm64
-          pull: true
-          push: true
-          tags: |
-            glax/tranga-api:dev

.github/workflows/docker-image-master.yml

@@ -17,12 +17,12 @@ jobs:
 
       # https://github.com/docker/setup-qemu-action#usage
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.5.0
+        uses: docker/setup-qemu-action@v3.6.0
 
       # https://github.com/marketplace/actions/docker-setup-buildx
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.10.0
+        uses: docker/setup-buildx-action@v3.11.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.15.0
+        uses: docker/build-push-action@v6.18.0
         with:
           context: ./
           file: ./Dockerfile

.github/workflows/docker-image-serverv2.yml

@@ -2,7 +2,7 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ "Server-V2" ]
+    branches: [ "postgres-Server-V2" ]
   workflow_dispatch:
 
 jobs:
@@ -17,12 +17,12 @@ jobs:
 
       # https://github.com/docker/setup-qemu-action#usage
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.5.0
+        uses: docker/setup-qemu-action@v3.6.0
 
       # https://github.com/marketplace/actions/docker-setup-buildx
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.10.0
+        uses: docker/setup-buildx-action@v3.11.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.15.0
+        uses: docker/build-push-action@v6.18.0
         with:
           context: ./
           file: ./Dockerfile

README.md

@@ -1,3 +1,7 @@
+# Testers for V2 wanted!
+
+[Details](https://github.com/C9Glax/tranga/pull/355#issuecomment-2764217944)
+
 <!-- PROJECT LOGO -->
 <br />
 <div align="center">

Tranga/Chapter.cs

@@ -44,7 +44,7 @@ public readonly struct Chapter : IComparable
         if (name is not null && name.Length > 0)
         {
             string chapterName = IllegalStrings.Replace(string.Concat(LegalCharacters.Matches(name)), "");
-            this.fileName = $"{chapterVolNumStr} - {chapterName}";
+            this.fileName = chapterName.Length > 0 ? $"{chapterVolNumStr} - {chapterName}" : chapterVolNumStr;
         }
         else
             this.fileName = chapterVolNumStr;
@@ -96,17 +96,20 @@ public readonly struct Chapter : IComparable
         if(mangaArchive is null)
         {
             FileInfo[] archives = new DirectoryInfo(mangaDirectory).GetFiles("*.cbz");
-            Regex volChRex = new(@"(?:Vol(?:ume)?\.([0-9]+)\D*)?Ch(?:apter)?\.([0-9]+(?:\.[0-9]+)*)");
+            Regex volChRex = new(@"(?:Vol(?:ume)?\.([0-9]+)\D*)?Ch(?:apter)?\.([0-9]+(?:\.[0-9]+)*)(?: - (.*))?.cbz");
 
             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.ToString(GlobalBase.numberFormatDecimalPoint) &&
-                           m.Groups[2].Value == t.chapterNumber.ToString(GlobalBase.numberFormatDecimalPoint);
-                else
-                    return m.Groups[2].Value == t.chapterNumber.ToString(GlobalBase.numberFormatDecimalPoint);
+                /*
+                 * 1. If the volumeNumber is not present in the filename, it is not checked.
+                 * 2. Check the chapterNumber in the chapter against the one in the filename.
+                 * 3. The chpaterName has to either be absent both in the chapter and the filename or match.
+                 */
+                return (!m.Groups[1].Success || m.Groups[1].Value == t.volumeNumber.ToString(GlobalBase.numberFormatDecimalPoint)) &&
+                       m.Groups[2].Value == t.chapterNumber.ToString(GlobalBase.numberFormatDecimalPoint) &&
+                       ((!m.Groups[3].Success && string.IsNullOrEmpty(t.name)) || m.Groups[3].Value == t.name);
             });
         }
         

Tranga/MangaConnectors/Manganato.cs

@@ -17,7 +17,7 @@ public class Manganato : MangaConnector
     {
         Log($"Searching Publications. Term=\"{publicationTitle}\"");
         string sanitizedTitle = string.Join('_', Regex.Matches(publicationTitle, "[A-z]*").Where(str => str.Length > 0)).ToLower();
-        string requestUrl = $"https://manganato.com/search/story/{sanitizedTitle}";
+        string requestUrl = $"https://manganato.gg/search/story/{sanitizedTitle}";
         RequestResult requestResult =
             downloadClient.MakeRequest(requestUrl, RequestType.Default);
         if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
@@ -32,13 +32,19 @@ public class Manganato : MangaConnector
 
     private Manga[] ParsePublicationsFromHtml(HtmlDocument document)
     {
-        List<HtmlNode> searchResults = document.DocumentNode.Descendants("div").Where(n => n.HasClass("search-story-item")).ToList();
+        List<HtmlNode> searchResults = document.DocumentNode.Descendants("div").Where(n => n.HasClass("story_item")).ToList();
         Log($"{searchResults.Count} items.");
         List<string> urls = new();
         foreach (HtmlNode mangaResult in searchResults)
         {
-            urls.Add(mangaResult.Descendants("a").First(n => n.HasClass("item-title")).GetAttributes()
-                .First(a => a.Name == "href").Value);
+            try
+            {
+            urls.Add(mangaResult.Descendants("h3").First(n => n.HasClass("story_name"))
+                .Descendants("a").First().GetAttributeValue("href", ""));
+            } catch
+            {
+                //failed to get a url, send it to the void
+            }
         }
 
         HashSet<Manga> ret = new();
@@ -78,61 +84,49 @@ public class Manganato : MangaConnector
         string originalLanguage = "";
         Manga.ReleaseStatusByte releaseStatus = Manga.ReleaseStatusByte.Unreleased;
 
-        HtmlNode infoNode = document.DocumentNode.Descendants("div").First(d => d.HasClass("story-info-right"));
+        HtmlNode infoNode = document.DocumentNode.Descendants("ul").First(d => d.HasClass("manga-info-text"));
 
         string sortName = infoNode.Descendants("h1").First().InnerText;
 
-        HtmlNode infoTable = infoNode.Descendants().First(d => d.Name == "table");
-        
-        foreach (HtmlNode row in infoTable.Descendants("tr"))
+        foreach (HtmlNode li in infoNode.Descendants("li"))
         {
-            string key = row.SelectNodes("td").First().InnerText.ToLower();
-            string value = row.SelectNodes("td").Last().InnerText;
-            string keySanitized = string.Concat(Regex.Matches(key, "[a-z]"));
-
-            switch (keySanitized)
+            string text = li.InnerText.Trim().ToLower();
+            
+            if (text.StartsWith("author(s) :"))
             {
-                case "alternative":
-                    string[] alts = value.Split(" ; ");
-                    for(int i = 0; i < alts.Length; i++)
-                        altTitles.Add(i.ToString(), alts[i]);
-                    break;
-                case "authors":
-                    authors = value.Split('-');
-                    for (int i = 0; i < authors.Length; i++)
-                        authors[i] = authors[i].Replace("\r\n", "");
-                    break;
-                case "status":
-                    switch (value.ToLower())
-                    {
-                        case "ongoing": releaseStatus = Manga.ReleaseStatusByte.Continuing; break;
-                        case "completed": releaseStatus = Manga.ReleaseStatusByte.Completed; break;
-                    }
-                    break;
-                case "genres":
-                    string[] genres = value.Split(" - ");
-                    for (int i = 0; i < genres.Length; i++)
-                        genres[i] = genres[i].Replace("\r\n", "");
-                    tags = genres.ToHashSet();
-                    break;
+                authors = li.Descendants("a").Select(a => a.InnerText.Trim()).ToArray();
+            }
+            else if (text.StartsWith("status :"))
+            {
+                string status = text.Replace("status :", "").Trim().ToLower();
+                if (string.IsNullOrWhiteSpace(status))
+                    releaseStatus = Manga.ReleaseStatusByte.Continuing;
+                else if (status == "ongoing")
+                    releaseStatus = Manga.ReleaseStatusByte.Continuing;
+                else
+                    releaseStatus = Enum.Parse<Manga.ReleaseStatusByte>(status, true);
+            }
+            else if (li.HasClass("genres"))
+            {
+                tags = li.Descendants("a").Select(a => a.InnerText.Trim()).ToHashSet();
             }
         }
 
-        string posterUrl = document.DocumentNode.Descendants("span").First(s => s.HasClass("info-image")).Descendants("img").First()
+        string posterUrl = document.DocumentNode.Descendants("div").First(s => s.HasClass("manga-info-pic")).Descendants("img").First()
             .GetAttributes().First(a => a.Name == "src").Value;
 
-        string coverFileNameInCache = SaveCoverImageToCache(posterUrl, publicationId, RequestType.MangaCover);
+        string coverFileNameInCache = SaveCoverImageToCache(posterUrl, publicationId, RequestType.MangaCover, "https://www.manganato.gg/");
 
-        string description = document.DocumentNode.Descendants("div").First(d => d.HasClass("panel-story-info-description"))
+        string description = document.DocumentNode.SelectSingleNode("//div[@id='contentBox']")
             .InnerText.Replace("Description :", "");
         while (description.StartsWith('\n'))
             description = description.Substring(1);
         
-        string pattern = "MMM dd,yyyy HH:mm";
+        string pattern = "MMM-dd-yyyy HH:mm";
 
         HtmlNode? oldestChapter = document.DocumentNode
-            .SelectNodes("//span[contains(concat(' ',normalize-space(@class),' '),' chapter-time ')]").MaxBy(
-                node => DateTime.ParseExact(node.GetAttributeValue("title", "Dec 31 2400, 23:59"), pattern,
+            .SelectNodes("//div[contains(concat(' ',normalize-space(@class),' '),' row ')]/span[@title]").MaxBy(
+                node => DateTime.ParseExact(node.GetAttributeValue("title", "Dec-31-2400 23:59"), pattern,
                     CultureInfo.InvariantCulture).Millisecond);
 
 
@@ -148,7 +142,7 @@ public class Manganato : MangaConnector
     public override Chapter[] GetChapters(Manga manga, string language="en")
     {
         Log($"Getting chapters {manga}");
-        string requestUrl = $"https://chapmanganato.com/{manga.publicationId}";
+        string requestUrl = manga.websiteUrl;
         RequestResult requestResult =
             downloadClient.MakeRequest(requestUrl, RequestType.Default);
         if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
@@ -166,21 +160,21 @@ public class Manganato : MangaConnector
     {
         List<Chapter> ret = new();
 
-        HtmlNode chapterList = document.DocumentNode.Descendants("ul").First(l => l.HasClass("row-content-chapter"));
+        HtmlNode chapterList = document.DocumentNode.Descendants("div").First(l => l.HasClass("chapter-list"));
 
         Regex volRex = new(@"Vol\.([0-9]+).*");
         Regex chapterRex = new(@"https:\/\/chapmanganato.[A-z]+\/manga-[A-z0-9]+\/chapter-([0-9\.]+)");
         Regex nameRex = new(@"Chapter ([0-9]+(\.[0-9]+)*){1}:? (.*)");
 
-        foreach (HtmlNode chapterInfo in chapterList.Descendants("li"))
+        foreach (HtmlNode chapterInfo in chapterList.Descendants("div").Where(x => x.HasClass("row")))
         {
-            string fullString = chapterInfo.Descendants("a").First(d => d.HasClass("chapter-name")).InnerText;
-
-            string url = chapterInfo.Descendants("a").First(d => d.HasClass("chapter-name"))
-                .GetAttributeValue("href", "");
-            string? volumeNumber = volRex.IsMatch(fullString) ? volRex.Match(fullString).Groups[1].Value : null;
-            string chapterNumber = chapterRex.Match(url).Groups[1].Value;
-            string chapterName = nameRex.Match(fullString).Groups[3].Value;
+            string url = chapterInfo.Descendants("a").First().GetAttributeValue("href", "");
+            var name = chapterInfo.Descendants("a").First().InnerText.Trim();
+            string chapterName = nameRex.Match(name).Groups[3].Value;
+            string chapterNumber = Regex.Match(name, @"Chapter ([0-9]+(\.[0-9]+)*)").Groups[1].Value;
+            string? volumeNumber = Regex.Match(chapterName, @"Vol\.([0-9]+)").Groups[1].Value;
+            if (string.IsNullOrWhiteSpace(volumeNumber))
+                volumeNumber = "0";
             try
             {
                 ret.Add(new Chapter(manga, chapterName, volumeNumber, chapterNumber, url));
@@ -221,7 +215,7 @@ public class Manganato : MangaConnector
 
         string[] imageUrls = ParseImageUrlsFromHtml(requestResult.htmlDocument);
         
-        return DownloadChapterImages(imageUrls, chapter, RequestType.MangaImage, "https://chapmanganato.com/", progressToken:progressToken);
+        return DownloadChapterImages(imageUrls, chapter, RequestType.MangaImage, "https://www.manganato.gg", progressToken:progressToken);
     }
 
     private string[] ParseImageUrlsFromHtml(HtmlDocument document)

Tranga/MangaConnectors/Webtoons.cs

@@ -56,7 +56,7 @@ public class Webtoons : MangaConnector
             Log($"Failed to retrieve site");
             return null;
         }
-        Regex regex = new Regex(@".*webtoons\.com/en/(?<category>[^/]+)/(?<title>[^/]+)/list\?title_no=(?<id>\d+).*");
+        Regex regex = new Regex(@".*webtoons\.com\/en\/(?<category>[^\/]+)\/(?<title>[^\/]+)\/list\?title_no=(?<id>\d+).*");
         Match match = regex.Match(url);
 
         if(match.Success) {
@@ -110,7 +110,7 @@ public class Webtoons : MangaConnector
 
         HtmlNode posterNode = document.DocumentNode.SelectSingleNode("//div[contains(@class, 'detail_body') and contains(@class, 'banner')]");
 
-        Regex regex = new Regex(@"url\((?<url>.*?)\)");
+        Regex regex = new Regex(@"url\('(?<url>.*?)'\)");
         Match match = regex.Match(posterNode.GetAttributeValue("style", ""));
 
         string posterUrl = match.Groups["url"].Value;
@@ -270,4 +270,4 @@ internal class PublicationManager {
     public string Title { get; set; }
     public string Category { get; set; }
     public string Id { get; set; }
-}
+}

Tranga/MangaConnectors/WeebCentral.cs

@@ -1,7 +1,6 @@
 using System.Net;
 using System.Text.RegularExpressions;
 using HtmlAgilityPack;
-using Soenneker.Utils.String.NeedlemanWunsch;
 using Tranga.Jobs;
 
 namespace Tranga.MangaConnectors;
@@ -22,10 +21,10 @@ public class Weebcentral : MangaConnector
     {
         Log($"Searching Publications. Term=\"{publicationTitle}\"");
         const int limit = 32; //How many values we want returned at once
-        var offset = 0; //"Page"
-        var requestUrl =
+        int offset = 0; //"Page"
+        string requestUrl =
             $"{_baseUrl}/search/data?limit={limit}&offset={offset}&text={publicationTitle}&sort=Best+Match&order=Ascending&official=Any&display_mode=Minimal%20Display";
-        var requestResult =
+        RequestResult requestResult =
             downloadClient.MakeRequest(requestUrl, RequestType.Default);
         if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300 ||
             requestResult.htmlDocument == null)
@@ -34,7 +33,7 @@ public class Weebcentral : MangaConnector
             return [];
         }
 
-        var publications = ParsePublicationsFromHtml(requestResult.htmlDocument);
+        Manga[] publications = ParsePublicationsFromHtml(requestResult.htmlDocument);
         Log($"Retrieved {publications.Length} publications. Term=\"{publicationTitle}\"");
 
         return publications;
@@ -45,13 +44,13 @@ public class Weebcentral : MangaConnector
         if (document.DocumentNode.SelectNodes("//article") == null)
             return [];
 
-        var urls = document.DocumentNode.SelectNodes("/html/body/article/a[@class='link link-hover']")
+        List<string> urls = document.DocumentNode.SelectNodes("/html/body/article/a[@class='link link-hover tooltip tooltip-bottom']")
             .Select(elem => elem.GetAttributeValue("href", "")).ToList();
 
         HashSet<Manga> ret = new();
-        foreach (var url in urls)
+        foreach (string url in urls)
         {
-            var manga = GetMangaFromUrl(url);
+            Manga? manga = GetMangaFromUrl(url);
             if (manga is not null)
                 ret.Add((Manga)manga);
         }
@@ -62,9 +61,9 @@ public class Weebcentral : MangaConnector
     public override Manga? GetMangaFromUrl(string url)
     {
         Regex publicationIdRex = new(@"https:\/\/weebcentral\.com\/series\/(\w*)\/(.*)");
-        var publicationId = publicationIdRex.Match(url).Groups[1].Value;
+        string publicationId = publicationIdRex.Match(url).Groups[1].Value;
 
-        var requestResult = downloadClient.MakeRequest(url, RequestType.MangaInfo);
+        RequestResult requestResult = downloadClient.MakeRequest(url, RequestType.MangaInfo);
         if ((int)requestResult.statusCode < 300 && (int)requestResult.statusCode >= 200 &&
             requestResult.htmlDocument is not null)
             return ParseSinglePublicationFromHtml(requestResult.htmlDocument, publicationId, url);
@@ -73,26 +72,26 @@ public class Weebcentral : MangaConnector
 
     private Manga ParseSinglePublicationFromHtml(HtmlDocument document, string publicationId, string websiteUrl)
     {
-        var posterNode =
+        HtmlNode? posterNode =
             document.DocumentNode.SelectSingleNode("//section[@class='flex items-center justify-center']/picture/img");
-        var posterUrl = posterNode?.GetAttributeValue("src", "") ?? "";
-        var coverFileNameInCache = SaveCoverImageToCache(posterUrl, publicationId, RequestType.MangaCover);
+        string posterUrl = posterNode?.GetAttributeValue("src", "") ?? "";
+        string coverFileNameInCache = SaveCoverImageToCache(posterUrl, publicationId, RequestType.MangaCover);
 
-        var titleNode = document.DocumentNode.SelectSingleNode("//section/h1");
-        var sortName = titleNode?.InnerText ?? "Undefined";
+        HtmlNode? titleNode = document.DocumentNode.SelectSingleNode("//section/h1");
+        string sortName = titleNode?.InnerText ?? "Undefined";
 
         HtmlNode[] authorsNodes =
             document.DocumentNode.SelectNodes("//ul/li[strong/text() = 'Author(s): ']/span")?.ToArray() ?? [];
-        var authors = authorsNodes.Select(n => n.InnerText).ToList();
+        List<string> authors = authorsNodes.Select(n => n.InnerText).ToList();
 
         HtmlNode[] genreNodes =
             document.DocumentNode.SelectNodes("//ul/li[strong/text() = 'Tags(s): ']/span")?.ToArray() ?? [];
         HashSet<string> tags = genreNodes.Select(n => n.InnerText).ToHashSet();
 
-        var statusNode = document.DocumentNode.SelectSingleNode("//ul/li[strong/text() = 'Status: ']/a");
-        var status = statusNode?.InnerText ?? "";
+        HtmlNode? statusNode = document.DocumentNode.SelectSingleNode("//ul/li[strong/text() = 'Status: ']/a");
+        string status = statusNode?.InnerText ?? "";
         Log("unable to parse status");
-        var releaseStatus = Manga.ReleaseStatusByte.Unreleased;
+        Manga.ReleaseStatusByte releaseStatus = Manga.ReleaseStatusByte.Unreleased;
         switch (status.ToLower())
         {
             case "cancelled": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
@@ -101,19 +100,19 @@ public class Weebcentral : MangaConnector
             case "ongoing": releaseStatus = Manga.ReleaseStatusByte.Continuing; break;
         }
 
-        var yearNode = document.DocumentNode.SelectSingleNode("//ul/li[strong/text() = 'Released: ']/span");
-        var year = Convert.ToInt32(yearNode?.InnerText ?? "0");
+        HtmlNode? yearNode = document.DocumentNode.SelectSingleNode("//ul/li[strong/text() = 'Released: ']/span");
+        int year = Convert.ToInt32(yearNode?.InnerText ?? "0");
 
-        var descriptionNode = document.DocumentNode.SelectSingleNode("//ul/li[strong/text() = 'Description']/p");
-        var description = descriptionNode?.InnerText ?? "Undefined";
+        HtmlNode? descriptionNode = document.DocumentNode.SelectSingleNode("//ul/li[strong/text() = 'Description']/p");
+        string description = descriptionNode?.InnerText ?? "Undefined";
 
         HtmlNode[] altTitleNodes = document.DocumentNode
             .SelectNodes("//ul/li[strong/text() = 'Associated Name(s)']/ul/li")?.ToArray() ?? [];
         Dictionary<string, string> altTitles = new(), links = new();
-        for (var i = 0; i < altTitleNodes.Length; i++)
+        for (int i = 0; i < altTitleNodes.Length; i++)
             altTitles.Add(i.ToString(), altTitleNodes[i].InnerText);
 
-        var originalLanguage = "";
+        string originalLanguage = "";
 
         Manga manga = new(sortName, authors.ToList(), description, altTitles, tags.ToArray(), posterUrl,
             coverFileNameInCache, links,
@@ -130,8 +129,8 @@ public class Weebcentral : MangaConnector
     public override Chapter[] GetChapters(Manga manga, string language = "en")
     {
         Log($"Getting chapters {manga}");
-        var requestUrl = $"{_baseUrl}/series/{manga.publicationId}/full-chapter-list";
-        var requestResult =
+        string requestUrl = $"{_baseUrl}/series/{manga.publicationId}/full-chapter-list";
+        RequestResult requestResult =
             downloadClient.MakeRequest(requestUrl, RequestType.Default);
         if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
             return [];
@@ -139,35 +138,42 @@ public class Weebcentral : MangaConnector
         //Return Chapters ordered by Chapter-Number
         if (requestResult.htmlDocument is null)
             return [];
-        var chapters = ParseChaptersFromHtml(manga, requestResult.htmlDocument);
+        List<Chapter> chapters = ParseChaptersFromHtml(manga, requestResult.htmlDocument);
         Log($"Got {chapters.Count} chapters. {manga}");
-        return chapters.Order().ToArray();
+        return chapters.OrderByDescending(c => c.name).ThenBy(c => c.volumeNumber).ThenBy(c => c.chapterNumber).ToArray();
     }
 
     private List<Chapter> ParseChaptersFromHtml(Manga manga, HtmlDocument document)
     {
-        var chaptersWrapper = document.DocumentNode.SelectSingleNode("/html/body");
+        HtmlNode? chaptersWrapper = document.DocumentNode.SelectSingleNode("/html/body");
 
         Regex chapterRex = new(@"(\d+(?:\.\d+)*)");
+        Regex chapterNameRex = new(@"(\w* )+");
         Regex idRex = new(@"https:\/\/weebcentral\.com\/chapters\/(\w*)");
 
-        var ret = chaptersWrapper.Descendants("a").Select(elem =>
+        List<Chapter> ret = chaptersWrapper.Descendants("a").Select(elem =>
         {
-            var url = elem.GetAttributeValue("href", "") ?? "Undefined";
+            string url = elem.GetAttributeValue("href", "") ?? "Undefined";
 
             if (!url.StartsWith("https://") && !url.StartsWith("http://"))
                 return new Chapter(manga, null, null, "-1", "undefined");
 
-            var idMatch = idRex.Match(url);
-            var id = idMatch.Success ? idMatch.Groups[1].Value : null;
+            Match idMatch = idRex.Match(url);
+            string? id = idMatch.Success ? idMatch.Groups[1].Value : null;
 
-            var chapterNode = elem.SelectSingleNode("span[@class='grow flex items-center gap-2']/span")?.InnerText ??
-                              "Undefined";
+            string chapterNode = elem.SelectSingleNode("span[@class='grow flex items-center gap-2']/span")?.InnerText ??
+                                 "Undefined";
 
-            var chapterNumberMatch = chapterRex.Match(chapterNode);
-            var chapterNumber = chapterNumberMatch.Success ? chapterNumberMatch.Groups[1].Value : "-1";
+            MatchCollection chapterNumberMatch = chapterRex.Matches(chapterNode);
+            string chapterNumber = chapterNumberMatch.Count > 0 ? chapterNumberMatch[^1].Groups[1].Value : "-1";
+            MatchCollection chapterNameMatch = chapterNameRex.Matches(chapterNode);
+            string chapterName = chapterNameMatch.Count > 0
+                ? string.Join(" - ",
+                    chapterNameMatch.Select(m => m.Groups[1].Value.Trim())
+                        .Where(name => name.Length > 0 && !name.Equals("Chapter", StringComparison.OrdinalIgnoreCase)).ToArray()).Trim()
+                : "";
 
-            return new Chapter(manga, null, null, chapterNumber, url, id);
+            return new Chapter(manga, chapterName != "" ? chapterName : null, null, chapterNumber, url, id);
         }).Where(elem => elem.chapterNumber != -1 && elem.url != "undefined").ToList();
 
         ret.Reverse();
@@ -182,7 +188,7 @@ public class Weebcentral : MangaConnector
             return HttpStatusCode.RequestTimeout;
         }
 
-        var chapterParentManga = chapter.parentManga;
+        Manga chapterParentManga = chapter.parentManga;
         if (progressToken?.cancellationRequested ?? false)
         {
             progressToken.Cancel();
@@ -191,19 +197,19 @@ public class Weebcentral : MangaConnector
 
         Log($"Retrieving chapter-info {chapter} {chapterParentManga}");
 
-        var requestResult = downloadClient.MakeRequest(chapter.url, RequestType.Default);
+        RequestResult requestResult = downloadClient.MakeRequest(chapter.url, RequestType.Default);
         if (requestResult.htmlDocument is null)
         {
             progressToken?.Cancel();
             return HttpStatusCode.RequestTimeout;
         }
 
-        var document = requestResult.htmlDocument;
+        HtmlDocument? document = requestResult.htmlDocument;
 
-        var imageNodes =
+        HtmlNode[] imageNodes =
             document.DocumentNode.SelectNodes($"//section[@hx-get='{chapter.url}/images']/img")?.ToArray() ?? [];
-        var urls = imageNodes.Select(imgNode => imgNode.GetAttributeValue("src", "")).ToArray();
+        string[] urls = imageNodes.Select(imgNode => imgNode.GetAttributeValue("src", "")).ToArray();
 
-        return DownloadChapterImages(urls, chapter, RequestType.MangaImage, progressToken: progressToken);
+        return DownloadChapterImages(urls, chapter, RequestType.MangaImage, progressToken: progressToken, referrer: "https://weebcentral.com/");
     }
-}
+}