ofscraper 3.13.dev12__tar.gz → 3.13.2__tar.gz

{ofscraper-3.13.dev12 → ofscraper-3.13.2}/.github/workflows/codecov.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Set up Python 3.11.5
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.11.5
       - name: install poetry

{ofscraper-3.13.dev12 → ofscraper-3.13.2}/.github/workflows/commit_bundler.yml

@@ -193,7 +193,8 @@ jobs:
         run: ls -R artifacts
 
       - name: Create or Update Release
-        uses: ncipollo/release-action@v1
+        uses: ncipollo/release-action@v1.17.0
+
         with:
           artifacts: artifacts/*/* # Attach any downloaded artifacts (will include only those that were built successfully)
           # Combined tag for uniqueness and chronological sorting

{ofscraper-3.13.dev12 → ofscraper-3.13.2}/.github/workflows/docker-daily.yml

@@ -95,6 +95,8 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           platforms: linux/amd64,linux/arm64
+          provenance: false # Disable provenance to avoid unknown/unknown
+          sbom: false       # Disable sbom to avoid unknown/unknown
           build-args: |
             BUILD_VERSION=${{ needs.generate_version.outputs.version }}
 

{ofscraper-3.13.dev12 → ofscraper-3.13.2}/.github/workflows/package-builder-release.yml

@@ -102,7 +102,7 @@ jobs:
           "${{ needs.determine_tags_and_versions.outputs.commit_timestamp }}" \
           "${{ needs.determine_tags_and_versions.outputs.is_stable_release }}" \
           "${{ needs.determine_tags_and_versions.outputs.is_dev_release }}" \
-          "${{ inputs.docker }}"
+          "${{ inputs.docker}}"
 
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -127,7 +127,7 @@ jobs:
           github-server-url: ${{ github.server_url }}
       - run: git checkout ${{ needs.determine_tags_and_versions.outputs.long_hash }}
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.11.5
       - name: Install uv
@@ -138,14 +138,19 @@ jobs:
           uv venv
           source .venv/bin/activate
           uv pip install hatch twine
+      - name: Setup env for Hatch
+        run: |
+          source .venv/bin/activate
+          echo "HATCH_VCS_PRETEND_VERSION=${{needs.determine_tags_and_versions.outputs.package_version}}" >> $GITHUB_ENV
+          echo "SETUPTOOLS_SCM_PRETEND_VERSION=${{needs.determine_tags_and_versions.outputs.package_version}}" >> $GITHUB_ENV
+        shell: bash
+
       - name: Build Package with Hatch
         run: |
           source .venv/bin/activate
-          echo "HATCH_VCS_PRETEND_VERSION=$PACKAGE_VERSION=${{ needs.determine_tags_and_versions.outputs.package_version }}" >> $GITHUB_ENV
-          echo "SETUPTOOLS_SCM_PRETEND_VERSION=${{ needs.determine_tags_and_versions.outputs.package_version }}" >> $GITHUB_ENV
           hatch build
         shell: bash
-
+      
       - name: Publish to PyPI with Twine
         env:
           TWINE_USERNAME: __token__
@@ -173,7 +178,7 @@ jobs:
           github-server-url: ${{ github.server_url }}
       - run: git checkout ${{ needs.determine_tags_and_versions.outputs.long_hash }}
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.11.5
       - name: Install uv
@@ -186,13 +191,17 @@ jobs:
         run: |
           source .venv/bin/activate
           uv pip install hatch twine
+      - name: Setup env for Hatch
+        run: |
+          source .venv/bin/activate
+          echo "HATCH_VCS_PRETEND_VERSION=${{needs.determine_tags_and_versions.outputs.package_version}}" >> $GITHUB_ENV
+          echo "SETUPTOOLS_SCM_PRETEND_VERSION=${{needs.determine_tags_and_versions.outputs.package_version}}" >> $GITHUB_ENV
+        shell: bash
+
       - name: Build Package with Hatch
         run: |
           source .venv/bin/activate
-          echo "HATCH_VCS_PRETEND_VERSION=${{ needs.determine_tags_and_versions.outputs.package_version }}" >> $GITHUB_ENV
-          echo "SETUPTOOLS_SCM_PRETEND_VERSION=${{ needs.determine_tags_and_versions.outputs.package_version }}" >> $GITHUB_ENV
           hatch build
-        shell: bash
 
       - name: Publish to Test PyPI with Twine
         env:
@@ -217,7 +226,7 @@ jobs:
   call_docker_publish:
     name: Publish Docker Images
     needs: [determine_tags_and_versions, determine_docker_latest_logic]
-    if: ${{ inputs.docker }} # This job should ONLY run if Docker publishing is requested.
+    if: ${{inputs.docker}} # This job should ONLY run if Docker publishing is requested.
     uses: ./.github/workflows/publish-release-dockers.yml # No @ref for local callable
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -231,4 +240,4 @@ jobs:
       is_stable_release: ${{ fromJSON(needs.determine_tags_and_versions.outputs.is_stable_release) }}
       is_dev_release: ${{ fromJSON(needs.determine_tags_and_versions.outputs.is_dev_release) }}
       should_apply_stable_latest: ${{ fromJSON(needs.determine_docker_latest_logic.outputs.should_apply_stable_latest) }}
-      should_apply_dev_latest: ${{ fromJSON(needs.determine_docker_latest_logic.outputs.should_apply_dev_latest) }}
+      should_apply_dev_latest: ${{ fromJSON(needs.determine_docker_latest_logic.outputs.should_apply_dev_latest) }}

{ofscraper-3.13.dev12 → ofscraper-3.13.2}/.github/workflows/publish-release-binaries.yml

@@ -66,7 +66,7 @@ jobs:
           PACKAGE_VERSION="${{ inputs.package_version }}" # Use the input package version
           SANITIZED_TAG="${PACKAGE_VERSION//./_}"
           echo "SETUPTOOLS_SCM_PRETEND_VERSION=$PACKAGE_VERSION" >> "$GITHUB_ENV"
-          echo "HATCH_VCS_PRETEND_VERSION=$PACKAGE_VERSION" >> "$GITHUB_ENV"
+          echo "s=$PACKAGE_VERSION" >> "$GITHUB_ENV"
           echo "sanitized_tag=$SANITIZED_TAG" >> "$GITHUB_OUTPUT"
         shell: bash
 
@@ -201,10 +201,11 @@ jobs:
         run: ls -R artifacts
 
       - name: Create or Update Release
-        uses: ncipollo/release-action@v1
+        uses: ncipollo/release-action@v1.17.0
+
         with:
           artifacts: artifacts/*/*
           tag: ${{ inputs.input_version }}
           name: "Release ${{ inputs.input_version }}"
