fenix
/
ytdl-nightly
mirror of https://github.com/ytdl-org/ytdl-nightly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow opts.cachedir == None to disable cache

This commit is contained in:
Philipp Hagemeister 2013-09-24 21:04:43 +02:00
parent c705320f48
commit c3c88a2664
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/YoutubeDL.py
View File

@ -82,7 +82,7 @@ class YoutubeDL(object):
daterange: A DateRange object, download only if the upload_date is in the range. daterange: A DateRange object, download only if the upload_date is in the range.
skip_download: Skip the actual download of the video file skip_download: Skip the actual download of the video file
cachedir: Location of the cache files in the filesystem. cachedir: Location of the cache files in the filesystem.
"NONE" to disable filesystem cache. None to disable filesystem cache.
The following parameters are not used by YoutubeDL itself, they are used by The following parameters are not used by YoutubeDL itself, they are used by
the FileDownloader: the FileDownloader:

2
youtube_dl/__init__.py
View File

@ -618,7 +618,7 @@ def _real_main(argv=None):
'min_filesize': opts.min_filesize, 'min_filesize': opts.min_filesize,
'max_filesize': opts.max_filesize, 'max_filesize': opts.max_filesize,
'daterange': date, 'daterange': date,
'cachedir': opts.cachedir, 'cachedir': opts.cachedir if opts.cachedir != 'NONE' else None,
'youtube_print_sig_code': opts.youtube_print_sig_code, 'youtube_print_sig_code': opts.youtube_print_sig_code,
}) })

2
youtube_dl/extractor/youtube.py
View File

@ -438,7 +438,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor):
cache_dir = self._downloader.params.get('cachedir', cache_dir = self._downloader.params.get('cachedir',
u'~/.youtube-dl/cache') u'~/.youtube-dl/cache')
cache_enabled = cache_dir != u'NONE' cache_enabled = cache_dir is not None
if cache_enabled: if cache_enabled:
cache_fn = os.path.join(os.path.expanduser(cache_dir), cache_fn = os.path.join(os.path.expanduser(cache_dir),
u'youtube-sigfuncs', u'youtube-sigfuncs',