feat: moved id parsing in class
This commit is contained in:
		| @@ -2,30 +2,10 @@ import requests | ||||
| import logging | ||||
| from urllib.parse import urlparse, urlunparse, parse_qs | ||||
| import re | ||||
| from typing import Optional | ||||
| from typing import Optional, List | ||||
|  | ||||
| from .exceptions import SponsorBlockError, SponsorBlockIdNotFoundError | ||||
|  | ||||
|  | ||||
| def _get_video_id(i: str, silent: bool = False) -> None: | ||||
|     # check with regex if i is already an id like r1Fa1iWJVEA | ||||
|     if re.match(r"^[a-zA-Z0-9_-]{11}$", i): | ||||
|         return i.strip() | ||||
|  | ||||
|     url = urlparse(url=i) | ||||
|  | ||||
|     if url.netloc == "youtu.be": | ||||
|         return url.path[1:] | ||||
|  | ||||
|     type_frag_list = url.path.split("/") | ||||
|              | ||||
|     query_stuff = parse_qs(url.query) | ||||
|     if "v" not in query_stuff: | ||||
|         if not silent: | ||||
|             raise SponsorBlockIdNotFoundError("No video id found in the url") | ||||
|         return None | ||||
|     else: | ||||
|         return query_stuff["v"][0] | ||||
| from .constants import Segment | ||||
|  | ||||
| class SponsorBlock: | ||||
|     def __init__(self, session: requests.Session = None, base_url: str = "https://sponsor.ajay.app", silent: bool = False, _requests_logging_exists: bool = False): | ||||
| @@ -37,6 +17,25 @@ class SponsorBlock: | ||||
|  | ||||
|         self.logger: logging.Logger = logging.Logger("SponsorBlock") | ||||
|  | ||||
|     def _get_video_id(self, video: str) -> Optional[str]: | ||||
|         if re.match(r"^[a-zA-Z0-9_-]{11}$", video): | ||||
|             return video.strip() | ||||
|  | ||||
|         url = urlparse(url=video) | ||||
|  | ||||
|         if url.netloc == "youtu.be": | ||||
|             return url.path[1:] | ||||
|  | ||||
|         type_frag_list = url.path.split("/") | ||||
|                  | ||||
|         query_stuff = parse_qs(url.query) | ||||
|         if "v" not in query_stuff: | ||||
|             if not self.silent: | ||||
|                 raise SponsorBlockIdNotFoundError("No video id found in the url") | ||||
|             return None | ||||
|         else: | ||||
|             return query_stuff["v"][0] | ||||
|  | ||||
|     def _request(self, method: str, endpoint: str) -> Optional[requests.Response]: | ||||
|         error_message = "" | ||||
|         url = self.base_url + endpoint | ||||
| @@ -55,4 +54,8 @@ class SponsorBlock: | ||||
|             if not self.silent: | ||||
|                 raise exceptions.SponsorBlockConnectionError(error_message) | ||||
|  | ||||
|         return r | ||||
|         return r | ||||
|  | ||||
|     def get_segments(video: str) -> List[Segment]: | ||||
|         video_id = _get_video_id | ||||
|         r: List[Segment] = [] | ||||
|   | ||||
		Reference in New Issue
	
	Block a user