summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFilippo Valsorda <[email protected]>2012-12-31 19:09:37 +0100
committerFilippo Valsorda <[email protected]>2012-12-31 19:12:57 +0100
commit95fedbf86bd6c8820b01768db53355fe488dff5e (patch)
treee216c1a5d179dcf832cc988f3b38407009618b26
parentb7769a05eca3611e492f7a75f1c40cddd2019ef1 (diff)
downloadyoutube-dl-95fedbf86bd6c8820b01768db53355fe488dff5e.tar.gz
youtube-dl-95fedbf86bd6c8820b01768db53355fe488dff5e.zip
three small edits
* ask for a --verbose log when reporting bugs in README.md * re-enable Escapist test, seems stable now * check that we are not downloading multiple videos when the template is fixed (NOT a complete fix: not detecting playlists)
-rw-r--r--README.md3
-rw-r--r--test/tests.json3
-rw-r--r--youtube_dl/FileDownloader.py4
3 files changed, 7 insertions, 3 deletions
diff --git a/README.md b/README.md
index 993aef49e..b3cd9a38c 100644
--- a/README.md
+++ b/README.md
@@ -196,7 +196,8 @@ Bugs and suggestions should be reported at: <https://github.com/rg3/youtube-dl/i
Please include:
-* Your exact command line, like `youtube-dl -t "http://www.youtube.com/watch?v=uHlDtZ6Oc3s&feature=channel_video_title"`. If possible re-run the command with `--verbose`, it is really helpful. A common mistake is not to escape the `&`. Putting URLs in quotes should solve this problem.
+* Your exact command line, like `youtube-dl -t "http://www.youtube.com/watch?v=uHlDtZ6Oc3s&feature=channel_video_title"`. A common mistake is not to escape the `&`. Putting URLs in quotes should solve this problem.
+* If possible re-run the command with `--verbose`, and include the full output, it is really helpful to us.
* The output of `youtube-dl --version`
* The output of `python --version`
* The name and version of your Operating System ("Ubuntu 11.04 x64" or "Windows 7 x64" is usually enough).
diff --git a/test/tests.json b/test/tests.json
index c2de6099d..982e0ad3b 100644
--- a/test/tests.json
+++ b/test/tests.json
@@ -95,8 +95,7 @@
"name": "Escapist",
"url": "http://www.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate",
"file": "6618-Breaking-Down-Baldurs-Gate.flv",
- "md5": "c6793dbda81388f4264c1ba18684a74d",
- "skip": "Fails with timeout on Travis"
+ "md5": "c6793dbda81388f4264c1ba18684a74d"
},
{
"name": "GooglePlus",
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index d9a4ecd3a..53c68237b 100644
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -493,6 +493,10 @@ class FileDownloader(object):
# Extract information from URL and process it
videos = ie.extract(url)
+
+ if len(videos) > 1 and self.fixed_template():
+ raise SameFileError(self.params['outtmpl'])
+
for video in videos or []:
video['extractor'] = ie.IE_NAME
try: