Merge pull request 'Update sonarsource/sonarqube-scan-action action to v2.1.0' (#80) from renovate/sonarsource-sonarqube-scan-action-2.x into master

Reviewed-on: #80

.envrc

@@ -1 +0,0 @@
-use asdf

.gitea/workflows/build.yml

@@ -0,0 +1,99 @@
+name: build package and container
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+  pull_request:
+    branches: [main, master]
+
+jobs:
+  build-pypackage:
+    runs-on: python311
+    env:
+      HATCH_INDEX_REPO: main
+      HATCH_INDEX_USER: __token__
+      HATCH_INDEX_AUTH: ${{ secrets.PYPI_TOKEN }}
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v3
+
+      - name: install hatch
+        run: pip install -U hatch hatchling
+
+      - name: build package
+        run: hatch build --clean
+
+      - name: publish package
+        if: gitea.event_name != 'pull_request'
+        run: hatch publish --yes --no-prompt
+
+  build-container:
+    runs-on: ubuntu-latest
+    env:
+      REGISTRY: docker.io
+      AUTHOR: olofvndrhr
+      IMAGE: manga-dlp
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v3
+
+      - name: setup qemu
+        uses: docker/setup-qemu-action@v2
+
+      - name: setup docker buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: get container metadata
+        uses: docker/metadata-action@v4
+        id: metadata
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.AUTHOR }}/${{ env.IMAGE }}
+          flavor: |
+            latest=auto
+            prefix=
+            suffix=
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+
+      - name: login to docker.io container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.CR_USERNAME }}
+          password: ${{ secrets.CR_PASSWORD }}
+
+      - name: login to private container registry
+        uses: docker/login-action@v2
+        with:
+          registry: git.44net.ch
+          username: ${{ secrets.CR_PRIV_USERNAME }}
+          password: ${{ secrets.CR_PRIV_PASSWORD }}
+
+      - name: build and push docker image @amd64+arm64
+        uses: docker/build-push-action@v4
+        with:
+          push: ${{ gitea.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64
+          context: .
+          file: docker/Dockerfile
+          provenance: false
+          tags: ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}
+
+      - name: update dockerhub repo description
+        uses: peter-evans/dockerhub-description@v3
+        if: gitea.event_name != 'pull_request'
+        with:
+          repository: ${{ env.AUTHOR }}/${{ env.IMAGE }}
+          short-description: ${{ github.event.repository.description }}
+          enable-url-completion: true
+          username: ${{ secrets.CR_USERNAME }}
+          password: ${{ secrets.CR_PASSWORD }}

.gitea/workflows/check_code.yml

@@ -0,0 +1,122 @@
+name: check code
+
+on:
+  push:
+    branches: [main, master]
+
+  pull_request:
+    branches: [main, master]
+
+jobs:
+  check-docs:
+    runs-on: python311
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v3
+
+      - name: "build docs"
+        run: |
+          python3 -m pip install mkdocs
+          cd docs || exit 1
+          mkdocs build --strict
+
+  scan-code-py311:
+    runs-on: python311
+    if: gitea.event_name != 'pull_request'
+    needs: [check-code-py38]
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: install hatch
+        run: pip install -U hatch
+
+      - name: get coverage (hatch)
+        run: hatch run default:cov
+
+      - name: run sonar-scanner
+        uses: sonarsource/sonarqube-scan-action@v2.1.0
+        env:
+          SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }}
+          SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
+
+  check-code-py38:
+    runs-on: python38
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v3
+
+      - name: install hatch
+        run: pip install -U hatch
+
+      - name: test codestyle
+        run: hatch run +py=3.8 lint:style
+
+      - name: test typing
+        run: hatch run +py=3.8 lint:typing
+
+      - name: run tests
+        if: gitea.event_name == 'pull_request'
+        run: hatch run default:test
+
+  check-code-py39:
+    runs-on: python39
+    needs: [check-code-py38]
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v3
+
+      - name: install hatch
+        run: pip install -U hatch
+
+      - name: test codestyle
+        run: hatch run +py=3.9 lint:style
+
+      - name: test typing
+        run: hatch run +py=3.9 lint:typing
+
+      - name: run tests
+        if: gitea.event_name == 'pull_request'
+        run: hatch run default:test
+
+  check-code-py310:
+    runs-on: python310
+    needs: [check-code-py39]
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v3
+
+      - name: install hatch
+        run: pip install -U hatch
+
+      - name: test codestyle
+        run: hatch run +py=3.10 lint:style
+
+      - name: test typing
+        run: hatch run +py=3.10 lint:typing
+
+      - name: run tests
+        if: gitea.event_name == 'pull_request'
+        run: hatch run default:test
+
+  check-code-py311:
+    runs-on: python311
+    needs: [check-code-py310]
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v3
+
+      - name: install hatch
+        run: pip install -U hatch
+
+      - name: test codestyle
+        run: hatch run +py=3.11 lint:style
+
+      - name: test typing
+        run: hatch run +py=3.11 lint:typing
+
+      - name: run tests
+        if: gitea.event_name == 'pull_request'
+        run: hatch run default:test

.gitea/workflows/release.yml

@@ -0,0 +1,56 @@
+name: create release
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+  pull_request:
+    branches: [main, master]
+
+jobs:
+  release-pypackage:
+    runs-on: python311
+    env:
+      HATCH_INDEX_REPO: main
+      HATCH_INDEX_USER: __token__
+      HATCH_INDEX_AUTH: ${{ secrets.PYPI_TOKEN }}
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v3
+
+      - name: setup go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '>=1.20'
+
+      - name: install hatch
+        run: pip install -U hatch hatchling
+
+      - name: build package
+        run: hatch build --clean
+
+      - name: get release notes
+        id: release-notes
+        uses: olofvndrhr/releasenote-gen@v1
+
+      - name: create gitea release
+        uses: https://gitea.com/actions/release-action@main
+        if: gitea.event_name != 'pull_request'
+        with:
+          title: ${{ gitea.ref_name }}
+          body: ${{ steps.release-notes.outputs.releasenotes }}
+          files: |-
+            dist/**
+
+      - name: create github release
+        uses: ncipollo/release-action@v1
+        if: gitea.event_name != 'pull_request'
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+          owner: olofvndrhr
+          repo: manga-dlp
+          name: ${{ gitea.ref_name }}
+          body: ${{ steps.release-notes.outputs.releasenotes }}
+          artifacts: |-
+            dist/**

.gitea/workflows/scheduled.yml

@@ -0,0 +1,18 @@
+name: run scheduled tests
+
+on:
+  schedule:
+    - cron: "0 20 * * 6"
+
+jobs:
+  check-code-py311:
+    runs-on: python311
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v3
+
+      - name: install hatch
+        run: pip install -U hatch
+
+      - name: run tests
+        run: hatch run default:test

.tool-versions

@@ -1,5 +1,4 @@
-python 3.9.13 3.10.5 3.8.13
+shellcheck 0.10.0
-shellcheck 0.9.0
+shfmt 3.8.0
-shfmt 3.6.0
+just 1.25.2
-direnv 2.32.2
+lefthook 1.4.6
-just 1.13.0

.woodpecker/publish_docker_amd64.yml

@@ -1,36 +0,0 @@
-#########################################
-# build and publish docker images amd64 #
-#########################################
-# branch: master
-# event: tag
-
-platform: linux/amd64
-
-depends_on:
-  - tests
-
-clone:
-  git:
-    image: woodpeckerci/plugin-git:v1.6.0
-    when:
-      event: tag
-
-pipeline:
-
-  # build and publish docker image for amd64 - x86
-  build-amd64:
-    image: plugins/docker
-    pull: true
-    when:
-      event: tag
-    settings:
-      repo: olofvndrhr/manga-dlp
-      platforms: linux/amd64
-      dockerfile: docker/Dockerfile.amd64
-      auto_tag: true
-      auto_tag_suffix: linux-amd64
-      build_args: BUILD_VERSION=${CI_COMMIT_TAG}
-      username:
-        from_secret: cr-dhub-username
-      password:
-        from_secret: cr-dhub-key

.woodpecker/publish_docker_arm64.yml

@@ -1,36 +0,0 @@
-#########################################
-# build and publish docker images arm64 #
-#########################################
-# branch: master
-# event: tag
-
-platform: linux/arm64
-
-depends_on:
-  - tests
-
-clone:
-  git:
-    image: woodpeckerci/plugin-git:v1.6.0
-    when:
-      event: tag
-
-pipeline:
-
-  # build and publish docker image for arm64
-  build-arm64:
-    image: plugins/docker
-    pull: true
-    when:
-      event: tag
-    settings:
-      repo: olofvndrhr/manga-dlp
-      platforms: linux/arm64
-      dockerfile: docker/Dockerfile.arm64
-      auto_tag: true
-      auto_tag_suffix: linux-arm64
-      build_args: BUILD_VERSION=${CI_COMMIT_TAG}
-      username:
-        from_secret: cr-dhub-username
-      password:
-        from_secret: cr-dhub-key

.woodpecker/publish_docker_manifest.yml

@@ -1,36 +0,0 @@
-###########################
-# publish docker manifest #
-###########################
-# branch: master
-# event: tag
-
-platform: linux/amd64
-
-depends_on:
-  - publish_docker_amd64
-  - publish_docker_arm64
-
-clone:
-  git:
-    image: woodpeckerci/plugin-git:v1.6.0
-    when:
-      event: tag
-      tag: "*[!-dev]"
-
-pipeline:
-
-  # publish docker manifest for automatic multi arch pulls
-  publish-manifest:
-    image: plugins/manifest
-    pull: true
-    when:
-      event: tag
-      tag: "*[!-dev]"
-    settings:
-      spec: docker/manifest.tmpl
-      auto_tag: true
-      ignore_missing: true
-      username:
-        from_secret: cr-dhub-username
-      password:
-        from_secret: cr-dhub-key

.woodpecker/publish_release.yml

@@ -1,77 +0,0 @@
-###################
-# publish release #
-###################
-# branch: master
-# event: tag
-
-platform: linux/amd64
-
-depends_on:
-  - tests
-
-clone:
-  git:
-    image: woodpeckerci/plugin-git:v1.6.0
-    when:
-      event: tag
-
-pipeline:
-
-  # build wheel and dist
-  build-pypi:
-    image: cr.44net.ch/ci-plugins/tests
-    pull: true
-    when:
-      event: tag
-    commands:
-      - python3 -m hatch build --clean
-
-  # create release-notes
-  create-release-notes:
-    image: cr.44net.ch/baseimages/debian-base
-    pull: true
-    when:
-      event: tag
-    commands:
-      - bash get_release_notes.sh ${CI_COMMIT_TAG%%-dev}
-
-  # publish release on github (github.com/olofvndrhr/manga-dlp)
-  publish-release-github:
-    image: woodpeckerci/plugin-github-release
-    pull: true
-    when:
-      event: tag
-    settings:
-      api_key:
-        from_secret: github-olofvndrhr-token
-      files: dist/*
-      title: ${CI_COMMIT_TAG}
-      note: RELEASENOTES.md
-
-  # publish release on gitea (git.44net.ch/olofvndrhr/manga-dlp)
-  publish-release-gitea:
-    image: woodpeckerci/plugin-gitea-release
-    pull: true
-    when:
-      event: tag
-    settings:
-      api_key:
-        from_secret: gitea-olofvndrhr-token
-      base_url: https://git.44net.ch
-      files: dist/*
-      title: ${CI_COMMIT_TAG}
-      note: RELEASENOTES.md
-
-  # release pypi
-  release-pypi:
-    image: cr.44net.ch/ci-plugins/tests
-    pull: true
-    when:
-      event: tag
-    secrets:
-      - source: pypi_username
-        target: HATCH_INDEX_USER
-      - source: pypi_token
-        target: HATCH_INDEX_AUTH
-    commands:
-      - python3 -m hatch publish --no-prompt --yes

.woodpecker/test_docker_amd64.yml

@@ -1,35 +0,0 @@
-##################################
-# test build docker images amd64 #
-##################################
-# branch: master
-# event: pull_request
-
-platform: linux/amd64
-
-depends_on:
-  - tests
-
-clone:
-  git:
-    image: woodpeckerci/plugin-git:v1.6.0
-    when:
-      branch: master
-      event: pull_request
-
-pipeline:
-
-  # build docker image for amd64 - x86
-  test-build-amd64:
-    image: plugins/docker
-    pull: true
-    when:
-      branch: master
-      event: pull_request
-    settings:
-      dry_run: true
-      repo: olofvndrhr/manga-dlp
-      platforms: linux/amd64
-      dockerfile: docker/Dockerfile.amd64
-      auto_tag: true
-      auto_tag_suffix: linux-amd64-test
-      build_args: BUILD_VERSION=test

.woodpecker/test_docker_arm64.yml

@@ -1,35 +0,0 @@
-##################################
-# test build docker images arm64 #
-##################################
-# branch: master
-# event: pull_request
-
-platform: linux/arm64
-
-depends_on:
-  - tests
-
-clone:
-  git:
-    image: woodpeckerci/plugin-git:v1.6.0
-    when:
-      branch: master
-      event: pull_request
-
-pipeline:
-
-  # build docker image for arm64
-  test-build-arm64:
-    image: plugins/docker
-    pull: true
-    when:
-      branch: master
-      event: pull_request
-    settings:
-      dry_run: true
-      repo: olofvndrhr/manga-dlp
-      platforms: linux/arm64
-      dockerfile: docker/Dockerfile.arm64
-      auto_tag: true
-      auto_tag_suffix: linux-arm64-test
-      build_args: BUILD_VERSION=test

.woodpecker/test_release.yml

@@ -1,40 +0,0 @@
-################
-# test release #
-################
-# branch: master
-# event: pull_request
-
-platform: linux/amd64
-
-depends_on:
-  - tests
-
-clone:
-  git:
-    image: woodpeckerci/plugin-git:v1.6.0
-    when:
-      branch: master
-      event: pull_request
-
-pipeline:
-
-  # build wheel and dist
-  test-build-pypi:
-    image: cr.44net.ch/ci-plugins/tests
-    pull: true
-    when:
-      branch: master
-      event: pull_request
-    commands:
-      - just test_build
-
-  # create release-notes
-  test-create-release-notes:
-    image: cr.44net.ch/baseimages/debian-base
-    pull: true
-    when:
-      branch: master
-      event: pull_request
-    commands:
-      - bash get_release_notes.sh latest
-      - cat RELEASENOTES.md

.woodpecker/test_tox_amd64.yml

@@ -1,29 +0,0 @@
-##################
-# test tox amd64 #
-##################
-# branch: master
-# event: pull_request
-
-platform: linux/amd64
-
-depends_on:
-  - tests
-
-clone:
-  git:
-    image: woodpeckerci/plugin-git:v1.6.0
-    when:
-      branch: master
-      event: pull_request
-
-pipeline:
-
-  # test code with different python versions - amd64
-  test-tox-amd64:
-    image: cr.44net.ch/ci-plugins/multipy
-    pull: true
-    when:
-      branch: master
-      event: pull_request
-    commands:
-      - just test_tox

.woodpecker/test_tox_arm64.yml

@@ -1,32 +0,0 @@
-##################
-# test tox arm64 #
-##################
-# branch: master
-# event: pull_request
-
-platform: linux/arm64
-
-depends_on:
-  - tests
-
-clone:
-  git:
-    image: woodpeckerci/plugin-git:v1.6.0
-    when:
-      branch: master
-      event: pull_request
-
-pipeline:
-
-  # test code with different python versions - arm64
-  test-tox-arm64:
-    image: cr.44net.ch/ci-plugins/multipy
-    pull: true
-    when:
-      branch: master
-      event: pull_request
-    commands:
-      - grep -v img2pdf contrib/requirements_dev.txt > contrib/requirements_dev_arm64.txt
-      - rm -f contrib/requirements_dev.txt
-      - mv contrib/requirements_dev_arm64.txt contrib/requirements_dev.txt
-      - just test_tox

.woodpecker/tests.yml

@@ -1,83 +0,0 @@
-##############################
-# code testing and analysis #
-#############################
-# branch: all
-# event: all
-
-platform: linux/amd64
-
-clone:
-  git:
-    image: woodpeckerci/plugin-git:v1.6.0
-
-pipeline:
-
-  # check code style - shell
-  test-shfmt:
-    image: cr.44net.ch/ci-plugins/tests
-    pull: true
-    commands:
-      - just test_shfmt
-
-  # check code style - python
-  test-black:
-    image: cr.44net.ch/ci-plugins/tests
-    pull: true
-    commands:
-      - just test_black
-
-  # check static typing - python
-  test-pyright:
-    image: cr.44net.ch/ci-plugins/tests
-    pull: true
-    commands:
-      - just install_deps
-      - just test_pyright
-
-  # ruff test - python
-  test-ruff:
-    image: cr.44net.ch/ci-plugins/tests
-    pull: true
-    commands:
-      - just test_ruff
-
-  # test mkdocs generation
-  test-mkdocs:
-    image: cr.44net.ch/ci-plugins/tests
-    pull: true
-    commands:
-      - python3 -m pip install mkdocs
-      - cd docs || exit 1
-      - python3 -m mkdocs build --strict
-
-  # test code with pytest - python
-  test-tox-pytest:
-    when:
-      event: [ push ]
-    image: cr.44net.ch/ci-plugins/tests
-    pull: true
-    commands:
-      - just test_pytest
-
-  # generate coverage report - python
-  test-tox-coverage:
-    when:
-      branch: master
-      event: [ pull_request ]
-    image: cr.44net.ch/ci-plugins/tests
-    pull: true
-    commands:
-      - just test_coverage
-
-  # analyse code with sonarqube and upload it
-  sonarqube-analysis:
-    when:
-      branch: master
-      event: [ pull_request ]
-    image: cr.44net.ch/ci-plugins/sonar-scanner
-    pull: true
-    settings:
-      sonar_host: https://sonarqube.44net.ch
-      sonar_token:
-        from_secret: sq-44net-token
-      usingProperties: true

CHANGELOG.md

@@ -9,6 +9,24 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 - Add support for more sites
 
+## [2.4.1] - 2024-02-01
+
+- same as 2.4.0
+
+## [2.4.0] - 2024-02-01
+
+### Fixed
+
+- Some issues with Python3.8 compatibility
+
+### Changed
+
+- Moved build system from woodpecker-ci to gitea actions
+- Updated some dependencies
+- Updated the docker image
+- Switched from formatter/linter `black` to `ruff`
+- Switches typing from `pyright` to `mypy`
+
 ## [2.3.1] - 2023-03-12
 
 ### Added

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2023 Ivan Schaller
+Copyright (c) 2021-present Ivan Schaller <ivan@schaller.sh>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MANIFEST.in

@@ -1,13 +1 @@
-include *.json
+graft src
-include *.md
-include *.properties
-include *.py
-include *.txt
-include *.yml
-include *.xml
-recursive-include contrib *.py
-recursive-include mangadlp *.py
-recursive-include mangadlp *.xml
-recursive-include tests *.py
-recursive-include tests *.xml
-recursive-include tests *.txt

README.md

@@ -2,29 +2,23 @@
 
 > Full docs: https://manga-dlp.ivn.sh
 
-CI/CD
-
-[![status-badge](https://img.shields.io/drone/build/olofvndrhr/manga-dlp?label=tests&server=https%3A%2F%2Fci.44net.ch)](https://ci.44net.ch/olofvndrhr/manga-dlp)
-[![Last Release](https://img.shields.io/github/release-date/olofvndrhr/manga-DLP?label=last%20release)](https://github.com/olofvndrhr/manga-dlp/releases)
-[![Version](https://img.shields.io/github/v/release/olofvndrhr/manga-dlp?label=git%20release)](https://github.com/olofvndrhr/manga-dlp/releases)
-[![Version PyPi](https://img.shields.io/pypi/v/manga-dlp?label=pypi%20release)](https://pypi.org/project/manga-dlp/)
-
 Code Analysis
 
-[![Quality Gate Status](https://sonarqube.44net.ch/api/project_badges/measure?project=olofvndrhr%3Amanga-dlp&metric=alert_status&token=f9558470580eea5b4899cf33f190eee16011346d)](https://sonarqube.44net.ch/dashboard?id=olofvndrhr%3Amanga-dlp)
 [![Coverage](https://sonarqube.44net.ch/api/project_badges/measure?project=olofvndrhr%3Amanga-dlp&metric=coverage&token=f9558470580eea5b4899cf33f190eee16011346d)](https://sonarqube.44net.ch/dashboard?id=olofvndrhr%3Amanga-dlp)
 [![Bugs](https://sonarqube.44net.ch/api/project_badges/measure?project=olofvndrhr%3Amanga-dlp&metric=bugs&token=f9558470580eea5b4899cf33f190eee16011346d)](https://sonarqube.44net.ch/dashboard?id=olofvndrhr%3Amanga-dlp)
-[![Security](https://img.shields.io/snyk/vulnerabilities/github/olofvndrhr/manga-dlp)](https://app.snyk.io/org/olofvndrhr-t6h/project/aae9609d-a4e4-41f8-b1ac-f2561b2ad4e3)
+[![Maintainability Rating](https://sonarqube.44net.ch/api/project_badges/measure?project=olofvndrhr%3Amanga-dlp&metric=sqale_rating&token=f9558470580eea5b4899cf33f190eee16011346d)](https://sonarqube.44net.ch/dashboard?id=olofvndrhr%3Amanga-dlp)
+[![Reliability Rating](https://sonarqube.44net.ch/api/project_badges/measure?project=olofvndrhr%3Amanga-dlp&metric=reliability_rating&token=f9558470580eea5b4899cf33f190eee16011346d)](https://sonarqube.44net.ch/dashboard?id=olofvndrhr%3Amanga-dlp)
+[![Security Rating](https://sonarqube.44net.ch/api/project_badges/measure?project=olofvndrhr%3Amanga-dlp&metric=security_rating&token=f9558470580eea5b4899cf33f190eee16011346d)](https://sonarqube.44net.ch/dashboard?id=olofvndrhr%3Amanga-dlp)
 
 Meta
 
-[![Code style](https://img.shields.io/badge/code%20style-black-black)](https://github.com/psf/black)
+[![Formatter](https://img.shields.io/badge/code%20style-ruff-black)](https://github.com/charliermarsh/ruff)
 [![Linter](https://img.shields.io/badge/linter-ruff-red)](https://github.com/charliermarsh/ruff)
-[![Types](https://img.shields.io/badge/types-pyright-blue)](https://github.com/microsoft/pyright)
+[![Types](https://img.shields.io/badge/types-mypy-blue)](https://github.com/python/mypy)
 [![Tests](https://img.shields.io/badge/tests-pytest%20%7C%20tox-yellow)](https://github.com/pytest-dev/pytest/)
 [![Coverage](https://img.shields.io/badge/coverage-coveragepy-green)](https://github.com/nedbat/coveragepy)
 [![License](https://img.shields.io/badge/license-MIT-9400d3.svg)](https://snyk.io/learn/what-is-mit-license/)
-[![Compatibility](https://img.shields.io/pypi/pyversions/manga-dlp)](https://pypi.org/project/manga-dlp/)
+[![Compatibility](https://img.shields.io/badge/python-3.11-blue)]()
 
 ---
 

contrib/api_template.py

@@ -1,6 +1,7 @@
-from typing import Dict, List, Union
+from typing import Dict, List
+
+from mangadlp.models import ChapterData, ComicInfo
 
-from mangadlp.types import ChapterData,ComicInfo
 
 # api template for manga-dlp
 
@@ -45,7 +46,7 @@ class YourAPI:
                 "volume": "1",
                 "chapter": "1",
                 "name": "test",
-                "pages" 2,
+                "pages": 2,
             },
             "2": {
                 "uuid": "abc",

docker/Dockerfile

@@ -0,0 +1,39 @@
+FROM git.44net.ch/44net/python311:11 AS builder
+
+COPY pyproject.toml README.md /build/
+COPY src /build/src
+WORKDIR /build
+RUN \
+    echo "**** building package ****" \
+    && pip3 install hatch hatchling \
+    && python3 -m hatch build --clean
+
+FROM git.44net.ch/44net/debian-s6:11
+
+LABEL maintainer="Ivan Schaller" \
+    description="A CLI manga downloader"
+
+ENV PATH="/opt/python3/bin:${PATH}"
+
+COPY --from=builder /opt/python3 /opt/python3
+COPY --from=builder /build/dist/*.whl /build/dist/
+COPY docker/rootfs /
+
+RUN \
+    echo "**** creating folders ****" \
+    && mkdir -p /app \
+    && echo "**** updating pip ****" \
+    && python3 -m pip install --upgrade pip setuptools wheel \
+    && echo "**** install python packages ****" \
+    && python3 -m pip install /build/dist/*.whl
+
+RUN \
+    echo "**** cleanup ****" \
+    && apt-get purge --auto-remove -y \
+    && apt-get clean \
+    && rm -rf \
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
+
+WORKDIR /app

docker/Dockerfile.amd64

@@ -1,50 +0,0 @@
-FROM cr.44net.ch/baseimages/debian-s6:11.6-linux-amd64
-
-# set version label
-ARG BUILD_VERSION
-ENV IMAGE_VERSION=${BUILD_VERSION}
-LABEL version="${BUILD_VERSION}"
-LABEL maintainer="Ivan Schaller"
-LABEL description="A CLI manga downloader"
-
-
-# install packages
-RUN \
-    echo "**** install base packages ****" \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends \
-        python3 \
-        python3-pip
-
-# prepare app
-RUN \
-    echo "**** creating folders ****" \
-    && mkdir -p /app \
-    && echo "**** updating pip ****" \
-    && python3 -m pip install --upgrade pip
-
-# cleanup installation
-RUN \
-    echo "**** cleanup ****" \
-    && apt-get purge --auto-remove -y \
-    && apt-get clean \
-    && rm -rf \
-        /tmp/* \
-        /var/lib/apt/lists/* \
-        /var/tmp/*
-
-
-# copy files to container
-COPY docker/rootfs /
-COPY mangadlp/ /app/mangadlp/
-COPY \
-    manga-dlp.py \
-    requirements.txt \
-    LICENSE \
-        /app/
-
-
-# install requirements
-RUN pip install -r /app/requirements.txt
-
-WORKDIR /app

docker/Dockerfile.arm64

@@ -1,52 +0,0 @@
-FROM cr.44net.ch/baseimages/debian-s6:11.6-linux-arm64
-
-# set version label
-ARG BUILD_VERSION
-ENV IMAGE_VERSION=${BUILD_VERSION}
-LABEL version="${BUILD_VERSION}"
-LABEL maintainer="Ivan Schaller"
-LABEL description="A CLI manga downloader"
-
-
-# install packages
-RUN \
-    echo "**** install base packages ****" \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends \
-        python3 \
-        python3-pip
-
-# prepare app
-RUN \
-    echo "**** creating folders ****" \
-    && mkdir -p /app \
-    && echo "**** updating pip ****" \
-    && python3 -m pip install --upgrade pip
-
-# cleanup installation
-RUN \
-    echo "**** cleanup ****" \
-    && apt-get purge --auto-remove -y \
-    && apt-get clean \
-    && rm -rf \
-        /tmp/* \
-        /var/lib/apt/lists/* \
-        /var/tmp/*
-
-
-# copy files to container
-COPY docker/rootfs /
-COPY mangadlp/ /app/mangadlp/
-COPY \
-    manga-dlp.py \
-    requirements.txt \
-    LICENSE \
-        /app/
-
-
-# install requirements (without img2pdf)
-RUN grep -v img2pdf /app/requirements.txt > /app/requirements-arm64.txt
-RUN pip install -r /app/requirements-arm64.txt
-
-
-WORKDIR /app

docker/manifest.tmpl

@@ -1,20 +0,0 @@
-image: olofvndrhr/manga-dlp:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}dev{{/if}}
-{{#if build.tags}}
-tags:
-{{#each build.tags}}
-  - {{this}}
-{{/each}}
-  - "latest"
-{{/if}}
-manifests:
-  -
-    image: olofvndrhr/manga-dlp:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{else}}dev-{{/if}}linux-amd64
-    platform:
-      architecture: amd64
-      os: linux
-  -
-    image: olofvndrhr/manga-dlp:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{else}}dev-{{/if}}linux-arm64
-    platform:
-      architecture: arm64
-      os: linux
-      variant: v8

docker/rootfs/etc/cron.d/mangadlp

@@ -8,4 +8,3 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 # "s6-setuidgid abc" is used to set the permissions
 
 0 12 * * * root s6-setuidgid abc /app/schedules/daily.sh > /proc/1/fd/1 2>&1
-

get_release_notes.sh

@@ -1,52 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2016
-
-# script to extract the release notes from the changelog
-
-# show script help
-function show_help() {
-    cat << EOF
-
-    Script to generate release-notes from a changelog (CHANGELOG.md)
-
-    Usage:
-      ./get_release_notes.sh <new_version>
-
-
-    Example:
-      ./get_release_notes.sh "2.0.5"
-      or
-      ./get_release_notes.sh "latest"
-
-EOF
-    exit 0
-}
-
-# create changelog for release
-function get_release_notes() {
-    local l_version="${1}"
-
-    printf 'Creating release-notes\n'
-    # check for version
-    if [[ -z "${l_version}" ]]; then
-        printf 'You need to specify a version with $1\n'
-        exit 1
-    fi
-    if [[ ${l_version,,} == "latest" ]]; then
-        l_version="$(grep -o -E "^##\s\[[0-9]{1,2}.[0-9]{1,2}.[0-9]{1,2}\]" CHANGELOG.md | head -n 1 | grep -o -E "[0-9]{1,2}.[0-9]{1,2}.[0-9]{1,2}")"
-    fi
-    awk -v ver="[${l_version}]" \
-        '/^## / { if (p) { exit }; if ($2 == ver) { p=1 } } p && NF' \
-        'CHANGELOG.md' > 'RELEASENOTES.md'
-    printf 'Done\n'
-}
-
-# check options
-case "${1}" in
-    '--help' | '-h' | 'help')
-        show_help
-        ;;
-    *)
-        get_release_notes "${@}"
-        ;;
-esac

justfile

@@ -3,143 +3,73 @@
 default: show_receipts
 
 set shell := ["bash", "-uc"]
-set dotenv-load := true
+set dotenv-load
-#set export
 
-# aliases
-alias s := show_receipts
-alias i := show_system_info
-alias p := prepare_workspace
-alias l := lint
-alias t := tests
-alias f := tests_full
-
-# variables
-export asdf_version := "v0.10.2"
-
-# default recipe to display help information
 show_receipts:
-    @just --list
+    just --list
 
 show_system_info:
     @echo "=================================="
     @echo "os : {{os()}}"
     @echo "arch: {{arch()}}"
-    @echo "home: ${HOME}"
+    @echo "justfile dir: {{justfile_directory()}}"
-    @echo "project dir: {{justfile_directory()}}"
+    @echo "invocation dir: {{invocation_directory()}}"
+    @echo "running dir: `pwd -P`"
     @echo "=================================="
 
-check_asdf:
+setup:
-    @if ! asdf --version; then \
+    asdf install
-        just install_asdf \
+    lefthook install
-    ;else \
-        echo "asdf already installed" \
-    ;fi
-    just install_asdf_bins
-
-install_asdf:
-    @echo "installing asdf"
-    @echo "asdf version: ${asdf_version}"
-    @git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch "${asdf_version}"
-    @echo "adding asdf to .bashrc"
-    @if ! grep -q ".asdf/asdf.sh" "${HOME}/.bashrc"; then \
-        echo -e '\n# source asdf' >> "${HOME}/.bashrc" \
-        ;echo 'source "${HOME}/.asdf/asdf.sh"' >> "${HOME}/.bashrc" \
-        ;echo -e 'source "${HOME}/.asdf/completions/asdf.bash"\n' >> "${HOME}/.bashrc" \
-    ;fi
-    @echo "to load asdf either restart your shell or do: 'source \${HOME}/.bashrc'"
-
-setup_asdf:
-    @echo "installing asdf bins"
-    # add plugins
-    @if ! asdf plugin add python; then :; fi
-    @if ! asdf plugin add shfmt; then :; fi
-    @if ! asdf plugin add shellcheck; then :; fi
-    @if ! asdf plugin add just https://github.com/franklad/asdf-just; then :; fi
-    @if ! asdf plugin add direnv; then :; fi
-    # install bins
-    @if ! asdf install; then :; fi
-    # setup direnv
-    @if ! asdf direnv setup --shell bash --version latest; then :; fi
 
 create_venv:
     @echo "creating venv"
-    @python3 -m pip install --upgrade pip setuptools wheel
+    python3 -m pip install --upgrade pip setuptools wheel
-    @python3 -m venv venv
+    python3 -m venv venv
 
 install_deps:
     @echo "installing dependencies"
-    @pip3 install -r requirements.txt
+    python3 -m hatch dep show requirements --project-only > /tmp/requirements.txt
+    pip3 install -r /tmp/requirements.txt
 
 install_deps_dev:
-    @echo "installing dependencies"
+    @echo "installing dev dependencies"
-    @pip3 install -r contrib/requirements_dev.txt
+    python3 -m hatch dep show requirements --project-only > /tmp/requirements.txt
+    python3 -m hatch dep show requirements --env-only >> /tmp/requirements.txt
+    pip3 install -r /tmp/requirements.txt
+
+create_reqs:
+    @echo "creating requirements"
+    pipreqs --force --savepath requirements.txt src/mangadlp/
 
 test_shfmt:
-    @find . -type f \( -name "**.sh" -and -not -path "./.**" -and -not -path "./venv**" \) -exec shfmt -d -i 4 -bn -ci -sr "{}" \+;
+    find . -type f \( -name "**.sh" -and -not -path "./.**" -and -not -path "./venv**" \) -exec shfmt -d -i 4 -bn -ci -sr "{}" \+;
 
-test_black:
+format_shfmt:
-    @python3 -m black --check --diff mangadlp/
+    find . -type f \( -name "**.sh" -and -not -path "./.**" -and -not -path "./venv**" \) -exec shfmt -w -i 4 -bn -ci -sr "{}" \+;
-
-test_pyright:
-    @python3 -m pyright mangadlp/
-
-test_ruff:
-    @python3 -m ruff --diff mangadlp/
-
-test_ci_conf:
-    @woodpecker-cli lint .woodpecker/
-
-test_pytest:
-    @python3 -m tox -e basic
-
-test_coverage:
-    @python3 -m tox -e coverage
-
-test_tox:
-    @python3 -m tox
-
-test_build:
-    @python3 -m hatch build --clean
-
-test_docker_build:
-    @docker build . -f docker/Dockerfile.amd64 -t manga-dlp:test
-
-# install dependecies and set everything up
-prepare_workspace:
-     just show_system_info
-     just check_asdf
-     just setup_asdf
-     just create_venv
 
 lint:
     just show_system_info
-    -just test_ci_conf
     just test_shfmt
-    just test_black
+    hatch run lint:style
-    just test_pyright
+    hatch run lint:typing
-    just test_ruff
-    @echo -e "\n\033[0;32m=== ALL DONE ===\033[0m\n"
 
-tests:
+format:
     just show_system_info
-    -just test_ci_conf
+    just format_shfmt
-    just test_shfmt
+    hatch run lint:fmt
-    just test_black
-    just test_pyright
-    just test_ruff
-    just test_pytest
-    @echo -e "\n\033[0;32m=== ALL DONE ===\033[0m\n"
 
-tests_full:
+check:
-    just show_system_info
+    just lint
-    -just test_ci_conf
+    just format
-    just test_shfmt
+
-    just test_black
+test:
-    just test_pyright
+    hatch run default:test
-    just test_ruff
+
-    just test_build
+coverage:
-    just test_tox
+    hatch run default:cov
-    just test_coverage
+
-    just test_docker_build
+build:
-    @echo -e "\n\033[0;32m=== ALL DONE ===\033[0m\n"
+    hatch build --clean
+
+run loglevel *flags:
+    hatch run mangadlp --loglevel {{loglevel}} {{flags}}

manga-dlp.py

@@ -1,6 +1,7 @@
 import sys
 
-import mangadlp.cli
+import src.mangadlp.cli
+
 
 if __name__ == "__main__":
-    sys.exit(mangadlp.cli.main())  # pylint: disable=no-value-for-parameter
+    sys.exit(src.mangadlp.cli.main())

mangadlp/__about__.py

@@ -1 +0,0 @@
-__version__ = "2.3.1"

mangadlp/__main__.py

@@ -1,6 +0,0 @@
-import sys
-
-import mangadlp.cli
-
-if __name__ == "__main__":
-    sys.exit(mangadlp.cli.main())  # pylint: disable=no-value-for-parameter

pyproject.toml

@@ -1,14 +1,14 @@
 [build-system]
-requires      = ["hatchling>=1.11.0"]
+requires = ["hatchling>=1.18", "hatch-regex-commit>=0.0.3"]
 build-backend = "hatchling.build"
 
 [project]
-dynamic = ["version"]
 name = "manga-dlp"
 description = "A cli manga downloader"
 readme = "README.md"
 license = "MIT"
 requires-python = ">=3.8"
+dynamic = ["version"]
 authors = [{ name = "Ivan Schaller", email = "ivan@schaller.sh" }]
 keywords = ["manga", "downloader", "mangadex"]
 classifiers = [
@@ -18,6 +18,7 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
     "requests>=2.28.0",
@@ -25,6 +26,8 @@ dependencies = [
     "click>=8.1.3",
     "click-option-group>=0.5.5",
     "xmltodict>=0.13.0",
+    "img2pdf>=0.4.4",
+    "pytz>=2022.1",
 ]
 
 [project.urls]
@@ -38,112 +41,206 @@ mangadlp  = "mangadlp.cli:main"
 manga-dlp = "mangadlp.cli:main"
 
 [tool.hatch.version]
-path = "mangadlp/__about__.py"
+source = "regex_commit"
-
+path = "src/mangadlp/__about__.py"
-[tool.hatch.build]
+tag_sign = false
-ignore-vcs = true
 
 [tool.hatch.build.targets.sdist]
-packages = ["mangadlp"]
+packages = ["src/mangadlp"]
 
 [tool.hatch.build.targets.wheel]
-packages = ["mangadlp"]
+packages = ["src/mangadlp"]
+
+###
+### envs
+###
 
 [tool.hatch.envs.default]
+python = "3.11"
 dependencies = [
-    "requests>=2.28.0",
+    "pytest==7.4.3",
-    "loguru>=0.6.0",
+    "coverage==7.3.2",
-    "click>=8.1.3",
-    "click-option-group>=0.5.5",
     "xmltodict>=0.13.0",
     "xmlschema>=2.2.1",
-    "img2pdf>=0.4.4",
-    "hatch>=1.6.0",
-    "hatchling>=1.11.0",
-    "pytest>=7.0.0",
-    "coverage>=6.3.1",
-    "black>=22.1.0",
-    "mypy>=0.940",
-    "tox>=3.24.5",
-    "ruff>=0.0.247",
 ]
 
-# pyright
+[tool.hatch.envs.default.scripts]
+test = "pytest {args:tests}"
+test-cov = ["coverage erase", "coverage run -m pytest {args:tests}"]
+cov-report = ["- coverage combine", "coverage report", "coverage xml"]
+cov = ["test-cov", "cov-report"]
 
-[tool.pyright]
+[[tool.hatch.envs.lint.matrix]]
-typeCheckingMode                   = "strict"
+python = ["3.8", "3.9", "3.10", "3.11"]
-pythonVersion                      = "3.9"
-reportUnnecessaryTypeIgnoreComment = true
-reportShadowedImports              = true
-reportUnusedExpression             = true
-reportMatchNotExhaustive           = true
-# venvPath         = "."
-# venv             = "venv"
 
-# ruff
+[tool.hatch.envs.lint]
+detached = true
+dependencies = [
+    "mypy==1.8.0",
+    "ruff==0.2.2",
+]
+
+[tool.hatch.envs.lint.scripts]
+typing = "mypy --non-interactive --install-types {args:src/mangadlp}"
+style = [
+    "ruff check --diff {args:.}",
+    "ruff format --check --diff {args:.}"
+]
+fmt = [
+    "ruff check --fix {args:.}",
+    "ruff format {args:.}",
+    "style"
+]
+all = ["style", "typing"]
+
+###
+### ruff
+###
 
 [tool.ruff]
-target-version = "py39"
+target-version = "py38"
-select = [
+line-length = 100
-    "E",   # pycodetyle err
+indent-width = 4
-    "W",   # pycodetyle warn
-    "D",   # pydocstyle
-    "C90", # mccabe
-    "I",   # isort
-    "PLE", # pylint err
-    "PLW", # pylint warn
-    "PLC", # pylint convention
-    "PLR", # pylint refactor
-    "F",   # pyflakes
-    "RUF", # ruff specific
-]
-line-length = 88
 fix = true
 show-fixes = true
-format = "grouped"
-ignore-init-module-imports = true
 respect-gitignore = true
-ignore = ["E501", "D103", "D100", "D102", "PLR2004"]
+src = ["src", "tests"]
 exclude = [
     ".direnv",
     ".git",
     ".mypy_cache",
     ".ruff_cache",
     ".svn",
+    ".tox",
+    ".nox",
     ".venv",
     "venv",
     "__pypackages__",
     "build",
     "dist",
+    "node_modules",
     "venv",
+    "contrib"
 ]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint]
+select = [
+    "A",
+    "ARG",
+    "B",
+    "C",
+    "DTZ",
+    "E",
+    "EM",
+    "F",
+    "FBT",
+    "I",
+    "ICN",
+    "ISC",
+    "N",
+    "PLC",
+    "PLE",
+    "PLR",
+    "PLW",
+    "Q",
+    "RUF",
+    "S",
+    "T",
+    "TID",
+    "UP",
+    "W",
+    "YTT",
+]
+ignore-init-module-imports = true
+ignore = ["E501", "D103", "D100", "D102", "PLR2004", "D403", "ISC001", "FBT001", "FBT002", "FBT003", "W505"]
+unfixable = ["F401"]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+skip-magic-trailing-comma = false
+line-ending = "lf"
+docstring-code-format = true
+
+[tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["D104"]
+"__about__.py" = ["D104", "F841"]
+"tests/**/*" = ["PLR2004", "S101", "TID252", "T201", "ARG001", "S603", "S605"]
 
-[tool.ruff.pylint]
+[tool.ruff.lint.pyupgrade]
-max-args = 10
+keep-runtime-typing = true
 
-[tool.ruff.mccabe]
+[tool.ruff.lint.isort]
-max-complexity = 10
+lines-after-imports = 2
+known-first-party = ["mangadlp"]
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.flake8-tidy-imports]
+ban-relative-imports = "all"
+
+[tool.ruff.lint.pylint]
+max-branches = 24
+max-returns = 12
+max-statements = 100
+max-args = 15
+allow-magic-value-types = ["str", "bytes", "complex", "float", "int"]
+
+[tool.ruff.lint.mccabe]
+max-complexity = 15
+
+[tool.ruff.lint.pydocstyle]
 convention = "google"
 
-[tool.ruff.pycodestyle]
+[tool.ruff.lint.pycodestyle]
-max-doc-length = 88
+max-doc-length = 100
 
-# pytest
+###
+### mypy
+###
+
+[tool.mypy]
+#plugins = ["pydantic.mypy"]
+follow_imports = "silent"
+warn_redundant_casts = true
+warn_unused_ignores = true
+disallow_any_generics = true
+check_untyped_defs = true
+no_implicit_reexport = true
+ignore_missing_imports = true
+warn_return_any = true
+pretty = true
+show_column_numbers = true
+show_error_codes = true
+show_error_context = true
+
+#[tool.pydantic-mypy]
+#init_forbid_extra = true
+#init_typed = true
+#warn_required_dynamic_aliases = true
+
+###
+### pytest
+###
 
 [tool.pytest.ini_options]
