From 08f26dd21d69c705d30d97d76365bd0d9b3eefeb Mon Sep 17 00:00:00 2001 From: TheyCallMeTravis <130942749+TheyCallMeTravis@users.noreply.github.com> Date: Fri, 14 Mar 2025 21:18:51 -0500 Subject: [PATCH 01/11] add referer to DownloadChapterImages --- Tranga/MangaConnectors/WeebCentral.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tranga/MangaConnectors/WeebCentral.cs b/Tranga/MangaConnectors/WeebCentral.cs index 1ed1438..6dd82fd 100644 --- a/Tranga/MangaConnectors/WeebCentral.cs +++ b/Tranga/MangaConnectors/WeebCentral.cs @@ -210,6 +210,6 @@ public class Weebcentral : MangaConnector document.DocumentNode.SelectNodes($"//section[@hx-get='{chapter.url}/images']/img")?.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/"); } -} \ No newline at end of file +} From 3324ed6e4aa4b2ff618f0e42068d14b30d4c052a Mon Sep 17 00:00:00 2001 From: TheyCallMeTravis <130942749+TheyCallMeTravis@users.noreply.github.com> Date: Mon, 17 Mar 2025 14:29:09 -0500 Subject: [PATCH 02/11] Weebcentral - Fix Search Results Parse --- Tranga/MangaConnectors/WeebCentral.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tranga/MangaConnectors/WeebCentral.cs b/Tranga/MangaConnectors/WeebCentral.cs index 6dd82fd..861b8aa 100644 --- a/Tranga/MangaConnectors/WeebCentral.cs +++ b/Tranga/MangaConnectors/WeebCentral.cs @@ -44,7 +44,7 @@ public class Weebcentral : MangaConnector if (document.DocumentNode.SelectNodes("//article") == null) return []; - List urls = document.DocumentNode.SelectNodes("/html/body/article/a[@class='link link-hover']") + List urls = document.DocumentNode.SelectNodes("/html/body/article/a[@class='link link-hover tooltip tooltip-bottom']") .Select(elem => elem.GetAttributeValue("href", "")).ToList(); HashSet ret = new(); From 6ed8ff1d52c892611df941e41df6790bf2129206 Mon Sep 17 00:00:00 2001 From: TheyCallMeTravis <130942749+TheyCallMeTravis@users.noreply.github.com> Date: Tue, 18 Mar 2025 10:12:42 -0500 Subject: [PATCH 03/11] webtoons - fix search regex parsing --- Tranga/MangaConnectors/Webtoons.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tranga/MangaConnectors/Webtoons.cs b/Tranga/MangaConnectors/Webtoons.cs index 9e78290..aaa20b1 100644 --- a/Tranga/MangaConnectors/Webtoons.cs +++ b/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/(?[^/]+)/(?[^/]+)/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; } -} \ No newline at end of file +} From 91fb815153717d2f5c705ec934e4dadea70348d4 Mon Sep 17 00:00:00 2001 From: Glax <johanna@bernloehr.eu> Date: Sat, 29 Mar 2025 21:17:22 +0100 Subject: [PATCH 04/11] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 3f81f44..7816a1a 100644 --- a/README.md +++ b/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"> From 7506a0201e597fbfea99f6dd6aba33478d24d2e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Apr 2025 05:51:29 +0000 Subject: [PATCH 05/11] Bump docker/build-push-action from 6.15.0 to 6.16.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.15.0 to 6.16.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.15.0...v6.16.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-version: 6.16.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- .github/workflows/docker-image-cuttingedge.yml | 2 +- .github/workflows/docker-image-master.yml | 2 +- .github/workflows/docker-image-serverv2.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image-cuttingedge.yml b/.github/workflows/docker-image-cuttingedge.yml index 8a3d7e6..f498777 100644 --- a/.github/workflows/docker-image-cuttingedge.yml +++ b/.github/workflows/docker-image-cuttingedge.yml @@ -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.16.0 with: context: ./ file: ./Dockerfile diff --git a/.github/workflows/docker-image-master.yml b/.github/workflows/docker-image-master.yml index fb13c57..f803c10 100644 --- a/.github/workflows/docker-image-master.yml +++ b/.github/workflows/docker-image-master.yml @@ -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.16.0 with: context: ./ file: ./Dockerfile diff --git a/.github/workflows/docker-image-serverv2.yml b/.github/workflows/docker-image-serverv2.yml index 1459b9b..a3bbd2d 100644 --- a/.github/workflows/docker-image-serverv2.yml +++ b/.github/workflows/docker-image-serverv2.yml @@ -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.16.0 with: context: ./ file: ./Dockerfile From 4ef3e877ce14201c4116a528e178bda43d4283dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 May 2025 05:31:47 +0000 Subject: [PATCH 06/11] Bump docker/build-push-action from 6.16.0 to 6.17.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.16.0 to 6.17.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.16.0...v6.17.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-version: 6.17.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- .github/workflows/docker-image-cuttingedge.yml | 2 +- .github/workflows/docker-image-master.yml | 2 +- .github/workflows/docker-image-serverv2.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image-cuttingedge.yml b/.github/workflows/docker-image-cuttingedge.yml index f498777..832e01b 100644 --- a/.github/workflows/docker-image-cuttingedge.yml +++ b/.github/workflows/docker-image-cuttingedge.yml @@ -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.16.0 + uses: docker/build-push-action@v6.17.0 with: context: ./ file: ./Dockerfile diff --git a/.github/workflows/docker-image-master.yml b/.github/workflows/docker-image-master.yml index f803c10..5512f35 100644 --- a/.github/workflows/docker-image-master.yml +++ b/.github/workflows/docker-image-master.yml @@ -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.16.0 + uses: docker/build-push-action@v6.17.0 with: context: ./ file: ./Dockerfile diff --git a/.github/workflows/docker-image-serverv2.yml b/.github/workflows/docker-image-serverv2.yml index a3bbd2d..c9c0885 100644 --- a/.github/workflows/docker-image-serverv2.yml +++ b/.github/workflows/docker-image-serverv2.yml @@ -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.16.0 + uses: docker/build-push-action@v6.17.0 with: context: ./ file: ./Dockerfile From d4227f2b8fdfc3701cb418f6cf500a96f16c4b88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 May 2025 05:59:24 +0000 Subject: [PATCH 07/11] Bump docker/build-push-action from 6.17.0 to 6.18.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.17.0 to 6.18.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.17.0...v6.18.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-version: 6.18.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- .github/workflows/docker-image-cuttingedge.yml | 2 +- .github/workflows/docker-image-master.yml | 2 +- .github/workflows/docker-image-serverv2.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image-cuttingedge.yml b/.github/workflows/docker-image-cuttingedge.yml index 832e01b..fcfb5d0 100644 --- a/.github/workflows/docker-image-cuttingedge.yml +++ b/.github/workflows/docker-image-cuttingedge.yml @@ -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.17.0 + uses: docker/build-push-action@v6.18.0 with: context: ./ file: ./Dockerfile diff --git a/.github/workflows/docker-image-master.yml b/.github/workflows/docker-image-master.yml index 5512f35..184d2f0 100644 --- a/.github/workflows/docker-image-master.yml +++ b/.github/workflows/docker-image-master.yml @@ -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.17.0 + uses: docker/build-push-action@v6.18.0 with: context: ./ file: ./Dockerfile diff --git a/.github/workflows/docker-image-serverv2.yml b/.github/workflows/docker-image-serverv2.yml index c9c0885..328270e 100644 --- a/.github/workflows/docker-image-serverv2.yml +++ b/.github/workflows/docker-image-serverv2.yml @@ -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.17.0 + uses: docker/build-push-action@v6.18.0 with: context: ./ file: ./Dockerfile From 538825f0ef2515e8de299ea9556a9bddd7043410 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Jun 2025 06:03:00 +0000 Subject: [PATCH 08/11] Bump docker/setup-buildx-action from 3.10.0 to 3.11.0 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.10.0 to 3.11.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3.10.0...v3.11.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-version: 3.11.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- .github/workflows/docker-image-cuttingedge.yml | 2 +- .github/workflows/docker-image-master.yml | 2 +- .github/workflows/docker-image-serverv2.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image-cuttingedge.yml b/.github/workflows/docker-image-cuttingedge.yml index fcfb5d0..5bd7e9b 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.10.0 + uses: docker/setup-buildx-action@v3.11.0 # https://github.com/docker/login-action#docker-hub - name: Login to Docker Hub diff --git a/.github/workflows/docker-image-master.yml b/.github/workflows/docker-image-master.yml index 184d2f0..d984359 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.10.0 + uses: docker/setup-buildx-action@v3.11.0 # https://github.com/docker/login-action#docker-hub - name: Login to Docker Hub diff --git a/.github/workflows/docker-image-serverv2.yml b/.github/workflows/docker-image-serverv2.yml index 328270e..9081b52 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.10.0 + uses: docker/setup-buildx-action@v3.11.0 # https://github.com/docker/login-action#docker-hub - name: Login to Docker Hub From cc655b0acdcba313812737c111add1f455186ba5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Jun 2025 05:58:29 +0000 Subject: [PATCH 09/11] Bump docker/setup-buildx-action from 3.11.0 to 3.11.1 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.11.0 to 3.11.1. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3.11.0...v3.11.1) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-version: 3.11.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- .github/workflows/docker-image-cuttingedge.yml | 2 +- .github/workflows/docker-image-master.yml | 2 +- .github/workflows/docker-image-serverv2.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image-cuttingedge.yml b/.github/workflows/docker-image-cuttingedge.yml index 5bd7e9b..121c6ad 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.11.0 + uses: docker/setup-buildx-action@v3.11.1 # https://github.com/docker/login-action#docker-hub - name: Login to Docker Hub diff --git a/.github/workflows/docker-image-master.yml b/.github/workflows/docker-image-master.yml index d984359..fac5203 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.11.0 + uses: docker/setup-buildx-action@v3.11.1 # https://github.com/docker/login-action#docker-hub - name: Login to Docker Hub diff --git a/.github/workflows/docker-image-serverv2.yml b/.github/workflows/docker-image-serverv2.yml index 9081b52..55b7495 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.11.0 + uses: docker/setup-buildx-action@v3.11.1 # https://github.com/docker/login-action#docker-hub - name: Login to Docker Hub From f54d12b729183d645c50f90b85dead0c4969ffce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:53:02 +0000 Subject: [PATCH 10/11] Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> --- .github/workflows/docker-image-cuttingedge.yml | 2 +- .github/workflows/docker-image-master.yml | 2 +- .github/workflows/docker-image-serverv2.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image-cuttingedge.yml b/.github/workflows/docker-image-cuttingedge.yml index 121c6ad..e5ffa22 100644 --- a/.github/workflows/docker-image-cuttingedge.yml +++ b/.github/workflows/docker-image-cuttingedge.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 # https://github.com/docker/setup-qemu-action#usage - name: Set up QEMU diff --git a/.github/workflows/docker-image-master.yml b/.github/workflows/docker-image-master.yml index fac5203..9e7a378 100644 --- a/.github/workflows/docker-image-master.yml +++ b/.github/workflows/docker-image-master.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 # https://github.com/docker/setup-qemu-action#usage - name: Set up QEMU diff --git a/.github/workflows/docker-image-serverv2.yml b/.github/workflows/docker-image-serverv2.yml index 55b7495..c3dd0fe 100644 --- a/.github/workflows/docker-image-serverv2.yml +++ b/.github/workflows/docker-image-serverv2.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 # https://github.com/docker/setup-qemu-action#usage - name: Set up QEMU From 88ecf8d20b3bb75d6eef2d2b4da589f009e43594 Mon Sep 17 00:00:00 2001 From: glax <johanna@bernloehr.eu> Date: Mon, 1 Sep 2025 19:47:48 +0200 Subject: [PATCH 11/11] Create testing branch --- .github/workflows/docker-image-testing.yml | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/docker-image-testing.yml diff --git a/.github/workflows/docker-image-testing.yml b/.github/workflows/docker-image-testing.yml new file mode 100644 index 0000000..8936b91 --- /dev/null +++ b/.github/workflows/docker-image-testing.yml @@ -0,0 +1,45 @@ +name: Docker Image CI + +on: + push: + branches: [ "testing" ] + workflow_dispatch: + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v5 + + # https://github.com/docker/setup-qemu-action#usage + - name: Set up QEMU + 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.11.1 + + # 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.18.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:testing \ No newline at end of file