-          body: "Release build for version ${{ inputs.input_version }}, created from commit hash `${{ inputs.long_hash }}`."
-          allowUpdates: true
+          allowUpdates: true
+          omitBodyDuringUpdate: true

{ofscraper-3.13.dev12 → ofscraper-3.13.2}/.github/workflows/publish-release-dockers.yml

@@ -96,6 +96,8 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           push: true
+          provenance: false # Disable provenance to avoid unknown/unknown
+          sbom: false       # Disable sbom to avoid unknown/unknown
           outputs: |
             type=image,annotation=org.opencontainers.image.revision=${{ inputs.long_hash }}
 
@@ -167,6 +169,8 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           push: true
+          provenance: false # Disable provenance to avoid unknown/unknown
+          sbom: false       # Disable sbom to avoid unknown/unknown
           outputs: |
             type=image,annotation=org.opencontainers.image.revision=${{ inputs.long_hash }}
 
@@ -238,6 +242,8 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           push: true
+          provenance: false # Disable provenance to avoid unknown/unknown
+          sbom: false       # Disable sbom to avoid unknown/unknown
           outputs: |
             type=image,annotation=org.opencontainers.image.revision=${{ inputs.long_hash }}
 
@@ -306,6 +312,8 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           push: true
+          provenance: false # Disable provenance to avoid unknown/unknown
+          sbom: false       # Disable sbom to avoid unknown/unknown
           outputs: |
             type=image,annotation=org.opencontainers.image.revision=${{ inputs.long_hash }}
 