-pythonpath = ["."]
+pythonpath = ["src"]
+addopts = "--color=yes --exitfirst --verbose -ra"
+filterwarnings = [
+    'ignore:Jupyter is migrating its paths to use standard platformdirs:DeprecationWarning',
+]
 
-# coverage
+###
+### coverage
+###
 
 [tool.coverage.run]
-source       = ["mangadlp"]
+source_pkgs = ["mangadlp", "tests"]
 branch = true
-command_line = "-m pytest --exitfirst"
+parallel = true
+omit = ["src/mangadlp/__about__.py"]
+
+[tool.coverage.paths]
+mangadlp = ["src/mangadlp", "*/manga-dlp/src/mangadlp"]
+tests = ["tests", "*/manga-dlp/tests"]
 
 [tool.coverage.report]
 # Regexes for lines to exclude from consideration
@@ -161,5 +258,7 @@ exclude_lines = [
     "if __name__ == .__main__.:",
     # Don't complain about abstract methods, they aren't run:
     "@(abc.)?abstractmethod",
+    "no cov",
+    "if TYPE_CHECKING:",
 ]
-ignore_errors = true
+# ignore_errors = true

renovate.json

@@ -1,6 +1,4 @@
 {
     "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
+    "extends": ["local>44net/renovate"]
-    "local>44net-assets/docker-renovate-conf"
-  ]
 }

sonar-project.properties

@@ -5,8 +5,8 @@ sonar.links.scm=https://github.com/olofvndrhr/manga-dlp
 sonar.links.issue=https://github.com/olofvndrhr/manga-dlp/issues
 sonar.links.ci=https://ci.44net.ch/olofvndrhr/manga-dlp
 #
