kabigon 0.4.1__py3-none-any.whl → 0.4.2__py3-none-any.whl

kabigon/youtube.py

@@ -1,76 +1,11 @@
-from urllib.parse import parse_qs
-from urllib.parse import urlparse
-
 import aioytt
+import aioytt.video_id
 import timeout_decorator
 from youtube_transcript_api import YouTubeTranscriptApi
 
 from .loader import Loader
-from .loader import LoaderError
 
 DEFAULT_LANGUAGES = ["zh-TW", "zh-Hant", "zh", "zh-Hans", "ja", "en", "ko"]
-ALLOWED_SCHEMES = {
-    "http",
-    "https",
-}
-ALLOWED_NETLOCS = {
-    "youtu.be",
-    "m.youtube.com",
-    "youtube.com",
-    "www.youtube.com",
-    "www.youtube-nocookie.com",
-    "vid.plus",
-}
-
-
-class UnsupportedURLSchemeError(LoaderError):
-    def __init__(self, scheme: str) -> None:
-        super().__init__(f"unsupported URL scheme: {scheme}")
-
-
-class UnsupportedURLNetlocError(LoaderError):
-    def __init__(self, netloc: str) -> None:
-        super().__init__(f"unsupported URL netloc: {netloc}")
-
-
-class VideoIDError(LoaderError):
-    def __init__(self, video_id: str) -> None:
-        super().__init__(f"invalid video ID: {video_id}")
-
-
-class NoVideoIDFoundError(LoaderError):
-    def __init__(self, url: str) -> None:
-        super().__init__(f"no video found in URL: {url}")
-
-
-def parse_video_id(url: str) -> str:
-    """Parse a YouTube URL and return the video ID if valid, otherwise None."""
-    parsed_url = urlparse(url)
-
-    if parsed_url.scheme not in ALLOWED_SCHEMES:
-        raise UnsupportedURLSchemeError(parsed_url.scheme)
-
-    if parsed_url.netloc not in ALLOWED_NETLOCS:
-        raise UnsupportedURLNetlocError(parsed_url.netloc)
-
-    path = parsed_url.path
-
-    if path.endswith("/watch"):
-        query = parsed_url.query
-        parsed_query = parse_qs(query)
-        if "v" in parsed_query:
-            ids = parsed_query["v"]
-            video_id = ids if isinstance(ids, str) else ids[0]
-        else:
-            raise NoVideoIDFoundError(url)
-    else:
-        path = parsed_url.path.lstrip("/")
-        video_id = path.split("/")[-1]
-
-    if len(video_id) != 11:  # Video IDs are 11 characters long
-        raise VideoIDError(video_id)
-
-    return video_id
 
 
 class YoutubeLoader(Loader):
@@ -79,7 +14,7 @@ class YoutubeLoader(Loader):
 
     @timeout_decorator.timeout(20)
     def load(self, url: str) -> str:
-        video_id = parse_video_id(url)
+        video_id = aioytt.video_id.parse_video_id(url)
 
         transcript_pieces: list[dict[str, str | float]] = YouTubeTranscriptApi().get_transcript(
             video_id, self.languages
@@ -98,5 +33,5 @@ class YoutubeLoader(Loader):
         for piece in transcript:
             text = piece.text.strip()
             if text:
-                lines += text
+                lines.append(text)
         return "\n".join(lines)

{kabigon-0.4.1.dist-info → kabigon-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kabigon
-Version: 0.4.1
+Version: 0.4.2
 Author-email: narumi <toucans-cutouts0f@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.10

{kabigon-0.4.1.dist-info → kabigon-0.4.2.dist-info}/RECORD

@@ -10,10 +10,10 @@ kabigon/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 kabigon/reel.py,sha256=1JTcn7qVH7FcD0Oj-Rz-pnjI-xS1UtkoJcuClGb8ExQ,1124
 kabigon/singlefile.py,sha256=CeTT2WPYm0vb1xWPNdyBN4uHRw9hRqfZm68D-nEcUA8,1800
 kabigon/utils.py,sha256=eNTLtHLSB2erDac2HH3jWemgfr8Ou_ozwVb8h9BD-4g,922
-kabigon/youtube.py,sha256=M1v7t4VS72ItqaNJTwlv59bafqORqldGjNzptZOeybA,2915
+kabigon/youtube.py,sha256=HoiFNq0ookPL7_rO_wloBaY8yTIX6xP8A77F7y02q64,1166
 kabigon/ytdlp.py,sha256=kG1fXqU650otOWespjOSkGK_-jk1wO-sWiR60_UPJxY,3125
-kabigon-0.4.1.dist-info/METADATA,sha256=IfnrNBC17ac0E4aI9Y-VOWhaiOnMN_RZxhoS-_EvhzA,1049
-kabigon-0.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kabigon-0.4.1.dist-info/entry_points.txt,sha256=O3FYAO9w-NQvlGMJrBvtrnGHSK2QkUnQBTa30YXRbVE,45
-kabigon-0.4.1.dist-info/licenses/LICENSE,sha256=H2T3_RTgmcngMeC7p_SXT3GwBLkd2DaNgAZuxulcfiA,1066
-kabigon-0.4.1.dist-info/RECORD,,
+kabigon-0.4.2.dist-info/METADATA,sha256=JHbf13Nnhr05WfSS1hijT-YkeCewuWr5kYbzxjlJ-M8,1049
+kabigon-0.4.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kabigon-0.4.2.dist-info/entry_points.txt,sha256=O3FYAO9w-NQvlGMJrBvtrnGHSK2QkUnQBTa30YXRbVE,45
+kabigon-0.4.2.dist-info/licenses/LICENSE,sha256=H2T3_RTgmcngMeC7p_SXT3GwBLkd2DaNgAZuxulcfiA,1066
+kabigon-0.4.2.dist-info/RECORD,,