Downgrade python 3.11 >> 3.9

Author: Egsago-n

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img width="300" src="https://github.com/Egsagon/PHUB/blob/master/assets/logo.svg">
+  <img width="200" src="https://github.com/Egsagon/PHUB/blob/master/assets/logo.svg">
 </p>
 
 <div align="center">
@@ -9,18 +9,15 @@
 </div>
 
 <br>
-<br>
-PHUB is a hybrid API for Pornhub. It is able to communicate with Pornhub
-using both web-scraping and Pornhub's HubTraffic API. It is
-able to access most used or useful PH features, such as video searching,
-accessing account features, video downloading, and a lot more.
+PHUB is an easy-to-use API wrapper for Pornhub. It can access most used or useful
+PH features, such as video searching, account features, video downloading, and more.
 
 > [!WARNING]
 > This project is probably against Pornhub TOS. Use at your own risks.
 
-## Installation
+# Installation
 
-- Install using `pip` (python `3.11` or higher required, recommended version): 
+- Install using `pip` (python `3.9` or higher required): 
 ```shell
 pip install --upgrade phub
 ```
@@ -30,26 +27,15 @@ pip install --upgrade phub
 pip install --upgrade git+https://github.com/EchterAlsFake/PHUB.git
 ```
 
-- Or, for python 3.10 and higher.
-```shell
-pip install --upgrade git+https://github.com/EchterAlsFake/PHUB.git@py-3.10
-```
-
-- Or, for even lower python versions, there is automatic branch with several features removed (might be unstable).
-```shell
-pip install --upgrade git+https://github.com/EchterAlsFake/PHUB.git@compat
-```
-
-## Usage from command line
+# Usage from command line
 ```shell
 # Download a single video
 py -m phub https://www.pornhub.com/view_video.php?viewkey=abcdef
 # Download multiple videos from a text file
 py -m phub path/to/file.txt --quality best --downloader threaded --output video.mp4
 ```
-###### Note: It does not matter how the URLs in the files are aranged, preferably one per line.
 
-## Quickstart
+# Quickstart
 
 > [!NOTE]
 > You can find the docs on this project [here](https://phub.readthedocs.io).
@@ -83,17 +69,15 @@ client.account.liked
 client.account.recommended
 ```
 