{ofscraper-3.13.dev12 → ofscraper-3.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ofscraper
-Version: 3.13.dev12
+Version: 3.13.2
 Summary: automatically scrape onlyfans
 Project-URL: Homepage, https://github.com/datawhores/OF-Scraper
 Author-email: datawhores <datawhores@riseup.net>
@@ -18,6 +18,7 @@ Requires-Dist: certifi~=2024.2.2
 Requires-Dist: cloup~=3.0.5
 Requires-Dist: dill~=0.3.8
 Requires-Dist: diskcache~=5.6.3
+Requires-Dist: dotenv>=0.9.9
 Requires-Dist: faust-cchardet~=2.1.19
 Requires-Dist: filelock~=3.13.1
 Requires-Dist: httpx-aiohttp~=0.1.2
@@ -37,6 +38,7 @@ Requires-Dist: psutil~=5.9.8
 Requires-Dist: pycryptodome~=3.20.0
 Requires-Dist: pynumparser~=1.4.1
 Requires-Dist: pywidevine~=1.8.0
+Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: requests~=2.31.0
 Requires-Dist: rich~=13.7.1
 Requires-Dist: schedule~=1.2.1
@@ -69,10 +71,6 @@ Description-Content-Type: text/markdown
 1. OF-Scraper can not bypass pay walls
 2. OF-Scraper requires a subscription to the model, models can not be scraped anonymously whether free or paid
 
-# Please Update to 3.11.6
-
-As the API has changed older version are no longer viable
-
 # For auth issues
 
 https://github.com/datawhores/OF-Scraper/issues/442
@@ -100,17 +98,29 @@ Docker and binary releases also available
 </a>
 
 ## Dev
+Dev releases can be found in the project release history
 
-None
+https://pypi.org/project/ofscraper/#history
 
 ## Table-of-contents
 
-- [Description](#description)
-- [Documentation](#documentation)
-- [Feature Requests](#feature-requests)
-- [Migrating from DC script](#migrating-from-dc-script)
-- [Discord](#discord)
-- [Support](#support)
+- [Notice](#notice)
+- [For auth issues](#for-auth-issues)
+- [For Issues related to Downloading/ No Models Retrieved error](#for-issues-related-to-downloading-no-models-retrieved-error)
+- [ReadMe](#readme)
+  - [Releases](#releases)
+  - [Stable](#stable)
+  - [Dev](#dev)
+  - [Table-of-contents](#table-of-contents)
+  - [Description](#description)
+  - [Documentation](#documentation)
+  - [Issues](#issues)
+    - [Private Reports](#private-reports)
+  - [Feature Requests](#feature-requests)
+  - [Migrating from DC script](#migrating-from-dc-script)
+  - [Discord](#discord)
+  - [Support](#support)
+- [](#)
 
 ## Description
 

{ofscraper-3.13.dev12 → ofscraper-3.13.2}/README.md

@@ -3,10 +3,6 @@
 1. OF-Scraper can not bypass pay walls
 2. OF-Scraper requires a subscription to the model, models can not be scraped anonymously whether free or paid
 
-# Please Update to 3.11.6
-
-As the API has changed older version are no longer viable
-
 # For auth issues
 
 https://github.com/datawhores/OF-Scraper/issues/442
@@ -34,17 +30,29 @@ Docker and binary releases also available
 </a>
 
 ## Dev
+Dev releases can be found in the project release history
 
-None
+https://pypi.org/project/ofscraper/#history
 
 ## Table-of-contents
 
-- [Description](#description)
-- [Documentation](#documentation)
-- [Feature Requests](#feature-requests)
-- [Migrating from DC script](#migrating-from-dc-script)
-- [Discord](#discord)
-- [Support](#support)
+- [Notice](#notice)
+- [For auth issues](#for-auth-issues)
+- [For Issues related to Downloading/ No Models Retrieved error](#for-issues-related-to-downloading-no-models-retrieved-error)
+- [ReadMe](#readme)
+  - [Releases](#releases)
+  - [Stable](#stable)
+  - [Dev](#dev)
+  - [Table-of-contents](#table-of-contents)
+  - [Description](#description)
+  - [Documentation](#documentation)
+  - [Issues](#issues)
+    - [Private Reports](#private-reports)
+  - [Feature Requests](#feature-requests)
+  - [Migrating from DC script](#migrating-from-dc-script)
+  - [Discord](#discord)
+  - [Support](#support)
+- [](#)
 
 ## Description
 

{ofscraper-3.13.dev12 → ofscraper-3.13.2}/docker-compose.yml

@@ -48,4 +48,4 @@ services:
 
   #   build:
   #     context: .
-  #     dockerfile: Dockerfile
+  #     dockerfile: Dockerfile

{ofscraper-3.13.dev12 → ofscraper-3.13.2}/ofscraper/classes/of/base.py

@@ -18,10 +18,10 @@ class base:
             return "None"
         if len(text) == 0:
             return text
-        length = int(settings.get_settings(mediatype=self.mediatype).text_length)
+        length = int(settings.get_settings().text_length)
         if length == 0:
             return text
-        elif settings.get_settings(mediatype=self.mediatype).text_type == "letter":
+        elif settings.get_settings().text_type == "letter":
             return f"{''.join(list(text)[:length])}"
         else:
             # split and reduce
@@ -31,15 +31,13 @@ class base:
         text = re.sub(" +$", "", text)
         return text
 
-    def file_cleanup(self, text, mediatype=None):
+    def file_cleanup(self, text):
         text = str(text)
         text = re.sub("<[^>]*>", "", text)
         text = re.sub('[\n<>:"/\|?*:;]+', "", text)
         text = re.sub("-+", "_", text)
         text = re.sub(" +", " ", text)
-        text = re.sub(
-            " ", settings.get_settings(mediatype=mediatype).space_replacer, text
-        )
+        text = re.sub(" ", settings.get_settings().space_replacer, text)
         return text
 
     def db_cleanup(self, string):