target directory for caption download

pytube/captions.py

@@ -8,7 +8,7 @@ from typing import Dict, Optional
 from pytube import request
 from html import unescape
 
-from pytube.helpers import safe_filename
+from pytube.helpers import safe_filename, target_directory
 
 
 class Caption:
@@ -107,8 +107,6 @@ class Caption:
         :rtype: str
 
         """
-        output_path = output_path or os.getcwd()
-
         if title.endswith(".srt") or title.endswith(".xml"):
             filename = ".".join(title.split(".")[:-1])
         else:
@@ -128,7 +126,7 @@ class Caption:
         else:
             filename += ".xml"
 
-        file_path = os.path.join(output_path, filename)
+        file_path = os.path.join(target_directory(output_path), filename)
 
         with open(file_path, "w", encoding="utf-8") as file_handle:
             if srt:

pytube/cli.py

@@ -63,7 +63,6 @@ def _perform_args_on_youtube(youtube: YouTube, args: argparse.Namespace) -> None
         download_by_resolution(
             youtube=youtube, resolution=args.resolution, target=args.target
         )
-    # TODO: default to download_highest_resultion if no actions specified
 
 
 def _parse_args(
@@ -299,7 +298,7 @@ def download_caption(
 
     caption = youtube.captions.get_by_language_code(lang_code=lang_code)
     if caption:
-        downloaded_path = caption.download(title=youtube.title)
+        downloaded_path = caption.download(title=youtube.title, output_path=target)
         print("Saved caption file to: {}".format(downloaded_path))
     else:
         print("Unable to find caption with code: {}".format(lang_code))

pytube/contrib/playlist.py

@@ -163,10 +163,10 @@ class Playlist:
         prefix_gen = self._path_num_prefix_generator(reverse_numbering)
 
         for link in self.video_urls:
-            yt = YouTube(link)
+            youtube = YouTube(link)
             dl_stream = (
-                yt.streams.get_by_resolution(resolution=resolution)
-                or yt.streams.get_lowest_resolution()
+                youtube.streams.get_by_resolution(resolution=resolution)
+                or youtube.streams.get_lowest_resolution()
             )
             assert dl_stream is not None
 

pytube/helpers.py

@@ -2,6 +2,7 @@
 """Various helper functions implemented by pytube."""
 import functools
 import logging
+import os
 import pprint
 import re
 import warnings
@@ -135,3 +136,13 @@ def deprecated(reason: str) -> Callable:
         return new_func1
 
     return decorator
+
+
+def target_directory(output_path: str) -> str:
+    if output_path:
+        if not os.path.isabs(output_path):
+            output_path = os.path.join(os.getcwd(), output_path)
+    else:
+        output_path = os.getcwd()
+    os.makedirs(output_path, exist_ok=True)
+    return output_path

pytube/query.py

@@ -284,7 +284,7 @@ class StreamQuery:
         """
         return self.filter(progressive=True).order_by("resolution").asc().last()
 
-    def get_audio_only(self, codec:str = "mp4") -> Optional[Stream]:
+    def get_audio_only(self, codec: str = "mp4") -> Optional[Stream]:
         """Get highest bitrate audio stream for given codec (defaults to mp4)
 
         :param str codec:
@@ -295,7 +295,12 @@ class StreamQuery:
             not found.
 
         """
-        return self.filter(only_audio=True, codex=codec).order_by("resolution").asc().last()
+        return (
+            self.filter(only_audio=True, codec=codec)
+            .order_by("resolution")
+            .asc()
+            .last()
+        )
 
     def first(self) -> Optional[Stream]:
         """Get the first :class:`Stream <Stream>` in the results.

pytube/streams.py

@@ -16,7 +16,7 @@ from typing import Dict, Tuple, Optional, List
 
 from pytube import extract
 from pytube import request
-from pytube.helpers import safe_filename
+from pytube.helpers import safe_filename, target_directory
 from pytube.itags import get_format_profile
 from pytube.monostate import Monostate
 
@@ -227,13 +227,6 @@ class Stream:
         :rtype: str
 
         """
-        if output_path:
-            if not os.path.isabs(output_path):
-                output_path = os.path.join(os.getcwd(), output_path)
-        else:
-            output_path = os.getcwd()
-        os.makedirs(output_path, exist_ok=True)
-
         if filename:
             filename = "{filename}.{s.subtype}".format(
                 filename=safe_filename(filename), s=self
@@ -246,7 +239,7 @@ class Stream:
                 prefix=safe_filename(filename_prefix), filename=filename,
             )
 
-        file_path = os.path.join(output_path, filename)
+        file_path = os.path.join(target_directory(output_path), filename)
 
         if (
             skip_existing