-sonar.sources=mangadlp
-sonar.tests=tests
-sonar.exclusions=docker/**,contrib/**
 sonar.python.version=3.9
+sonar.sources=src/mangadlp
+sonar.tests=tests
+#sonar.exclusions=
 sonar.python.coverage.reportPaths=coverage.xml

src/mangadlp/__about__.py

@@ -0,0 +1 @@
+__version__ = "2.4.1"

src/mangadlp/__main__.py

@@ -0,0 +1,7 @@
+import sys
+
+import mangadlp.cli
+
+
+if __name__ == "__main__":
+    sys.exit(mangadlp.cli.main())

src/mangadlp/api/mangadex.py

@@ -6,7 +6,7 @@ import requests
 from loguru import logger as log
 
 from mangadlp import utils
-from mangadlp.types import ChapterData, ComicInfo
+from mangadlp.models import ChapterData, ComicInfo
 
 
 class Mangadex:
@@ -22,7 +22,7 @@ class Mangadex:
     Attributes:
         api_name (str): Name of the API
         manga_uuid (str): UUID of the manga, without the url part
-        manga_data (dict): Infos of the manga. Name, title etc
+        manga_data (dict): Infos of the manga. Name, title etc.
         manga_title (str): The title of the manga, sanitized for all file systems
         manga_chapter_data (dict): All chapter data of the manga. Volumes, chapters, chapter uuids and chapter names
         chapter_list (list): A list of all available chapters for the language
@@ -57,9 +57,7 @@ class Mangadex:
     # get the uuid for the manga
     def get_manga_uuid(self) -> str:
         # isolate id from url
-        uuid_regex = re.compile(
+        uuid_regex = re.compile("[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}")
-            "[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}"
-        )
         # try to get uuid in string
         try:
             uuid = uuid_regex.search(self.url_uuid)[0]  # type: ignore
@@ -67,7 +65,7 @@ class Mangadex:
             log.error("No valid UUID found")
             raise exc
 
-        return uuid  # pyright:ignore
+        return uuid
 
     # make initial request
     def get_manga_data(self) -> Dict[str, Any]:
@@ -75,9 +73,7 @@ class Mangadex:
         counter = 1
         while counter <= 3:
             try:
-                response = requests.get(
+                response = requests.get(f"{self.api_base_url}/manga/{self.manga_uuid}", timeout=10)
-                    f"{self.api_base_url}/manga/{self.manga_uuid}", timeout=10
-                )
             except Exception as exc:
                 if counter >= 3:
                     log.error("Maybe the MangaDex API is down?")
@@ -88,9 +84,9 @@ class Mangadex:
             else:
                 break
 
-        response_body: Dict[str, Dict[str, Any]] = response.json()  # pyright:ignore
+        response_body: Dict[str, Dict[str, Any]] = response.json()
         # check if manga exists
-        if response_body["result"] != "ok":  # type:ignore
+        if response_body["result"] != "ok":
             log.error("Manga not found")
             raise KeyError
 
@@ -102,32 +98,35 @@ class Mangadex:
         attributes = self.manga_data["attributes"]
         # try to get the title in requested language
         try:
-            title = attributes["title"][self.language]
+            found_title = attributes["title"][self.language]
+            title = utils.fix_name(found_title)
         except KeyError:
             log.info("Manga title not found in requested language. Trying alt titles")
         else:
             log.debug(f"Language={self.language}, Title='{title}'")
-            return utils.fix_name(title)
+            return title  # type: ignore
 
         # search in alt titles
         try:
             log.debug(f"Alt titles: {attributes['altTitles']}")
             for item in attributes["altTitles"]:
                 if item.get(self.language):
-                    alt_title = item
+                    alt_title_item = item
                     break
-            title = alt_title[self.language]  # pyright:ignore
+            found_title = alt_title_item[self.language]
         except (KeyError, UnboundLocalError):
-            log.warning(
+            log.warning("Manga title also not found in alt titles. Falling back to english title")
-                "Manga title also not found in alt titles. Falling back to english title"
-            )
         else:
-            log.debug(f"Language={self.language}, Alt-title='{title}'")
+            title = utils.fix_name(found_title)
-            return utils.fix_name(title)
+            log.debug(f"Language={self.language}, Alt-title='{found_title}'")
+            return title  # type: ignore
+
+        found_title = attributes["title"]["en"]
+        title = utils.fix_name(found_title)
 
-        title = attributes["title"]["en"]
         log.debug(f"Language=en, Fallback-title='{title}'")
-        return utils.fix_name(title)
+
+        return title  # type: ignore
 
     # check if chapters are available in requested language
     def check_chapter_lang(self) -> int:
@@ -139,9 +138,7 @@ class Mangadex:
         try:
             total_chapters: int = r.json()["total"]
         except Exception as exc:
-            log.error(
+            log.error("Error retrieving the chapters list. Did you specify a valid language code?")
-                "Error retrieving the chapters list. Did you specify a valid language code?"
-            )
             raise exc
         if total_chapters == 0:
             log.error("No chapters available to download in specified language")
@@ -157,7 +154,7 @@ class Mangadex:
         # check for chapters in specified lang
         total_chapters = self.check_chapter_lang()
 
-        chapter_data: dict[str, ChapterData] = {}
+        chapter_data: Dict[str, ChapterData] = {}
         last_volume, last_chapter = ("", "")
         offset = 0
         while offset < total_chapters:  # if more than 500 chapters
@@ -190,9 +187,7 @@ class Mangadex:
                     continue
 
                 # export chapter data as a dict
-                chapter_index = (
+                chapter_index = chapter_num if not self.forcevol else f"{chapter_vol}:{chapter_num}"
-                    chapter_num if not self.forcevol else f"{chapter_vol}:{chapter_num}"
-                )
                 chapter_data[chapter_index] = {
                     "uuid": chapter_uuid,
                     "volume": chapter_vol,
@@ -243,8 +238,8 @@ class Mangadex:
             if api_error:
                 return []
 
-        chapter_hash = api_data["chapter"]["hash"]  # pyright:ignore
+        chapter_hash = api_data["chapter"]["hash"]
-        chapter_img_data = api_data["chapter"]["data"]  # pyright:ignore
+        chapter_img_data = api_data["chapter"]["data"]
 
         # get list of image urls
         image_urls: List[str] = []

src/mangadlp/app.py

@@ -10,7 +10,7 @@ from mangadlp.api.mangadex import Mangadex
 from mangadlp.cache import CacheDB
 from mangadlp.hooks import run_hook
 from mangadlp.metadata import write_metadata
-from mangadlp.types import ChapterData
+from mangadlp.models import ChapterData
 from mangadlp.utils import get_file_format
 
 
@@ -73,7 +73,7 @@ class MangaDLP:
         add_metadata: Flag to toggle creation & inclusion of metadata
     """
 
-    def __init__(  # pylint: disable=too-many-locals
+    def __init__(  # noqa
         self,
         url_uuid: str,
         language: str = "en",
@@ -139,9 +139,7 @@ class MangaDLP:
         # prechecks userinput/options
         # no url and no readin list given
         if not self.url_uuid:
-            log.error(
+            log.error('You need to specify a manga url/uuid with "-u" or a list with "--read"')
-                'You need to specify a manga url/uuid with "-u" or a list with "--read"'
-            )
             raise ValueError
         # checks if --list is not used
         if not self.list_chapters:
@@ -161,7 +159,7 @@ class MangaDLP:
                 raise ValueError
 
     # once called per manga
-    def get_manga(self) -> None:
+    def get_manga(self) -> None:  # noqa
         print_divider = "========================================="
         # show infos
         log.info(f"{print_divider}")
@@ -179,9 +177,7 @@ class MangaDLP:
         if self.chapters.lower() == "all":
             chapters_to_download = self.manga_chapter_list
         else:
-            chapters_to_download = utils.get_chapter_list(
+            chapters_to_download = utils.get_chapter_list(self.chapters, self.manga_chapter_list)
-                self.chapters, self.manga_chapter_list
-            )
 
         # show chapters to download
         log.info(f"Chapters selected: {', '.join(chapters_to_download)}")
@@ -192,9 +188,7 @@ class MangaDLP:
 
         # prepare cache if specified
         if self.cache_path:
-            cache = CacheDB(
+            cache = CacheDB(self.cache_path, self.manga_uuid, self.language, self.manga_title)
-                self.cache_path, self.manga_uuid, self.language, self.manga_title
-            )
             cached_chapters = cache.db_uuid_chapters
             log.info(f"Cached chapters: {cached_chapters}")
 
@@ -224,10 +218,10 @@ class MangaDLP:
         )
 
         # get chapters
-        skipped_chapters: list[Any] = []
+        skipped_chapters: List[Any] = []
-        error_chapters: list[Any] = []
+        error_chapters: List[Any] = []
         for chapter in chapters_to_download:
-            if self.cache_path and chapter in cached_chapters:  # pyright:ignore
+            if self.cache_path and chapter in cached_chapters:
                 log.info(f"Chapter '{chapter}' is in cache. Skipping download")
                 continue
 
@@ -241,7 +235,7 @@ class MangaDLP:
                 skipped_chapters.append(chapter)
                 # update cache
                 if self.cache_path:
-                    cache.add_chapter(chapter)  # pyright:ignore
+                    cache.add_chapter(chapter)
                 continue
             except Exception:
                 # skip download/packing due to an error
@@ -257,9 +251,7 @@ class MangaDLP:
                         {"Format": self.file_format[1:], **metadata},
                     )
                 except Exception as exc:
-                    log.warning(
+                    log.warning(f"Can't write metadata for chapter '{chapter}'. Reason={exc}")
-                        f"Can't write metadata for chapter '{chapter}'. Reason={exc}"
-                    )
 
             # pack downloaded folder
             if self.file_format:
@@ -274,7 +266,7 @@ class MangaDLP:
 
             # update cache
             if self.cache_path:
-                cache.add_chapter(chapter)  # pyright:ignore
+                cache.add_chapter(chapter)
 
             # start chapter post hook
             run_hook(
@@ -316,9 +308,7 @@ class MangaDLP:
 
         # get image urls for chapter
         try:
-            chapter_image_urls = self.api.get_chapter_images(
+            chapter_image_urls = self.api.get_chapter_images(chapter, self.download_wait)
-                chapter, self.download_wait
-            )
         except KeyboardInterrupt as exc:
             log.critical("Keyboard interrupt. Stopping")
             raise exc
@@ -407,9 +397,7 @@ class MangaDLP:
 
         # download images
         try:
-            downloader.download_chapter(
+            downloader.download_chapter(chapter_image_urls, chapter_path, self.download_wait)
-                chapter_image_urls, chapter_path, self.download_wait
-            )
         except KeyboardInterrupt as exc:
             log.critical("Keyboard interrupt. Stopping")
             raise exc
@@ -441,7 +429,7 @@ class MangaDLP:
             # check if image folder is existing
             if not chapter_path.exists():
                 log.error(f"Image folder: {chapter_path} does not exist")
-                raise IOError
+                raise OSError
             if self.file_format == ".pdf":
                 utils.make_pdf(chapter_path)
             else:

src/mangadlp/cache.py

@@ -1,9 +1,11 @@
 import json
 from pathlib import Path
-from typing import Dict, List, Union
+from typing import List, Union
 
 from loguru import logger as log
 
+from mangadlp.models import CacheData, CacheKeyData
+
 
 class CacheDB:
     def __init__(
@@ -26,14 +28,12 @@ class CacheDB:
         if not self.db_data.get(self.db_key):
             self.db_data[self.db_key] = {}
 
-        self.db_uuid_data = self.db_data[self.db_key]
+        self.db_uuid_data: CacheKeyData = self.db_data[self.db_key]
         if not self.db_uuid_data.get("name"):
             self.db_uuid_data.update({"name": self.name})
             self._write_db()
 
-        self.db_uuid_chapters: List[str] = (
+        self.db_uuid_chapters: List[str] = self.db_uuid_data.get("chapters") or []
-            self.db_uuid_data.get("chapters") or []  # type:ignore
-        )
 
     def _prepare_db(self) -> None:
         if self.db_path.exists():
@@ -46,11 +46,11 @@ class CacheDB:
             log.error("Can't create db-file")
             raise exc
 
-    def _read_db(self) -> Dict[str, Dict[str, Union[str, List[str]]]]:
+    def _read_db(self) -> CacheData:
         log.info(f"Reading cache-db: {self.db_path}")
         try:
             db_txt = self.db_path.read_text(encoding="utf8")
-            db_dict: Dict[str, Dict[str, Union[str, List[str]]]] = json.loads(db_txt)
+            db_dict: CacheData = json.loads(db_txt)
         except Exception as exc:
             log.error("Can't load cache-db")
             raise exc

src/mangadlp/cli.py

@@ -26,7 +26,8 @@ def readin_list(_ctx: click.Context, _param: str, value: str) -> List[str]:
         url_str = list_file.read_text(encoding="utf-8")
         url_list = url_str.splitlines()
     except Exception as exc:
-        raise click.BadParameter("Can't get links from the file") from exc
+        msg = f"Reading in file '{list_file}'"
+        raise click.BadParameter(msg) from exc
 
     # filter empty lines and remove them
     filtered_list = list(filter(len, url_list))
@@ -39,8 +40,8 @@ def readin_list(_ctx: click.Context, _param: str, value: str) -> List[str]:
 @click.help_option()
 @click.version_option(version=__version__, package_name="manga-dlp")
 # manga selection
-@optgroup.group("source", cls=RequiredMutuallyExclusiveOptionGroup)  # type: ignore
+@optgroup.group("source", cls=RequiredMutuallyExclusiveOptionGroup)
-@optgroup.option(  # type: ignore
+@optgroup.option(
     "-u",
     "--url",
     "--uuid",
@@ -50,7 +51,7 @@ def readin_list(_ctx: click.Context, _param: str, value: str) -> List[str]:
     show_default=True,
     help="URL or UUID of the manga",
 )
-@optgroup.option(  # type: ignore
+@optgroup.option(
     "--read",
     "read_mangas",
     is_eager=True,
@@ -61,8 +62,8 @@ def readin_list(_ctx: click.Context, _param: str, value: str) -> List[str]:
     help="Path of file with manga links to download. One per line",
 )
 # logging options
-@optgroup.group("verbosity", cls=MutuallyExclusiveOptionGroup)  # type: ignore
+@optgroup.group("verbosity", cls=MutuallyExclusiveOptionGroup)
-@optgroup.option(  # type: ignore
+@optgroup.option(
     "--loglevel",
     "verbosity",
     type=int,
@@ -70,7 +71,7 @@ def readin_list(_ctx: click.Context, _param: str, value: str) -> List[str]:
     show_default=True,
     help="Custom log level",
 )
-@optgroup.option(  # type: ignore
+@optgroup.option(
     "--warn",
     "verbosity",
     flag_value=30,
@@ -78,7 +79,7 @@ def readin_list(_ctx: click.Context, _param: str, value: str) -> List[str]:
     show_default=True,
     help="Only log warnings and higher",
 )
-@optgroup.option(  # type: ignore
+@optgroup.option(
     "--debug",
     "verbosity",
     flag_value=10,
@@ -231,7 +232,7 @@ def readin_list(_ctx: click.Context, _param: str, value: str) -> List[str]:
 def main(ctx: click.Context, **kwargs: Any) -> None:
     """Script to download mangas from various sites."""
     url_uuid: str = kwargs.pop("url_uuid")
-    read_mangas: list[str] = kwargs.pop("read_mangas")
+    read_mangas: List[str] = kwargs.pop("read_mangas")
     verbosity: int = kwargs.pop("verbosity")
 
     # set log level to INFO if not set

src/mangadlp/downloader.py

@@ -48,11 +48,10 @@ def download_chapter(
         # write image
         try:
             with image_path.open("wb") as file:
-                r.raw.decode_content = True  # pyright:ignore
+                r.raw.decode_content = True
-                shutil.copyfileobj(r.raw, file)  # pyright:ignore
+                shutil.copyfileobj(r.raw, file)
         except Exception as exc:
             log.error("Can't write file")
             raise exc
 
-        image_num += 1
         sleep(download_wait)

src/mangadlp/hooks.py

@@ -31,7 +31,7 @@ def run_hook(command: str, hook_type: str, **kwargs: Any) -> int:
 
     # running command
     log.info(f"Hook '{hook_type}' - running command: '{command}'")
-    proc = subprocess.run(command_list, check=False, timeout=15, encoding="utf8")
+    proc = subprocess.run(command_list, check=False, timeout=15, encoding="utf8")  # noqa
     exit_code = proc.returncode
 
     if exit_code == 0:

src/mangadlp/logger.py

@@ -4,6 +4,7 @@ from typing import Any, Dict
 
 from loguru import logger
 
+
 LOGURU_FMT = "{time:%Y-%m-%dT%H:%M:%S%z} | <level>[{level: <7}]</level> [{name: <10}] [{function: <20}]: {message}"
 
 
@@ -20,26 +21,20 @@ class InterceptHandler(logging.Handler):
 
         # Find caller from where originated the logged message
         frame, depth = logging.currentframe(), 2
-        while frame.f_code.co_filename == logging.__file__:  # pyright:ignore
+        while frame.f_code.co_filename == logging.__file__:
             frame = frame.f_back  # type: ignore
             depth += 1
 
-        logger.opt(depth=depth, exception=record.exc_info).log(
+        logger.opt(depth=depth, exception=record.exc_info).log(level, record.getMessage())
-            level, record.getMessage()
-        )
 
 
 # init logger with format and log level
 def prepare_logger(loglevel: int = 20) -> None:
-    config: Dict[str, Any] = {
+    stdout_handler: Dict[str, Any] = {
-        "handlers": [
-            {
         "sink": sys.stdout,
         "level": loglevel,
         "format": LOGURU_FMT,
     }
-        ],
-    }
 
     logging.basicConfig(handlers=[InterceptHandler()], level=loglevel)
-    logger.configure(**config)
+    logger.configure(handlers=[stdout_handler])

src/mangadlp/metadata.py

@@ -4,15 +4,14 @@ from typing import Any, Dict, List, Tuple, Union
 import xmltodict
 from loguru import logger as log
 
-from mangadlp.types import ComicInfo
+from mangadlp.models import ComicInfo
+
 
 METADATA_FILENAME = "ComicInfo.xml"
 METADATA_TEMPLATE = Path("mangadlp/metadata/ComicInfo_v2.0.xml")
 # define metadata types, defaults and valid values. an empty list means no value check
 # {key: (type, default value, valid values)}
-METADATA_TYPES: Dict[
+METADATA_TYPES: Dict[str, Tuple[Any, Union[str, int, None], List[Union[str, int, None]]]] = {
-    str, Tuple[Any, Union[str, int, None], List[Union[str, int, None]]]
-] = {
     "Title": (str, None, []),
     "Series": (str, None, []),
     "Number": (str, None, []),
@@ -66,15 +65,13 @@ METADATA_TYPES: Dict[
 def validate_metadata(metadata_in: ComicInfo) -> Dict[str, ComicInfo]:
     log.info("Validating metadata")
 
-    metadata_valid: dict[str, ComicInfo] = {"ComicInfo": {}}
+    metadata_valid: Dict[str, ComicInfo] = {"ComicInfo": {}}
     for key, value in METADATA_TYPES.items():
         metadata_type, metadata_default, metadata_validation = value
 
         # add default value if present
         if metadata_default:
-            log.debug(
+            log.debug(f"Setting default value for Key:{key} -> value={metadata_default}")
-                f"Setting default value for Key:{key} -> value={metadata_default}"
-            )
             metadata_valid["ComicInfo"][key] = metadata_default
 
         # check if metadata key is available
@@ -89,17 +86,13 @@ def validate_metadata(metadata_in: ComicInfo) -> Dict[str, ComicInfo]:
         # check if metadata type is correct
         log.debug(f"Key:{key} -> value={type(md_to_check)} -> check={metadata_type}")
         if not isinstance(md_to_check, metadata_type):
-            log.warning(
+            log.warning(f"Metadata has wrong type: {key}:{metadata_type} -> {md_to_check}")
-                f"Metadata has wrong type: {key}:{metadata_type} -> {md_to_check}"
-            )
             continue
 
         # check if metadata is valid
         log.debug(f"Key:{key} -> value={md_to_check} -> valid={metadata_validation}")
         if (len(metadata_validation) > 0) and (md_to_check not in metadata_validation):
-            log.warning(
+            log.warning(f"Metadata is invalid: {key}:{metadata_validation} -> {md_to_check}")
-                f"Metadata is invalid: {key}:{metadata_validation} -> {md_to_check}"
-            )
             continue
 
         log.debug(f"Updating metadata: '{key}' = '{md_to_check}'")
@@ -109,7 +102,7 @@ def validate_metadata(metadata_in: ComicInfo) -> Dict[str, ComicInfo]:
 
 
 def write_metadata(chapter_path: Path, metadata: ComicInfo) -> None:
-    if metadata["Format"] == "pdf":  # pyright:ignore
+    if metadata["Format"] == "pdf":
         log.warning("Can't add metadata for pdf format. Skipping")
         return
 

src/mangadlp/models.py

@@ -1,4 +1,4 @@
-from typing import Optional, TypedDict
+from typing import List, Optional, TypedDict
 
 
 class ComicInfo(TypedDict, total=False):
@@ -48,3 +48,12 @@ class ChapterData(TypedDict):
     chapter: str
     name: str
     pages: int
+
+
+class CacheKeyData(TypedDict):
+    chapters: List[str]
+    name: str
+
+
+class CacheData(TypedDict):
+    __root__: CacheKeyData

src/mangadlp/utils.py

@@ -4,6 +4,7 @@ from pathlib import Path
 from typing import Any, List
 from zipfile import ZipFile
 
+import pytz
 from loguru import logger as log
 
 
@@ -24,17 +25,17 @@ def make_archive(chapter_path: Path, file_format: str) -> None:
 
 def make_pdf(chapter_path: Path) -> None:
     try:
-        import img2pdf  # pylint: disable=import-outside-toplevel # pyright:ignore
+        import img2pdf  # pylint: disable=import-outside-toplevel
     except Exception as exc:
         log.error("Cant import img2pdf. Please install it first")
         raise exc
 
     pdf_path = Path(f"{chapter_path}.pdf")
-    images: list[str] = []
+    images: List[str] = []
     for file in chapter_path.iterdir():
         images.append(str(file))
     try:
-        pdf_path.write_bytes(img2pdf.convert(images))  # pyright:ignore
+        pdf_path.write_bytes(img2pdf.convert(images))
     except Exception as exc:
         log.error("Can't create '.pdf' archive")
         raise exc
@@ -43,13 +44,13 @@ def make_pdf(chapter_path: Path) -> None:
 # create a list of chapters
 def get_chapter_list(chapters: str, available_chapters: List[str]) -> List[str]:
     # check if there are available chapter
-    chapter_list: list[str] = []
+    chapter_list: List[str] = []
     for chapter in chapters.split(","):
         # check if chapter list is with volumes and ranges (forcevol)
         if "-" in chapter and ":" in chapter:
             # split chapters and volumes apart for list generation
-            lower_num_fv: list[str] = chapter.split("-")[0].split(":")
+            lower_num_fv: List[str] = chapter.split("-")[0].split(":")
-            upper_num_fv: list[str] = chapter.split("-")[1].split(":")
+            upper_num_fv: List[str] = chapter.split("-")[1].split(":")
             vol_fv: str = lower_num_fv[0]
             chap_beg_fv: int = int(lower_num_fv[1])
             chap_end_fv: int = int(upper_num_fv[1])
@@ -70,7 +71,7 @@ def get_chapter_list(chapters: str, available_chapters: List[str]) -> List[str]:
             # select all chapters from the volume --> 1: == 1:1,1:2,1:3...
             if vol_num and not chap_num:
                 regex: Any = re.compile(f"{vol_num}:[0-9]{{1,4}}")
-                vol_list: list[str] = [n for n in available_chapters if regex.match(n)]
+                vol_list: List[str] = [n for n in available_chapters if regex.match(n)]
                 chapter_list.extend(vol_list)
             else:
                 chapter_list.append(chapter)
@@ -160,7 +161,7 @@ def get_file_format(file_format: str) -> str:
 
 
 def progress_bar(progress: float, total: float) -> None:
-    time = datetime.now().strftime("%Y-%m-%dT%H:%M:%S")
+    time = datetime.now(tz=pytz.timezone("Europe/Zurich")).strftime("%Y-%m-%dT%H:%M:%S")
     percent = int(progress / (int(total) / 100))
     bar_length = 50
     bar_progress = int(progress / (int(total) / bar_length))
@@ -168,9 +169,9 @@ def progress_bar(progress: float, total: float) -> None:
     whitespace_texture = " " * (bar_length - bar_progress)
     if progress == total:
         full_bar = "■" * bar_length
-        print(f"\r{time}{' '*6}| [BAR    ] ❙{full_bar}❙ 100%", end="\n")
+        print(f"\r{time}{' '*6}| [BAR    ] ❙{full_bar}❙ 100%", end="\n")  # noqa
     else:
-        print(
+        print(  # noqa
             f"\r{time}{' '*6}| [BAR    ] ❙{bar_texture}{whitespace_texture}❙ {percent}%",
             end="\r",
         )

tests/test_01_app.py

@@ -5,7 +5,9 @@ from mangadlp.app import MangaDLP
 
 
 def test_check_api_mangadex():
-    url = "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    url = (
+        "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    )
     test = MangaDLP(url_uuid=url, list_chapters=True, download_wait=2)
 
     assert test.api_used == Mangadex

tests/test_03_downloader.py

@@ -1,8 +1,10 @@
 import shutil
 from pathlib import Path
+from typing import List
 
 import pytest
 import requests
+from pytest import MonkeyPatch
 
 from mangadlp import downloader
 
@@ -17,7 +19,7 @@ def test_downloader():
     ]
     chapter_path = Path("tests/test_folder1")
     chapter_path.mkdir(parents=True, exist_ok=True)
-    images = []
+    images: List[str] = []
     downloader.download_chapter(urls, str(chapter_path), 2)
     for file in chapter_path.iterdir():
         images.append(file.name)
@@ -28,7 +30,7 @@ def test_downloader():
     shutil.rmtree(chapter_path, ignore_errors=True)
 
 
-def test_downloader_fail(monkeypatch):
+def test_downloader_fail(monkeypatch: MonkeyPatch):
     images = [
         "https://uploads.mangadex.org/data/f1117c5e7aff315bc3429a8791c89d63/A1-c111d78b798f1dda1879334a3478f7ae4503578e8adf1af0fcc4e14d2a396ad4.png",
         "https://uploads.mangadex.org/data/f1117c5e7aff315bc3429a8791c89d63/A2-717ec3c83e8e05ed7b505941431a417ebfed6a005f78b89650efd3b088b951ec.png",

tests/test_04_input.py

@@ -20,7 +20,9 @@ def test_no_read_and_url():
     chapters = "1"
     file_format = "cbz"
     download_path = "tests"
-    command_args = f"-l {language} -c {chapters} --path {download_path} --format {file_format} --debug"
+    command_args = (
+        f"-l {language} -c {chapters} --path {download_path} --format {file_format} --debug"
+    )
     script_path = "manga-dlp.py"
     assert os.system(f"python3 {script_path} {command_args}") != 0
 
@@ -30,7 +32,9 @@ def test_no_chaps():
     language = "en"
     file_format = "cbz"
     download_path = "tests"
-    command_args = f"-u {url_uuid} -l {language} --path {download_path} --format {file_format} --debug"
+    command_args = (
+        f"-u {url_uuid} -l {language} --path {download_path} --format {file_format} --debug"
+    )
     script_path = "manga-dlp.py"
     assert os.system(f"python3 {script_path} {command_args}") != 0
 

tests/test_05_hooks.py

@@ -4,6 +4,7 @@ import time
 from pathlib import Path
 
 import pytest
+from pytest import MonkeyPatch
 
 
 @pytest.fixture
@@ -18,7 +19,7 @@ def wait_20s():
     time.sleep(20)
 
 
-def test_manga_pre_hook(wait_10s):
+def test_manga_pre_hook(wait_10s: MonkeyPatch):
     url_uuid = "https://mangadex.org/title/0aea9f43-d4a9-4bf7-bebc-550a512f9b95/shikimori-s-not-just-a-cutie"
     manga_path = Path("tests/Shikimori's Not Just a Cutie")
     language = "en"
@@ -50,7 +51,7 @@ def test_manga_pre_hook(wait_10s):
     hook_file.unlink()
 
 
-def test_manga_post_hook(wait_10s):
+def test_manga_post_hook(wait_10s: MonkeyPatch):
     url_uuid = "https://mangadex.org/title/0aea9f43-d4a9-4bf7-bebc-550a512f9b95/shikimori-s-not-just-a-cutie"
     manga_path = Path("tests/Shikimori's Not Just a Cutie")
     language = "en"
@@ -82,7 +83,7 @@ def test_manga_post_hook(wait_10s):
     hook_file.unlink()
 
 
-def test_chapter_pre_hook(wait_10s):
+def test_chapter_pre_hook(wait_10s: MonkeyPatch):
     url_uuid = "https://mangadex.org/title/0aea9f43-d4a9-4bf7-bebc-550a512f9b95/shikimori-s-not-just-a-cutie"
     manga_path = Path("tests/Shikimori's Not Just a Cutie")
     language = "en"
@@ -114,7 +115,7 @@ def test_chapter_pre_hook(wait_10s):
     hook_file.unlink()
 
 
-def test_chapter_post_hook(wait_10s):
+def test_chapter_post_hook(wait_10s: MonkeyPatch):
     url_uuid = "https://mangadex.org/title/0aea9f43-d4a9-4bf7-bebc-550a512f9b95/shikimori-s-not-just-a-cutie"
     manga_path = Path("tests/Shikimori's Not Just a Cutie")
     language = "en"
@@ -146,7 +147,7 @@ def test_chapter_post_hook(wait_10s):
     hook_file.unlink()
 
 
-def test_all_hooks(wait_10s):
+def test_all_hooks(wait_10s: MonkeyPatch):
     url_uuid = "https://mangadex.org/title/0aea9f43-d4a9-4bf7-bebc-550a512f9b95/shikimori-s-not-just-a-cutie"
     manga_path = Path("tests/Shikimori's Not Just a Cutie")
     language = "en"

tests/test_07_metadata.py

@@ -5,6 +5,7 @@ from pathlib import Path
 
 import pytest
 import xmlschema
+from pytest import MonkeyPatch
 
 from mangadlp.metadata import validate_metadata, write_metadata
 
@@ -110,8 +111,10 @@ def test_metadata_validation_values2():
     }
 
 
-def test_metadata_chapter_validity(wait_20s):
+def test_metadata_chapter_validity(wait_20s: MonkeyPatch):
-    url_uuid = "https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko"
+    url_uuid = (
+        "https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko"
+    )
     manga_path = Path("tests/Tomo-chan wa Onna no ko")
     metadata_path = manga_path / "Ch. 1 - Once In A Life Time Misfire/ComicInfo.xml"
     language = "en"
@@ -130,7 +133,7 @@ def test_metadata_chapter_validity(wait_20s):
         "",
         "--debug",
     ]
-    schema = xmlschema.XMLSchema("mangadlp/metadata/ComicInfo_v2.0.xsd")
+    schema = xmlschema.XMLSchema("src/mangadlp/metadata/ComicInfo_v2.0.xsd")
 
     script_path = "manga-dlp.py"
     command = ["python3", script_path, *command_args]

tests/test_11_api_mangadex.py

@@ -1,11 +1,14 @@
 import pytest
 import requests
+from pytest import MonkeyPatch
 
 from mangadlp.api.mangadex import Mangadex
 
 
 def test_uuid_link():
-    url_uuid = "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    url_uuid = (
+        "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    )
     language = "en"
     forcevol = False
     test = Mangadex(url_uuid, language, forcevol)
@@ -33,7 +36,9 @@ def test_uuid_link_false():
 
 
 def test_title():
-    url_uuid = "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    url_uuid = (
+        "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    )
     language = "en"
     forcevol = False
     test = Mangadex(url_uuid, language, forcevol)
@@ -51,7 +56,9 @@ def test_alt_title():
 
 
 def test_alt_title_fallback():
-    url_uuid = "https://mangadex.org/title/d7037b2a-874a-4360-8a7b-07f2899152fd/mairimashita-iruma-kun"
+    url_uuid = (
+        "https://mangadex.org/title/d7037b2a-874a-4360-8a7b-07f2899152fd/mairimashita-iruma-kun"
+    )
     language = "fr"
     forcevol = False
     test = Mangadex(url_uuid, language, forcevol)
@@ -60,7 +67,9 @@ def test_alt_title_fallback():
 
 
 def test_chapter_infos():
-    url_uuid = "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    url_uuid = (
+        "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    )
     language = "en"
     forcevol = False
     test = Mangadex(url_uuid, language, forcevol)
@@ -79,7 +88,9 @@ def test_chapter_infos():
 
 
 def test_non_existing_manga():
-    url_uuid = "https://mangadex.org/title/a96676e5-8ae2-425e-b549-999999999999/komi-san-wa-komyushou-desu"
+    url_uuid = (
+        "https://mangadex.org/title/a96676e5-8ae2-425e-b549-999999999999/komi-san-wa-komyushou-desu"
+    )
     language = "en"
     forcevol = False
 
@@ -88,12 +99,12 @@ def test_non_existing_manga():
     assert e.type == KeyError
 
 
-def test_api_failure(monkeypatch):
+def test_api_failure(monkeypatch: MonkeyPatch):
-    fail_url = (
+    fail_url = "https://api.mangadex.nonexistant/manga/a96676e5-8ae2-425e-b549-7f15dd34a6d8"
-        "https://api.mangadex.nonexistant/manga/a96676e5-8ae2-425e-b549-7f15dd34a6d8"
-    )
     monkeypatch.setattr(requests, "get", fail_url)
-    url_uuid = "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    url_uuid = (
+        "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    )
     language = "en"
     forcevol = False
 
@@ -103,7 +114,9 @@ def test_api_failure(monkeypatch):
 
 
 def test_chapter_lang_en():
-    url_uuid = "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    url_uuid = (
+        "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    )
     language = "en"
     forcevol = False
     test = Mangadex(url_uuid, language, forcevol)
@@ -112,7 +125,9 @@ def test_chapter_lang_en():
 
 
 def test_empty_chapter_lang():
-    url_uuid = "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    url_uuid = (
+        "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    )
     language = "ch"
     forcevol = False
 
@@ -122,7 +137,9 @@ def test_empty_chapter_lang():
 
 
 def test_not_existing_lang():
-    url_uuid = "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    url_uuid = (
+        "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    )
     language = "zz"
     forcevol = False
 
@@ -132,9 +149,7 @@ def test_not_existing_lang():
 
 
 def test_create_chapter_list():
-    url_uuid = (
+    url_uuid = "https://mangadex.org/title/6fef1f74-a0ad-4f0d-99db-d32a7cd24098/fire-punch"
-        "https://mangadex.org/title/6fef1f74-a0ad-4f0d-99db-d32a7cd24098/fire-punch"
-    )
     language = "en"
     forcevol = False
     test = Mangadex(url_uuid, language, forcevol)
@@ -160,15 +175,76 @@ def test_create_chapter_list():
         "19",
         "20",
         "21",
+        "22",
+        "23",
+        "24",
+        "25",
+        "26",
+        "27",
+        "28",
+        "29",
+        "30",
+        "31",
+        "32",
+        "33",
+        "34",
+        "34.5",
+        "35",
+        "36",
+        "37",
+        "38",
+        "39",
+        "40",
+        "41",
+        "42",
+        "43",
+        "44",
+        "45",
+        "46",
+        "47",
+        "48",
+        "49",
+        "50",
+        "51",
+        "52",
+        "53",
+        "54",
+        "55",
+        "56",
+        "57",
+        "58",
+        "59",
+        "60",
+        "61",
+        "62",
+        "63",
+        "64",
+        "65",
+        "66",
+        "67",
+        "68",
+        "69",
+        "70",
+        "71",
+        "72",
+        "73",
+        "74",
+        "75",
+        "76",
+        "77",
+        "78",
+        "79",
+        "80",
+        "81",
+        "82",
+        "83",
     ]
 
     assert test.create_chapter_list() == test_list
 
 
 def test_create_chapter_list_forcevol():
-    url_uuid = (
+    url_uuid = "https://mangadex.org/title/6fef1f74-a0ad-4f0d-99db-d32a7cd24098/fire-punch"
-        "https://mangadex.org/title/6fef1f74-a0ad-4f0d-99db-d32a7cd24098/fire-punch"
-    )
     language = "en"
     forcevol = True
     test = Mangadex(url_uuid, language, forcevol)
@@ -194,13 +270,78 @@ def test_create_chapter_list_forcevol():
         "3:19",
         "3:20",
         "3:21",
+        "3:22",
+        "3:23",
+        "3:24",
+        "3:25",
+        "3:26",
+        "3:27",
+        "3:28",
+        "4:29",
+        "4:30",
+        "4:31",
+        "4:32",
+        "4:33",
+        "4:34",
+        "4:34.5",
+        "4:35",
+        "4:36",
+        "4:37",
+        "4:38",
+        "4:39",
+        "5:40",
+        "5:41",
+        "5:42",
+        "5:43",
+        "5:44",
+        "5:45",
+        "5:46",
+        "5:47",
+        "5:48",
+        "5:49",
+        "6:50",
+        "6:51",
+        "6:52",
+        "6:53",
+        "6:54",
+        "6:55",
+        "6:56",
+        "6:57",
+        "6:58",
+        "6:59",
+        "6:60",
+        "7:61",
+        "7:62",
+        "7:63",
+        "7:64",
+        "7:65",
+        "7:66",
+        "7:67",
+        "7:68",
+        "7:69",
+        "7:70",
+        "8:71",
+        "8:72",
+        "8:73",
+        "8:74",
+        "8:75",
+        "8:76",
+        "8:77",
+        "8:78",
+        "8:79",
+        "8:80",
+        "8:81",
+        "8:82",
+        "8:83",
     ]
 
     assert test.create_chapter_list() == test_list
 
 
 def test_get_chapter_images():
-    url_uuid = "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    url_uuid = (
+        "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    )
     language = "en"
     forcevol = False
     test = Mangadex(url_uuid, language, forcevol)
@@ -226,11 +367,11 @@ def test_get_chapter_images():
     assert test.get_chapter_images(chapter_num, 2) == test_list
 
 
-def test_get_chapter_images_error(monkeypatch):
+def test_get_chapter_images_error(monkeypatch: MonkeyPatch):
-    fail_url = (
+    fail_url = "https://api.mangadex.org/at-home/server/e86ec2c4-c5e4-4710-bfaa-999999999999"
-        "https://api.mangadex.org/at-home/server/e86ec2c4-c5e4-4710-bfaa-999999999999"
+    url_uuid = (
+        "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
     )
-    url_uuid = "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
     language = "en"
     forcevol = False
     test = Mangadex(url_uuid, language, forcevol)
@@ -241,7 +382,9 @@ def test_get_chapter_images_error(monkeypatch):
 
 
 def test_chapter_metadata():
-    url_uuid = "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    url_uuid = (
+        "https://mangadex.org/title/a96676e5-8ae2-425e-b549-7f15dd34a6d8/komi-san-wa-komyushou-desu"
+    )
     language = "en"
     forcevol = False
     test = Mangadex(url_uuid, language, forcevol)

tests/test_21_full.py

@@ -3,8 +3,10 @@ import platform
 import shutil
 import time
 from pathlib import Path
+from typing import List
 
 import pytest
+from pytest import MonkeyPatch
 
 from mangadlp import app
 
@@ -21,11 +23,9 @@ def wait_20s():
     time.sleep(20)
 
 
-def test_full_api_mangadex(wait_20s):
+def test_full_api_mangadex(wait_20s: MonkeyPatch):
     manga_path = Path("tests/Tomo-chan wa Onna no ko")
-    chapter_path = Path(
+    chapter_path = Path("tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire.cbz")
-        "tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire.cbz"
-    )
     mdlp = app.MangaDLP(
         url_uuid="https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko",
         language="en",
@@ -44,16 +44,16 @@ def test_full_api_mangadex(wait_20s):
     shutil.rmtree(manga_path, ignore_errors=True)
 
 
-def test_full_with_input_cbz(wait_20s):
+def test_full_with_input_cbz(wait_20s: MonkeyPatch):
-    url_uuid = "https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko"
+    url_uuid = (
+        "https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko"
+    )
     language = "en"
     chapters = "1"
     file_format = "cbz"
     download_path = "tests"
     manga_path = Path("tests/Tomo-chan wa Onna no ko")
-    chapter_path = Path(
+    chapter_path = Path("tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire.cbz")
-        "tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire.cbz"
-    )
     command_args = f"-u {url_uuid} -l {language} -c {chapters} --path {download_path} --format {file_format} --debug --wait 2"
     script_path = "manga-dlp.py"
     os.system(f"python3 {script_path} {command_args}")
@@ -64,16 +64,16 @@ def test_full_with_input_cbz(wait_20s):
     shutil.rmtree(manga_path, ignore_errors=True)
 
 
-def test_full_with_input_cbz_info(wait_20s):
+def test_full_with_input_cbz_info(wait_20s: MonkeyPatch):
-    url_uuid = "https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko"
+    url_uuid = (
+        "https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko"
+    )
     language = "en"
     chapters = "1"
     file_format = "cbz"
     download_path = "tests"
     manga_path = Path("tests/Tomo-chan wa Onna no ko")
-    chapter_path = Path(
+    chapter_path = Path("tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire.cbz")
-        "tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire.cbz"
-    )
     command_args = f"-u {url_uuid} -l {language} -c {chapters} --path {download_path} --format {file_format} --wait 2"
     script_path = "manga-dlp.py"
     os.system(f"python3 {script_path} {command_args}")
@@ -84,19 +84,17 @@ def test_full_with_input_cbz_info(wait_20s):
     shutil.rmtree(manga_path, ignore_errors=True)
 
 
-@pytest.mark.skipif(
+@pytest.mark.skipif(platform.machine() != "x86_64", reason="pdf only supported on amd64")
-    platform.machine() != "x86_64", reason="pdf only supported on amd64"
+def test_full_with_input_pdf(wait_20s: MonkeyPatch):
-)
+    url_uuid = (
-def test_full_with_input_pdf(wait_20s):
+        "https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko"
-    url_uuid = "https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko"
+    )
     language = "en"
     chapters = "1"
     file_format = "pdf"
     download_path = "tests"
     manga_path = Path("tests/Tomo-chan wa Onna no ko")
-    chapter_path = Path(
+    chapter_path = Path("tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire.pdf")
-        "tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire.pdf"
-    )
     command_args = f"-u {url_uuid} -l {language} -c {chapters} --path {download_path} --format {file_format} --debug --wait 2"
     script_path = "manga-dlp.py"
     os.system(f"python3 {script_path} {command_args}")
@@ -107,16 +105,16 @@ def test_full_with_input_pdf(wait_20s):
     shutil.rmtree(manga_path, ignore_errors=True)
 
 
-def test_full_with_input_folder(wait_20s):
+def test_full_with_input_folder(wait_20s: MonkeyPatch):
-    url_uuid = "https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko"
+    url_uuid = (
+        "https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko"
+    )
     language = "en"
     chapters = "1"
     file_format = ""
     download_path = "tests"
     manga_path = Path("tests/Tomo-chan wa Onna no ko")
-    chapter_path = Path(
+    chapter_path = Path("tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire")
-        "tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire"
-    )
     metadata_path = Path(
         "tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire/ComicInfo.xml"
     )
@@ -131,16 +129,16 @@ def test_full_with_input_folder(wait_20s):
     shutil.rmtree(manga_path, ignore_errors=True)
 
 
-def test_full_with_input_skip_cbz(wait_10s):
+def test_full_with_input_skip_cbz(wait_10s: MonkeyPatch):
-    url_uuid = "https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko"
+    url_uuid = (
+        "https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko"
+    )
     language = "en"
     chapters = "1"
     file_format = "cbz"
     download_path = "tests"
     manga_path = Path("tests/Tomo-chan wa Onna no ko")
-    chapter_path = Path(
+    chapter_path = Path("tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire.cbz")
-        "tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire.cbz"
-    )
     command_args = f"-u {url_uuid} -l {language} -c {chapters} --path {download_path} --format {file_format} --debug --wait 2"
     script_path = "manga-dlp.py"
     manga_path.mkdir(parents=True, exist_ok=True)
@@ -153,22 +151,22 @@ def test_full_with_input_skip_cbz(wait_10s):
     shutil.rmtree(manga_path, ignore_errors=True)
 
 
-def test_full_with_input_skip_folder(wait_10s):
+def test_full_with_input_skip_folder(wait_10s: MonkeyPatch):
-    url_uuid = "https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko"
+    url_uuid = (
+        "https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko"
+    )
     language = "en"
     chapters = "1"
     file_format = ""
     download_path = "tests"
     manga_path = Path("tests/Tomo-chan wa Onna no ko")
-    chapter_path = Path(
+    chapter_path = Path("tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire")
-        "tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire"
-    )
     command_args = f"-u {url_uuid} -l {language} -c {chapters} --path {download_path} --format '{file_format}' --debug --wait 2"
     script_path = "manga-dlp.py"
     chapter_path.mkdir(parents=True, exist_ok=True)
 
     os.system(f"python3 {script_path} {command_args}")
-    found_files = []
+    found_files: List[str] = []
     for file in chapter_path.iterdir():
         found_files.append(file.name)
 
@@ -184,17 +182,15 @@ def test_full_with_input_skip_folder(wait_10s):
     shutil.rmtree(manga_path, ignore_errors=True)
 
 
-def test_full_with_read_cbz(wait_20s):
+def test_full_with_read_cbz(wait_20s: MonkeyPatch):
     url_list = Path("tests/test_list2.txt")
     language = "en"
     chapters = "1"
     file_format = "cbz"
     download_path = "tests"
     manga_path = Path("tests/Tomo-chan wa Onna no ko")
-    chapter_path = Path(
+    chapter_path = Path("tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire.cbz")
-        "tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire.cbz"
+    command_args = f"--read {url_list!s} -l {language} -c {chapters} --path {download_path} --format {file_format} --debug --wait 2"
-    )
-    command_args = f"--read {str(url_list)} -l {language} -c {chapters} --path {download_path} --format {file_format} --debug --wait 2"
     script_path = "manga-dlp.py"
     url_list.write_text(
         "https://mangadex.org/title/76ee7069-23b4-493c-bc44-34ccbf3051a8/tomo-chan-wa-onna-no-ko"
@@ -208,17 +204,15 @@ def test_full_with_read_cbz(wait_20s):
     shutil.rmtree(manga_path, ignore_errors=True)
 
 
-def test_full_with_read_skip_cbz(wait_10s):
+def test_full_with_read_skip_cbz(wait_10s: MonkeyPatch):
     url_list = Path("tests/test_list2.txt")
     language = "en"
     chapters = "1"
     file_format = "cbz"
     download_path = "tests"
     manga_path = Path("tests/Tomo-chan wa Onna no ko")
-    chapter_path = Path(
+    chapter_path = Path("tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire.cbz")
-        "tests/Tomo-chan wa Onna no ko/Ch. 1 - Once In A Life Time Misfire.cbz"
+    command_args = f"--read {url_list!s} -l {language} -c {chapters} --path {download_path} --format {file_format} --debug --wait 2"
-    )
-    command_args = f"--read {str(url_list)} -l {language} -c {chapters} --path {download_path} --format {file_format} --debug --wait 2"
     script_path = "manga-dlp.py"
     manga_path.mkdir(parents=True, exist_ok=True)
     chapter_path.touch()

tests/test_22_all_flags.py

@@ -4,6 +4,7 @@ import time
 from pathlib import Path
 
 import pytest
+from pytest import MonkeyPatch
 
 
 @pytest.fixture
@@ -18,7 +19,7 @@ def wait_20s():
     time.sleep(20)
 
 
-def test_full_with_all_flags(wait_20s):
+def test_full_with_all_flags(wait_20s: MonkeyPatch):
     manga_path = Path("tests/Tomo-chan wa Onna no ko")
     chapter_path = manga_path / "Ch. 1 - Once In A Life Time Misfire.cbz"
     cache_path = Path("tests/test_cache.json")

tox.ini

@@ -1,26 +0,0 @@
-[tox]
-envlist = py38, py39, py310
-isolated_build = True
-
-[testenv]
-deps =
-    -rcontrib/requirements_dev.txt
-
-commands =
-    pytest --verbose --exitfirst --basetemp="{envtmpdir}" {posargs}
-
-[testenv:basic]
-deps =
-    -rcontrib/requirements_dev.txt
-
-commands =
-    pytest --verbose --exitfirst --basetemp="{envtmpdir}" {posargs}
-
-[testenv:coverage]
-deps =
-    -rcontrib/requirements_dev.txt
-
-commands =
-    coverage erase
-    coverage run
-    coverage xml -i