aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2012-12-26 20:39:33 +0100
committerFilippo Valsorda <filippo.valsorda@gmail.com>2012-12-26 20:39:33 +0100
commit99b0a1292b6ceccca576c8555e03bc13fb8e4bdd (patch)
treea81c59d493c803dcfe14cd6b51de52cfc6fd3f80
parentdc23886a77f282ed767146a5d70ac645a98a667b (diff)
downloadyoutube-dl-99b0a1292b6ceccca576c8555e03bc13fb8e4bdd.tar.xz
add --no-post-overwrites to README.md; + minor style fixes
-rw-r--r--README.md2
-rwxr-xr-xyoutube_dl/InfoExtractors.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/README.md b/README.md
index 9dffd99ab..407b27970 100644
--- a/README.md
+++ b/README.md
@@ -112,6 +112,8 @@ which means you can modify it, redistribute it or use it however you like.
specific bitrate like 128K (default 5)
-k, --keep-video keeps the video file on disk after the post-
processing; the video is erased by default
+ --no-post-overwrites do not overwrite post-processed files; the post-
+ processed files are overwritten by default
# CONFIGURATION
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 697c031c5..210348080 100755
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -2127,7 +2127,7 @@ class FacebookIE(InfoExtractor):
video_description = video_info.get('description', 'No description available.')
url_map = video_info['video_urls']
- if len(list(url_map.keys())) > 0:
+ if url_map:
# Decide which formats to download
req_format = self._downloader.params.get('format', None)
format_limit = self._downloader.params.get('format_limit', None)
@@ -2987,7 +2987,7 @@ class MixcloudIE(InfoExtractor):
if file_url is not None:
break # got it!
else:
- if req_format not in list(formats.keys()):
+ if req_format not in formats:
self._downloader.trouble(u'ERROR: format is not available')
return