Philipp Hagemeister
f82b18efc1
Merge remote-tracking branch 'rzhxeo/youtube'
2013-12-23 04:37:40 +01:00
Philipp Hagemeister
196938835a
Remove debugging code
...
Introduced by accident in 5d681e960d
2013-12-23 04:30:57 +01:00
Philipp Hagemeister
5d681e960d
Use bidiv instead of fribidi if available ( Fixes #1912 )
2013-12-23 04:19:50 +01:00
rzhxeo
62d68c43ed
Make prefer_free_formats sorting more robust
2013-12-18 21:25:13 +01:00
rzhxeo
bfaae0a768
Filter and sort videos before calling list_formats
2013-12-18 21:24:39 +01:00
rzhxeo
4ea3be0a5c
[YoutubeIE] Externalize format selection
2013-12-18 03:30:55 +01:00
Philipp Hagemeister
29eb517403
Add webpage_url_basename info_dict field ( Fixes #1938 )
2013-12-17 04:13:36 +01:00
alimirjamali
0a9ce268ba
Incorrect variable is used to check whether thumbnail exists
...
Dear @phihag
I believe in line 848, the correct variable to check is 'thumb_filename' rather than 'infofn'
Kindly advise
Mit freundlichen Gruessen
Ali
2013-12-16 20:14:28 +03:30
Philipp Hagemeister
a19fd00cc4
Simplify --playlist-start / --playlist-end interface
2013-12-16 13:16:20 +01:00
Philipp Hagemeister
7b6fefc9d4
Apply --no-overwrites for --write-* files as well ( Fixes #1980 )
2013-12-16 04:39:13 +01:00
Philipp Hagemeister
525ef9227f
Add --get-duration ( Fixes #859 )
2013-12-16 04:15:10 +01:00
Philipp Hagemeister
5fe18bdbde
Add --min-views / --max-views ( Fixes #1979 )
2013-12-16 03:09:49 +01:00
Jaime Marquínez Ferrándiz
3bc2ddccc8
Move FileDownloader to its own module and create a new class for each download process
...
A suitable downloader can be found using the 'get_suitable_downloader' function.
Each subclass implements 'real_download', for downloading an info dict you call the 'download' method, which first checks if the video has already been downloaded
2013-12-11 16:18:48 +01:00
Jaime Marquínez Ferrándiz
8ab470f1b2
Now a new FileDownloader is created when downloading a video
...
The progress hooks can be added using the method "add_downloader_progress_hook"
2013-12-11 16:04:42 +01:00
Philipp Hagemeister
357ddadbf5
Fix thumbnail filename determination ( Fixes #1945 )
2013-12-11 08:54:48 +01:00
Philipp Hagemeister
45598aab08
[YoutubeDL] Simplify filename preparation
2013-12-10 11:23:35 +01:00
Jaime Marquínez Ferrándiz
26e6393134
Set 'NA' as the default value for missing fields in the output template ( fixes #1931 )
...
Remove the `except KeyError` clause, it won't get raised anymore
2013-12-09 22:00:42 +01:00
Philipp Hagemeister
1c088fa89d
Improve --bidi-workaround support
2013-12-09 18:29:07 +01:00
Philipp Hagemeister
395293a889
[--load-info] Always read file as UTF-8
...
This allows editing the file (and not escaping non-ASCII characters) and reloading it in.
2013-12-09 04:59:51 +01:00
Philipp Hagemeister
db4da14027
Merge remote-tracking branch 'jaimeMF/load-info'
2013-12-09 04:55:02 +01:00
Philipp Hagemeister
2101830c0d
Remove unused imports
2013-12-09 04:53:23 +01:00
Philipp Hagemeister
a0d96c9843
Add filename to --dump-json output ( Fixes #1908 )
2013-12-09 04:31:18 +01:00
Philipp Hagemeister
0783b09b92
Add a workaround for terminals without bidi support ( Fixes #1912 )
2013-12-09 04:08:51 +01:00
Philipp Hagemeister
ef4fd84857
[wistia] Add extractor
2013-12-06 09:15:04 +01:00
Philipp Hagemeister
7fc3fa0545
[9gag] Add extractor
2013-12-05 14:29:08 +01:00
Jaime Marquínez Ferrándiz
d494389821
Option '--load-info': if the download fails, try extracting the info with the 'webpage_url' field of the info dict
...
The video url may have expired.
2013-12-03 20:16:52 +01:00
Jaime Marquínez Ferrándiz
1dcc4c0cad
Add --load-info option ( #972 )
...
It just calls the 'YoutubeDL.process_ie_result' with the dictionary from the json file
2013-12-03 20:15:20 +01:00
Philipp Hagemeister
6ad14cab59
Add --socket-timeout option
2013-12-02 13:37:05 +01:00
Philipp Hagemeister
e344693b65
Make socket timeout configurable, and bump default to 10 minutes ( #1862 )
2013-12-01 11:42:02 +01:00
Philipp Hagemeister
a3fb4675fb
Do not mutate default arguments
...
In this case, it looks rather harmless (since the conditions for --restrict-filenames should not change while a process is running), but just to be sure.
This also simplifies the interface for callers, who can just pass in the idiomatic None for "I don't care, whatever is the default".
2013-11-29 15:25:11 +01:00
Jaime Marquínez Ferrándiz
4a98cdbf3b
YoutubeDL: set the 'params' property before any message/warning/error is sent ( fixes #1840 )
...
If it sets the 'restrictfilenames' param, it will first report a warning. It will try to get the logger from the 'params' property, which would be set at that moment to None, raising the error 'AttributeError: 'NoneType' object has no attribute 'get''
2013-11-26 18:54:14 +01:00
Jaime Marquínez Ferrándiz
d31209a144
Use the 'extractor_key' field for the download archive file
...
It has the same value as the ie_key.
2013-11-25 22:57:15 +01:00
Jaime Marquínez Ferrándiz
529a2e2cc3
Fix typo in the documentation of the 'download_archive' param
2013-11-25 22:52:09 +01:00
Philipp Hagemeister
fb04e40396
[soundcloud] Support for listing of audio-only files
2013-11-25 22:34:56 +01:00
Philipp Hagemeister
b0b9eaa196
Merge pull request #1829 from jaimeMF/ydl-empty-params
...
Allow to initialize a YoutubeDL object without parameters
2013-11-25 13:19:59 -08:00
Philipp Hagemeister
0c75c3fa7a
Do not warn about fixed output template if --max-downloads is 1
...
Fixes #1828
2013-11-25 22:15:33 +01:00
Jaime Marquínez Ferrándiz
a3927cf7ee
Allow to initialize a YoutubeDL object without parameters
...
Having to pass the 'outtmpl' parameter feels really strange when you just want to extract the info of a video.
2013-11-25 22:03:39 +01:00
Philipp Hagemeister
d46cc192d7
Reduce socket timeout
2013-11-25 19:11:01 +01:00
Philipp Hagemeister
5db07df634
Fix --download-archive ( Fixes #1826 )
2013-11-25 15:46:54 +01:00
Philipp Hagemeister
79d09f47c2
Merge branch 'opener-to-ydl'
2013-11-25 03:30:37 +01:00
Philipp Hagemeister
c059bdd432
Remove quality_name field and improve zdf extractor
2013-11-25 03:28:55 +01:00
Philipp Hagemeister
02dbf93f0e
[zdf/common] Use API in ZDF extractor.
...
This also comes with a lot of extra format fields
Fixes #1518
2013-11-25 03:13:22 +01:00
Philipp Hagemeister
e03db0a077
Merge branch 'master' into opener-to-ydl
2013-11-24 15:18:44 +01:00
Philipp Hagemeister
a1ee09e815
Document proxy
2013-11-24 15:03:25 +01:00
Philipp Hagemeister
8bf9319e9c
Simplify logger code( #1811 )
2013-11-24 06:08:11 +01:00
Itay Brandes
43afe28588
Log to an external logger ( fixes #1810 )
...
Sadly applications using youtube-dl's python sources can't directly
access it's log stream. It's pretty much limited to stdout and stderr
only.
It should log to logging.Logger instance passed to YoutubeDL's params
dictionary.
2013-11-23 10:22:18 +02:00
Philipp Hagemeister
7012b23c94
Match --download-archive during playlist processing ( Fixes #1745 )
2013-11-22 22:46:46 +01:00
Philipp Hagemeister
00ea0f11eb
Print full title in --get-title output ( #1806 )
2013-11-22 20:00:35 +01:00
Philipp Hagemeister
dca0872056
Move the opener to the YoutubeDL object.
...
This is the first step towards being able to just import youtube_dl and start using it.
Apart from removing global state, this would fix problems like #1805 .
2013-11-22 19:57:52 +01:00
Philipp Hagemeister
86bd5f2ca9
Merge remote-tracking branch 'dz0ny/patch-1'
2013-11-20 06:21:05 +01:00
Philipp Hagemeister
8694c60000
import json for --dump-json
2013-11-20 06:18:24 +01:00
Mohamedh Fazal
9d1538182f
Add an option to dump json information
2013-11-20 06:14:57 +01:00
Jaime Marquínez Ferrándiz
efd6c574a2
Correctly write and restore the console title on the stack ( fixes #1782 )
2013-11-18 16:35:41 +01:00
Philipp Hagemeister
749febf4d1
Allow --console-title when --quiet is given ( Fixes #1783 )
2013-11-17 21:12:50 +01:00
Philipp Hagemeister
bdde425cbe
Save and restore console title ( Fixes #1782 )
2013-11-17 21:10:11 +01:00
Philipp Hagemeister
ce02ed60f2
Remove * imports
2013-11-17 16:47:52 +01:00
Philipp Hagemeister
1e5b9a95fd
Move console_title to YoutubeDL
2013-11-17 11:39:52 +01:00
Philipp Hagemeister
b5349e8721
Fix indentation of (best) and (worst) in --list-formats
2013-11-16 01:39:45 +01:00
Philipp Hagemeister
7150858d49
[spiegel] Implement format selection
2013-11-16 01:33:12 +01:00
Philipp Hagemeister
91c7271aab
Add automatic generation of format note based on bitrate and codecs
2013-11-16 01:08:43 +01:00
Jaime Marquínez Ferrándiz
feee2ecfa9
Pass the 'download' argument to 'process_video_result' ( fixes #1769 )
2013-11-15 11:04:26 +01:00
Janez Troha
9771cceb2c
Fix filename extension leaking to json filename
...
Makes writeinfojson behaving exactly as writethumbnail in case where filename contains mediafile extension.
Case:
video.mp4 converted to music.mp3 would yield music.mp4.info.json instead music.mp3.info.json or music.info.json
2013-11-13 18:34:03 +01:00
Jaime Marquínez Ferrándiz
ca715127a2
Don't assume the 'subtitlesformat' is set in the params dict ( fixes #1750 )
2013-11-13 17:14:10 +01:00
Jaime Marquínez Ferrándiz
897d6cc43a
Improve format listing for long format ids
...
Now arte.tv videos have quite long ids.
2013-11-09 19:07:34 +01:00
Jaime Marquínez Ferrándiz
be97abc247
Set the 'extractor_key' field in the info_dict
...
It's the string returned by the class method 'ie_key', which allows to retrieve the extractor with 'get_info_extractor'
2013-11-03 12:14:44 +01:00
Jaime Marquínez Ferrándiz
9103bbc5cd
Add the 'webpage_url' field to info_dict
...
The url for the video page, it must allow to reproduce the result.
It's automatically set by YoutubeDL if it's missing.
2013-11-03 12:11:13 +01:00
Jaime Marquínez Ferrándiz
b6c45014ae
Set the extra_info inside YoutubeDL.process_ie_result and set only if the keys are missing
2013-11-03 11:57:04 +01:00
Philipp Hagemeister
7193498811
Use index in formt string (Fixes vevo test on Python 2.6)
2013-10-30 01:17:00 +01:00
Philipp Hagemeister
94badb2599
Fix output indenting for --list-formats
2013-10-30 01:09:26 +01:00
Philipp Hagemeister
57dd9a8f2f
Nicer --list-formats output
2013-10-29 15:09:45 +01:00
Jaime Marquínez Ferrándiz
702665c085
tests: build the filename from the info_dict if the 'file' key is missing
...
It will need to have the 'id' and 'ext' keys to work.
2013-10-28 22:01:37 +01:00
rzhxeo
216d71d001
Check if description and thumbnail are None to prevent crash
2013-10-28 16:28:35 +01:00
Philipp Hagemeister
78a3a9f89e
Make "requested format not available" expected ( #1655 )
2013-10-28 11:41:59 +01:00
Philipp Hagemeister
a7685f3bf4
mixcloud does not do any format selection
2013-10-28 11:41:32 +01:00
Philipp Hagemeister
8abeeb9449
Nicer --list-formats output
2013-10-28 11:31:12 +01:00
Philipp Hagemeister
c1002e96e9
Let extractors omit ext in formats
2013-10-28 11:28:02 +01:00
rzhxeo
7df286540f
[YouPornIE] Extract all encrypted links and remove doubles at the end
2013-10-26 21:57:10 +02:00
Philipp Hagemeister
7853cc5ae1
Merge remote-tracking branch 'origin/master'
...
Conflicts:
youtube_dl/YoutubeDL.py
2013-10-22 22:30:06 +02:00
Philipp Hagemeister
586a91b67f
Expand tilde in template ( Fixes #1639 )
2013-10-22 22:28:26 +02:00
Jaime Marquínez Ferrándiz
fe7e0c9825
Style fixes in YoutubeDL.py
...
Fixed some of the problems reported by pep8
2013-10-22 14:49:34 +02:00
Jaime Marquínez Ferrándiz
12893efe01
Respect the download parameter in YoutubeDL.process_video_result if the extractor handle the format selection
2013-10-22 00:01:59 +02:00
Jaime Marquínez Ferrándiz
8c51aa6506
The 'format' field now defaults to '{format_id} - {width}x{height}{format_note}'
...
Following the YoutubeIE format. The 'format_note' gives additional info about the format, for example '3D' or 'DASH video'.
2013-10-21 14:42:06 +02:00
Jaime Marquínez Ferrándiz
3fd39e37f2
YoutubeDL: remove method that came from FileDownloader
2013-10-21 13:52:24 +02:00
Jaime Marquínez Ferrándiz
49e86983e7
Allow to use the extension for the format selection
...
The best format with the extension is downloaded.
2013-10-21 13:31:55 +02:00
Jaime Marquínez Ferrándiz
a9c58ad945
Accept requested formats to be in the format 35/best ( closes #1552 )
...
The format selection code is now an independent function.
2013-10-21 13:19:58 +02:00
Philipp Hagemeister
416a5efce7
fix typos
2013-10-18 00:49:45 +02:00
Philipp Hagemeister
f4d96df0f1
Extend #980 with --max-quality support
2013-10-18 00:46:35 +02:00
Philipp Hagemeister
1c1218fefc
Merge remote-tracking branch 'jaimeMF/format_selection'
2013-10-18 00:17:03 +02:00
Jai Grimshaw
1fb07d10a3
[youtube] Adds #1312 Download annotations
...
Adds #1321 Download annotations from youtube
Annotations are downloaded and written to a .annotations.xml file using the https://www.youtube.com/annotations_invideo?features=1&legacy=1&video_id=$VIDEOID API.
Added unit test for annotations.
2013-10-14 16:22:27 +11:00
Jaime Marquínez Ferrándiz
8016c92297
Fix the default values of format_id and format
2013-10-11 16:34:49 +02:00
Jaime Marquínez Ferrándiz
e028d0d1e3
Implement the prefer_free_formats in YoutubeDL
2013-10-11 16:34:49 +02:00
Jaime Marquínez Ferrándiz
79819f58f2
Default 'format' field to {width}x{height}
...
If width is None, use {height}p and if height is None, '???'
2013-10-11 16:34:49 +02:00
Jaime Marquínez Ferrándiz
6ff000b888
Do not handle format selection for IEs that already handle it
2013-10-11 16:34:48 +02:00
Jaime Marquínez Ferrándiz
99e206d508
Implement the max quality option in YoutubeDL
2013-10-11 16:34:48 +02:00
Jaime Marquínez Ferrándiz
dd82ffea0c
Implement format selection in YoutubeDL
...
Now the IEs can set a formats field in the info_dict, with the formats ordered from worst to best quality. It's a list of dicts with the following fields:
* Mandatory: url and ext
* Optional: format and format_id
The format_id is used for choosing which formats have to be downloaded.
Now a video result is processed by the method process_video_result.
2013-10-11 16:34:48 +02:00
Tom
1d368c7589
Tiny tpo
2013-10-09 21:56:09 +08:00
Philipp Hagemeister
b24f347190
Merge branch 'download-archive'
...
Conflicts:
youtube_dl/YoutubeDL.py
youtube_dl/__init__.py
2013-10-06 16:30:26 +02:00
Philipp Hagemeister
ee6c9f95e1
Remove superfluous parenthesis
2013-10-06 16:28:36 +02:00
Philipp Hagemeister
cfadd183c4
Call extracted property age_limit everywhere
2013-10-06 16:23:06 +02:00
Philipp Hagemeister
8dbe9899a9
Allow users to specify an age limit ( fixes #1545 )
...
With these changes, users can now restrict what videos are downloaded by the intented audience, by specifying their age with --age-limit YEARS .
Add rudimentary support in youtube, pornotube, and youporn.
2013-10-06 06:08:56 +02:00
