summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-05-08 04:36:57 +0600
committerSergey M․ <dstftw@gmail.com>2016-05-08 04:36:57 +0600
commit3e169233daf76cd7585ebac12504f8e624b7693b (patch)
tree84b5186a2280eed8cd5619f85fa933bfc8b5a5f2
parentf5436c5d9e4e65790440ada40476712ff430651b (diff)
downloadyoutube-dl-3e169233daf76cd7585ebac12504f8e624b7693b.tar.gz
youtube-dl-3e169233daf76cd7585ebac12504f8e624b7693b.tar.xz
youtube-dl-3e169233daf76cd7585ebac12504f8e624b7693b.zip
Expanduser for more options with input files
-rwxr-xr-xyoutube_dl/YoutubeDL.py1
-rw-r--r--youtube_dl/__init__.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 2187dcc8f..a96482e68 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -2018,6 +2018,7 @@ class YoutubeDL(object):
         if opts_cookiefile is None:
             self.cookiejar = compat_cookiejar.CookieJar()
         else:
+            opts_cookiefile = compat_expanduser(opts_cookiefile)
             self.cookiejar = compat_cookiejar.MozillaCookieJar(
                 opts_cookiefile)
             if os.access(opts_cookiefile, os.R_OK):
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 7a0466077..cbd84c3af 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -406,7 +406,7 @@ def _real_main(argv=None):
 
         try:
             if opts.load_info_filename is not None:
-                retcode = ydl.download_with_info_file(opts.load_info_filename)
+                retcode = ydl.download_with_info_file(compat_expanduser(opts.load_info_filename))
             else:
                 retcode = ydl.download(all_urls)
         except MaxDownloadsReached: