Update componenthandler.py

Author: BillaSpace

youtubesearchpython/core/componenthandler.py

@@ -1,4 +1,6 @@
 from typing import Union, List
+from urllib.parse import urlparse, parse_qs
+
 
 def getValue(source: dict, path: List[Union[str, int]]) -> Union[str, int, dict, None]:
     value = source
@@ -8,7 +10,10 @@ def getValue(source: dict, path: List[Union[str, int]]) -> Union[str, int, dict,
         if isinstance(key, str):
             if not isinstance(value, dict):
                 return None
-            value = value.get(key)
+            if key in value:
+                value = value[key]
+            else:
+                return None
         elif isinstance(key, int):
             if not isinstance(value, (list, tuple)):
                 return None
@@ -25,29 +30,23 @@ def getVideoId(videoLink: str) -> str:
     try:
         parsed = urlparse(videoLink)
         host = (parsed.netloc or "").lower()
-
         if "youtu.be" in host:
-            path = parsed.path.strip("/")
+            path = parsed.path.rstrip("/")
             if path:
-                return path.split("?")[0]
-
+                return path.split("/")[-1]
         if "youtube" in host or "youtube-nocookie" in host:
             qs = parse_qs(parsed.query)
             if "v" in qs and qs["v"]:
                 return qs["v"][0]
-
             parts = [p for p in parsed.path.split("/") if p]
             for i, p in enumerate(parts):
                 if p in ("embed", "v") and i + 1 < len(parts):
                     return parts[i + 1]
-
             if parts:
                 return parts[-1]
-
         core = videoLink.split("?")[0].split("#")[0].rstrip("/")
         if "/" in core:
             return core.split("/")[-1]
-
         return core
     except Exception:
         return videoLink