-# Note
-<strong>This repository was initiated and maintained by [Egsagon](https://github.com/Egsagon)
-He doesn't have any time to maintain this and transferred me the ownership.
-I'll do my best to maintain this repository functional.</strong>
-
-
-## License
+# License
 
 PHUB uses GPLv3. See the `LICENSE` file.
 
-## Contributing
+This repository was initiated and maintained by [Egsagon](https://github.com/Egsagon)
+He doesn't have any time to maintain this and transferred me the ownership.
+I'll do my best to maintain this repository functional.
+
+# Contributing
 
 Feel free to contribute to this project by submitting
 feature requests, issues, bugs, or whatever.

pypi.md

@@ -1,30 +1,11 @@
 <p align="center">
-  <img width="300" src="https://raw.githubusercontent.com/Egsagon/PHUB/master/assets/logo.svg">
+  <img width="200" src="https://raw.githubusercontent.com/Egsagon/PHUB/master/assets/logo.svg">
 </p>
 
 # PHUB - An API wrapper for PornHub.
 
-PHUB is a hybrid API for Pornhub. It is able to communicate with Pornhub
-using both web-scraping and Pornhub's HubTraffic API. It is
-able to access most used or useful PH features, such as video searching,
-accessing account features, video downloading, and a lot more.
+PHUB is an easy-to-use API wrapper for Pornhub. It can access most used or useful
+PH features, such as video searching, account features, video downloading, and more.
 
-Learn more on the project [documentation](https://phub.readthedocs.io) and
-[GitHub page](https://github.com/EchterAlsFake/PHUB).
-
-## Installation
-
-```sh
-pip install --upgrade phub
-```
-
-## Quickstart
-
-```python
-import phub
-
-client = phub.Client()
-
-video = client.get(url = '...')
-video.download('my-video.mp4', quality = 'best')
-```
+- Project documentation: [phub.readthedocs.io](https://phub.readthedocs.io)
+- Project repository: [EchterAlsFake/PHUB](https://github.com/EchterAlsFake/PHUB)

pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "phub"
-version = "4.6"
+version = "4.7"
 description = "An API for Pornhub"
 authors = [
-  {name = 'Egsagon', email = "egsagon12@gmail.com"},
+  {name = 'Egsagon', email = "egsagon.git@gmail.com"},
   {name = "EchterAlsFake", email = "EchterAlsFake@proton.me"}
 ]
 license = {file = "LICENSE"}
@@ -14,7 +14,7 @@ classifiers = [
   "Programming Language :: Python"
 ]
 dependencies = ["requests", "ffmpeg-progress-yield"]
-requires-python = ">=3.11"
+requires-python = ">=3.9"
 
 [project.optional-dependencies]
 cli = ["click"]

src/phub/__init__.py

@@ -1,5 +1,5 @@
 '''
-## PHUB v4.5.3
+## PHUB v4.7
 
 See https://phub.readthedocs.io/en/latest/ for docs.
 See https://github.com/EchterAlsFake/PHUB for code.
@@ -9,7 +9,7 @@
 __author__ = 'Egsagon, EchterAlsFake'
 __copyright__ = 'Copyright 2024, PHUB'
 __license__ = 'GPLv3'
-__version__  = '4.5.3'
+__version__  = '4.7'
 
 __all__ = ['Client', 'Quality', 'core', 'utils',
            'consts', 'errors', 'objects', 'modules']

src/phub/consts.py

@@ -5,7 +5,7 @@
 import logging
 import re as engine
 from re import Pattern as p
-from typing	import Callable
+from typing	import Callable, Union
 
 from . import errors
 
@@ -63,7 +63,7 @@
 
 # Regex wrappers
 
-WrappedRegex = Callable[[str, bool | None], str | list[str]]
+WrappedRegex = Callable[[str, Union[bool, None]], Union[str, list[str]]]
 
 def _throw_re_error(pattern: str) -> None:
     '''

src/phub/core.py

@@ -6,7 +6,7 @@
 import logging
 
 import requests
-from typing import Iterable
+from typing import Iterable, Union
 from functools import cached_property
 
 from . import utils
@@ -32,7 +32,7 @@ def __init__(self,
                  password: str = None,
                  *,
                  language: literals.language = 'en,en-US',
-                 delay: int | float = 0,
+                 delay: Union[int, float] = 0,
                  proxies: dict = None,
                  login: bool = True) -> None:
         '''
@@ -143,7 +143,8 @@ def call(self,
                     raise ConnectionError('Pornhub raised error 429: too many requests')
 
                 # Attempt to resolve the challenge if needed
-                if challenge := consts.re.get_challenge(response.text, False):
+                challenge = consts.re.get_challenge(response.text, False)
+                if challenge:
                     logger.info('Challenge found, attempting to resolve')
                     parser.challenge(self, *challenge)
 
@@ -214,7 +215,7 @@ def login(self,
         self.logged = bool(success)
         return self.logged
 
-    def get(self, video: str | Video) -> Video:
+    def get(self, video: Union[str, Video]) -> Video:
         '''
         Get a Pornhub video.
         
@@ -249,7 +250,7 @@ def get(self, video: str | Video) -> Video:
 
         return Video(self, url)
 
-    def get_user(self, user: str | User) -> User:
+    def get_user(self, user: Union[str, User]) -> User:
         '''
         Get a Pornhub user.
         
@@ -270,7 +271,7 @@ def search_hubtraffic(self,
                query: str,
                *,
                category: literals.category = None,
-               tags: str | list[str] = None,
+               tags: Union[str, list[str]] = None,
                sort: literals.ht_sort = None,
                period: literals.ht_period = None) -> Query:
         '''
@@ -312,7 +313,7 @@ def search(self,
                *,
                production: literals.production = None,
                category: literals.category = None,
-               exclude_category: literals.category | Iterable[literals.category] = None,
+               exclude_category: Union[literals.category, Iterable[literals.category]] = None,
                hd: bool = None,
                sort: literals.sort = None,
                period: literals.period = None) -> Query:
@@ -361,7 +362,7 @@ def search(self,
             query_repr = query
         )
 
-    def get_playlist(self, playlist: str | int | Playlist) -> Playlist:
+    def get_playlist(self, playlist: Union[str, int, Playlist]) -> Playlist:
         '''
         Get a Pornhub playlist.
 
@@ -375,7 +376,7 @@ def get_playlist(self, playlist: str | int | Playlist) -> Playlist:
             TypeError: If the playlist argument is invalid.
         '''
 
-        if not isinstance(playlist, str | int | Playlist):
+        if not isinstance(playlist, (str, int, Playlist)):
             raise TypeError(f'Invalid type: {type(playlist)} should be str, int or Playlist.')
 
         if isinstance(playlist, Playlist):

src/phub/literals.py

@@ -2,7 +2,7 @@
 PHUB Literals.
 '''
 
-from typing import Literal, Iterable, Type
+from typing import Literal, Iterable, Type, Union
 
 # Language locales
 language = Literal['en', 'cn', 'de', 'fr', 'it', 'pt', 'pl', 'rt', 'nl', 'cz', 'jp']
@@ -199,7 +199,7 @@ def _craft_list(args: Iterable[str]) -> str:
     if args:
         return '-'.join(list(args))
 
-def _craft_boolean(b: bool | None) -> int | None:
+def _craft_boolean(b: Union[bool, None]) -> Union[int, None]:
     '''
     Craft a boolean into a url-valid int.
     
@@ -213,7 +213,7 @@ def _craft_boolean(b: bool | None) -> int | None:
     if b is not None:
         return int(bool(b))
 
-def ass(name: str, item: str | list[str], literal: Type) -> None:
+def ass(name: str, item: Union[str, list[str]], literal: Type) -> None:
     '''
     Assert one or multiple items are part of a literal.
     

src/phub/modules/display.py

@@ -1,9 +1,9 @@
 import os
 import sys
 import time
-from typing import Callable
+from typing import Callable, Union
 
-def progress(color: dict  | None = dict(c1=30, c2=33, c3=34, c4=36), desc: str = 'Downloading') -> Callable:
+def progress(color: Union[dict, None] = dict(c1=30, c2=33, c3=34, c4=36), desc: str = 'Downloading') -> Callable:
     '''
     Simple progress display, with segment, percentage and speed display.
     

src/phub/modules/download.py

@@ -4,9 +4,10 @@
 import logging
 import requests.adapters
 from pathlib import Path
-from typing import TYPE_CHECKING, Callable
-from concurrent.futures import ThreadPoolExecutor as Pool, as_completed
 from ffmpeg_progress_yield import FfmpegProgress
+from typing import TYPE_CHECKING, Callable, Union
+from concurrent.futures import ThreadPoolExecutor as Pool, as_completed
+
 from .. import consts
 
 if TYPE_CHECKING:
@@ -19,7 +20,6 @@
 CallbackType = Callable[[int, int], None]
 
 
-
 def default(video: Video,
             quality: Quality,
             callback: CallbackType,
@@ -72,7 +72,7 @@ def default(video: Video,
 
     logger.info('Downloading successful.')
 
-def FFMPEG(video: Video, quality: Quality, callback: CallbackType, path: str | Path, start: int = 0) -> None:
+def FFMPEG(video: Video, quality: Quality, callback: CallbackType, path: Union[str, Path], start: int = 0) -> None:
     '''
     Download using FFMPEG with real-time progress reporting.
     FFMPEG must be installed on your system.
@@ -115,7 +115,6 @@ def FFMPEG(video: Video, quality: Quality, callback: CallbackType, path: str | P
     except Exception as err:
         logger.error('Error while downloading: %s', err)
 
-
 def _thread(client: Client, url: str, timeout: int) -> bytes:
     '''
     Download a single segment using the client's call method.
@@ -130,7 +129,6 @@ def _thread(client: Client, url: str, timeout: int) -> bytes:
         logging.warning(f"Failed to download segment {url}: {e}")
         return (url, b'', False)
 
-
 # Modify _base_threaded to use ThreadPoolExecutor
 def _base_threaded(client: Client, segments: list[str], callback: CallbackType, max_workers: int = 20,
                    timeout: int = 10) -> dict[str, bytes]:
@@ -162,7 +160,6 @@ def _base_threaded(client: Client, segments: list[str], callback: CallbackType,
     client.session.mount('https://', old_adapter)
     return buffer
 
-
 def threaded(max_workers: int = 20,
              timeout: int = 10) -> Callable:
     '''

src/phub/objects/account.py

@@ -2,7 +2,7 @@
 
 import logging
 from functools import cached_property
-from typing import TYPE_CHECKING, Self, Literal, Iterator
+from typing import TYPE_CHECKING, Literal, Iterator, Union
 
 from .. import utils
 from .. import consts
@@ -22,7 +22,7 @@ class Account:
     If the login fails, there will be None.
     '''
 
-    def __new__(cls, client: Client) -> Self | None:
+    def __new__(cls, client: Client) -> Union[object, None]:
         '''
         Check if the object creation is needed.
         
@@ -177,7 +177,7 @@ def feed(self) -> Feed:
         return Feed(self.client)
 
     def dictify(self,
-                keys: Literal['all'] | list[str] = 'all',
+                keys: Union[Literal['all'], list[str]] = 'all',
                 recursive: bool = False) -> dict:
         '''
         Convert the object to a dictionary.