5e09d6abbd
[clipfish] Skip test on travis
2013-12-01 01:16:20 +01:00
0a688bc0b2
[youtube] Add support for downloading top lists ( fixes #1868 )
...
It needs to know the channel and the title of the list, because the ids change every time you browse the channels and are attached to a 'VISITOR_INFO1_LIVE' cookie.
2013-11-30 14:56:51 +01:00
b138de72f2
Merge branch 'master' of github.com:rg3/youtube-dl
2013-11-30 00:42:56 +01:00
06dcbb71d8
Clarify help of --write-pages ( #1853 )
2013-11-30 00:42:43 +01:00
c5171c454b
[yahoo] Force use of the http protocol for downloading the videos.
2013-11-29 22:06:17 +01:00
323ec6ae56
Clarify --download-archive help
2013-11-29 15:57:43 +01:00
befd88b786
[yahoo] Add an extractor for yahoo news ( closes #1849 )
2013-11-29 15:25:43 +01:00
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
9986238ba9
fix typo in help
2013-11-29 09:48:38 +01:00
acf37ca151
[imdb] Fix the resolution values ( fixes #1847 )
...
We were using the size of the player, it was the same for all the formats
2013-11-29 07:56:14 +01:00
17769d5a6c
release 2013.11.29
2013-11-29 03:34:26 +01:00
677c18092d
[podomatic] Add extractor
2013-11-29 03:33:25 +01:00
3862402ff3
Add an extractor for Clipsyndicate ( closes #1744 )
2013-11-28 14:38:10 +01:00
b03d0d064c
[imdb] Fix extraction in python 2.6
...
Using a regular expression because the html cannot be parsed.
2013-11-28 13:49:00 +01:00
d8d6148628
Add an extractor for Internet Movie Database trailers ( closes #1832 )
2013-11-28 13:32:49 +01:00
2be54167d0
release 2013.11.28.1
2013-11-28 06:17:56 +01:00
fc9e1cc697
[clipfish] Use FIFA trailer as testcase ( #1842 )
2013-11-28 06:10:37 +01:00
f8f60d2793
[clipfish] Fix imports ( #1842 )
2013-11-28 05:54:46 +01:00
ea07dbb8b1
release 2013.11.28
2013-11-28 05:48:32 +01:00
2a275ab007
[zdf] Use _download_xml
2013-11-28 05:47:50 +01:00
a2e6db365c
[zdf] add a pseudo-testcase and fix URL matching
2013-11-28 05:47:20 +01:00
9d93e7da6c
Merge branch 'master' of github.com:rg3/youtube-dl
2013-11-28 04:37:02 +01:00
0e44d8381a
[youtube:feeds] Use the 'paging' value from the downloaded json information ( fixes #1845 )
2013-11-28 00:33:27 +01:00
35907e23ec
[yahoo] Fix video extraction and use the new format system exclusively
2013-11-27 21:24:55 +01:00
76d1700b28
[youtube:playlist] Fix the extraction of the title for some mixes ( #1844 )
...
Like https://www.youtube.com/watch?v=g8jDB5xOiuE&list=RDIh2gxLqR7HM
2013-11-27 20:01:51 +01:00
dcca796ce4
[clipfish] Effect a better error message ( #1842 )
2013-11-27 18:33:51 +01:00
4b19e38954
[videopremium] support new .me domain
2013-11-27 02:54:51 +01:00
652cdaa269
[youtube:playlist] Add support for YouTube mixes ( fixes #1839 )
2013-11-26 21:35:03 +01:00
e26f871228
Use the new '_download_xml' helper in more extractors
2013-11-26 19:17:25 +01:00
6e47b51eef
[youtube:playlist] Remove the link with index 0
...
It's not the first video of the playlist, it appears in the 'Play all' button (see the test course for an example)
2013-11-26 19:09:14 +01:00
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
c5ed4e8f7e
release 2013.11.26
2013-11-26 10:41:35 +01:00
c2e52508cc
Include the proxy in the parameters for YoutubeDL ( fixes #1831 )
2013-11-26 08:03:11 +01:00
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
529a2e2cc3
Fix typo in the documentation of the 'download_archive' param
2013-11-25 22:52:09 +01:00
781a7d0546
release 2013.11.25.3
2013-11-25 22:36:18 +01:00
fb04e40396
[soundcloud] Support for listing of audio-only files
2013-11-25 22:34:56 +01:00
d9b011f201
Fix rtmpdump with non-ASCII filenames on Windows on 2.x
...
Reported in #1798
2013-11-25 22:31:38 +01:00
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
8b134b1062
Merge branch 'master' of github.com:rg3/youtube-dl
2013-11-25 22:16:07 +01:00
0c75c3fa7a
Do not warn about fixed output template if --max-downloads is 1
...
Fixes #1828
2013-11-25 22:15:33 +01:00
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
1a62c18f65
[bambuser] Skip the download in the test
...
It doesn't respect the 'Range' header.
2013-11-25 22:03:20 +01:00
2a15e7063b
[soundcloud] Prefer HTTP over RTMP ( #1798 )
2013-11-25 20:30:41 +01:00
d46cc192d7
Reduce socket timeout
2013-11-25 19:11:01 +01:00
bb2bebdbe1
release 2013.11.25.2
2013-11-25 15:47:14 +01:00
5db07df634
Fix --download-archive ( Fixes #1826 )
2013-11-25 15:46:54 +01:00
ea36cbac5e
Merge remote-tracking branch 'rbrito/swap-dimensions'
2013-11-25 06:19:15 +01:00
d0d2b49ab7
[FileDownloader] use moved format_bytes method
2013-11-25 06:17:41 +01:00
31cb6d8fef
Merge remote-tracking branch 'rzhxeo/rtmpdump'
2013-11-25 06:16:18 +01:00
daa0dd2973
release 2013.11.25.1
2013-11-25 06:06:39 +01:00
de79c46c8f
[viki] Fix subtitle extraction
2013-11-25 06:06:18 +01:00
94ccb6fa2e
[viki] Fix subtitles extraction
2013-11-25 05:58:04 +01:00
07e4035879
[viki] Fix uploader extraction
2013-11-25 05:57:55 +01:00
ac05067d3d
release 2013.11.25
2013-11-25 03:37:49 +01:00
113577e155
[generic] Improve detection
...
Allow download of http://goo.gl/7X5tOk
Fixes #1818
2013-11-25 03:35:53 +01:00
79d09f47c2
Merge branch 'opener-to-ydl'
2013-11-25 03:30:37 +01:00
c059bdd432
Remove quality_name field and improve zdf extractor
2013-11-25 03:28:55 +01:00
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
1fb2bcbbf7
[viki] Make uploader field optional ( #1813 )
2013-11-25 02:02:34 +01:00
66cfab4226
[comedycentral] Add support for comedycentral.com videos ( closes #1824 )
...
It's a subclass of MTVIE
The extractor for colbertnation.com and thedailyshow.com is called now ComedyCentralShowsIE
2013-11-24 21:18:35 +01:00
6d88bc37a3
[viki] Skip travis test
...
Also provide a better error message for geoblocked videos.
2013-11-24 15:28:50 +01:00
b7553b2554
[vik] Clarify output
2013-11-24 15:20:16 +01:00
e03db0a077
Merge branch 'master' into opener-to-ydl
2013-11-24 15:18:44 +01:00
a1ee09e815
Document proxy
2013-11-24 15:03:25 +01:00
267ed0c5d3
[collegehumor] Encode the xml before calling xml.etree.ElementTree.fromstring ( fixes #1822 )
...
Uses a new helper method in InfoExtractor: _download_xml
2013-11-24 14:59:19 +01:00
f459d17018
[youtube] Add an extractor for downloading the watch history ( closes #1821 )
2013-11-24 14:33:50 +01:00
dc65dcbb6d
[mixcloud] The description field may be missing ( fixes #1819 )
2013-11-24 11:28:44 +01:00
d214fdb8fe
[brightcove] Don't use 'or' with the xml nodes, use the 'value' attribute instead
2013-11-24 11:02:34 +01:00
138df537ff
release 2013.11.24.1
2013-11-24 07:51:56 +01:00
0c7c19d6bc
[clipfish] Add extractor ( Fixes #1760 )
2013-11-24 07:51:44 +01:00
eaaafc59c2
release 2013.11.24
2013-11-24 07:30:34 +01:00
382ed50e0e
[viki] Add extractor ( fixes #1813 )
2013-11-24 07:30:05 +01:00
66ec019240
[youtube] do not use variable name twice
2013-11-24 06:54:26 +01:00
bd49928f7a
[niconico] Clarify download
2013-11-24 06:53:50 +01:00
23e6d50d73
[bandcamp] Remove unused variable
2013-11-24 06:52:53 +01:00
2e767313e4
[update] fix error
2013-11-24 06:52:21 +01:00
38b2db6a66
Credit @takuya0301 for niconico
2013-11-24 06:39:49 +01:00
13ebea791f
[niconico] Simplify and make work with old Python versions
...
The website requires SSLv3, otherwise it just times out during SSL negotiation.
2013-11-24 06:39:10 +01:00
4c9c57428f
Merge remote-tracking branch 'takuya0301/niconico'
2013-11-24 06:09:11 +01:00
8bf9319e9c
Simplify logger code( #1811 )
2013-11-24 06:08:11 +01:00
4914120727
Merge remote-tracking branch 'iTaybb/master'
2013-11-24 06:07:12 +01:00
36de0a0e1a
[brightcove] Set the 'videoPlayer' value to the 'videoId' if it's missing in the parameters ( fixes #1815 )
2013-11-23 23:27:15 +01:00
e5c146d586
[streamcloud] skip test on travis
2013-11-23 15:57:42 +01:00
52ad14aeb0
Add support for niconico
2013-11-23 18:19:44 +09:00
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
a87b0615aa
release 2013.11.22.2
2013-11-22 23:08:15 +01:00
d7386f6276
[update] Check if version from repository is newer before updating
...
Closes #1704
2013-11-22 23:05:58 +01:00
081640940e
Merge branch 'master' of github.com:rg3/youtube-dl
2013-11-22 22:46:57 +01:00
7012b23c94
Match --download-archive during playlist processing ( Fixes #1745 )
2013-11-22 22:46:46 +01:00
9f79463803
[howcast] update test's checksum
2013-11-22 21:25:12 +01:00
d35dc6d3b5
[bandcamp] move the album test to the album extractor and return a single track instead of a playlist
2013-11-22 21:19:31 +01:00
50123be421
release 2013.11.22.1
2013-11-22 20:23:55 +01:00
3f8ced5144
Merge remote-tracking branch 'jaimeMF/yt-playlists'
2013-11-22 20:11:54 +01:00
00ea0f11eb
Print full title in --get-title output ( #1806 )
2013-11-22 20:00:35 +01:00
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
0b63aed8df
[update] do not assign to unused variables
2013-11-22 19:15:36 +01:00
15c3adbb16
Merge branch 'master' of github.com:rg3/youtube-dl
2013-11-22 19:08:33 +01:00
f143a42fe6
[bandcamp] Skip album test
2013-11-22 19:08:25 +01:00
241650c7ff
[vimeo] Fix the extraction of vimeo pro and player.vimeo.com videos
2013-11-22 18:20:31 +01:00
bfe7439a20
release 2013.11.22
2013-11-22 17:46:26 +01:00
cffa6aa107
[bandcamp] Support trackinfo-style songs ( Fixes #1270 )
2013-11-22 17:44:55 +01:00
02e4ebbbad
[streamcloud] Add IE ( Fixes #1801 )
2013-11-22 17:19:22 +01:00
ab009f59ef
[toutv] Fix a typo
2013-11-22 17:18:03 +01:00
0980426559
[bandcamp] add support for albums (reported in #1270 )
2013-11-22 16:05:14 +01:00
a6a173c2fd
utils.shell_quote: Convert the args to unicode strings
...
The youtube test video failed with `UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 34: ordinal not in range(128)`, the problem was with the filenames being encoded.
2013-11-21 14:09:28 +01:00
2bb683c201
release 2013.11.21
2013-11-21 13:59:33 +01:00
64bb5187f5
[soundcloud] Retrieve the file url using the client_id for the iPhone ( fixes #1798 )
...
The desktop's client_id always give the rtmp url, but with the iPhone one it returns the http url if it's available.
2013-11-21 13:16:19 +01:00
9e4f50a8ae
[sztv] skip test, site is undergoing mid-term maintenance
2013-11-20 09:59:03 +01:00
0190eecc00
[nhl] Make NHLVideocenter IE_DESC fit with other descriptions
2013-11-20 09:45:29 +01:00
ca872a4c0b
[spankwire] Fix description search
2013-11-20 09:23:53 +01:00
f2e87ef4fa
[anitube] Skip test (on travis)
2013-11-20 07:46:44 +01:00
0ad97bbc05
[spankwire] fix check for description
2013-11-20 07:45:32 +01:00
c4864091a1
[videopremium] Support new crazy redirect scheme
2013-11-20 07:43:21 +01:00
9a98a466b3
[toutv] really skip test
2013-11-20 07:37:22 +01:00
d323bcb152
release 2013.11.20
2013-11-20 07:25:17 +01:00
da6a795fdb
[escapist] Fix title search
2013-11-20 07:23:23 +01:00
c5edcde21f
[escapist] upper-case URL
2013-11-20 06:56:59 +01:00
15ff3c831e
[escapist] Fix syntax error
2013-11-20 06:55:07 +01:00
100959a6d9
[escapist] Add support for HD format ( Closes #1755 )
2013-11-20 06:52:08 +01:00
0a120f74b2
Credit @diffycat for anitube
2013-11-20 06:36:00 +01:00
8f05351984
[anitube] Minor fixes ( #1776 )
2013-11-20 06:35:02 +01:00
71791f414c
Merge remote-tracking branch 'diffycat/master'
2013-11-20 06:28:13 +01:00
f3682997d7
Clean up unused imports and other minor mistakes
2013-11-20 06:27:48 +01:00
cc13cc0251
[teamcoco] Correct error
2013-11-20 06:25:33 +01:00
86bd5f2ca9
Merge remote-tracking branch 'dz0ny/patch-1'
2013-11-20 06:21:05 +01:00
8694c60000
import json for --dump-json
2013-11-20 06:18:24 +01:00
9d1538182f
Add an option to dump json information
2013-11-20 06:14:57 +01:00
5904088811
Add support for tou.tv ( Fixes #1792 )
2013-11-20 06:13:19 +01:00
69545c2aff
[d8] inherit from CanalplusIE
...
it reuses the same extraction process
2013-11-19 20:44:20 +01:00
495da337ae
Merge pull request #1758 from migbac/master
...
Add support for d8.tv
2013-11-19 20:43:14 +01:00
34b3afc7be
release 2013.11.19
2013-11-19 12:41:01 +01:00
00373a4c5d
Merge pull request #1790 from rg3/console-title
...
Correctly write and restore the console title on the stack (fixes #1782 )
2013-11-18 07:50:10 -08:00
cb7dfeeac4
[youtube] only allow domain name to be upper-case ( #1786 )
2013-11-18 16:42:35 +01:00
efd6c574a2
Correctly write and restore the console title on the stack ( fixes #1782 )
2013-11-18 16:35:41 +01:00
4113e6ab56
[auengine] Do not return unnecessary ext
2013-11-18 14:36:01 +01:00
9a942a4671
release 2013.11.18.1
2013-11-18 13:56:53 +01:00
9906d397a0
[auengine] Simplify
2013-11-18 13:56:45 +01:00
ae8f787141
Remove iPhone from user agent. This breaks a lot of extractors
...
In the future, it might be worth investigating whether we get better content when we claime to be an iPhone.
2013-11-18 13:52:26 +01:00
a81b4d5c8f
release 2013.11.18
2013-11-18 13:30:43 +01:00
887c6acdf2
Support multiple embedded YouTube URLs ( Fixes #1787 )
2013-11-18 13:28:26 +01:00
83aa529330
Support protocol-independent URLs ( #1787 )
2013-11-18 13:18:17 +01:00
96b31b6533
Add iPhone to UA ( #1746 )
2013-11-18 13:05:58 +01:00
fccd377198
Suppor embed-only videos ( Fixes #1746 )
2013-11-18 13:05:18 +01:00
2b35c9ef74
Merge branch 'master' into rtmpdump
...
Conflicts:
youtube_dl/FileDownloader.py
Merge
2013-11-18 00:27:06 +01:00
73c566695f
release 2013.11.17
2013-11-17 22:14:13 +01:00
63b7b7224a
[MTVIE] Try with RTMP URL if download fails
...
This fixes youtube-dl http://www.southpark.de/clips/155251/cartman-vs-the-dog-whisperer
2013-11-17 22:11:40 +01:00
ce80c8b8ee
Merge pull request #1784 from rzhxeo/southpark
...
Add support for southpark.de
2013-11-17 12:15:13 -08:00
749febf4d1
Allow --console-title when --quiet is given ( Fixes #1783 )
2013-11-17 21:12:50 +01:00
bdde425cbe
Save and restore console title ( Fixes #1782 )
2013-11-17 21:10:11 +01:00
746f491f82
Add support for southpark.de
2013-11-17 17:54:47 +01:00
1672647ade
[SouthParkStudiosIE] Move from _TEST to _TESTS
2013-11-17 17:43:58 +01:00
90b6bbc38c
[SouthParkStudiosIE] Also detect urls without http:// or www
2013-11-17 17:42:24 +01:00
ce02ed60f2
Remove * imports
2013-11-17 16:47:52 +01:00
1e5b9a95fd
Move console_title to YoutubeDL
2013-11-17 11:39:52 +01:00
1d699755e0
[youtube] Add view_count ( Fixes #1781 )
2013-11-17 11:06:16 +01:00
ddf49c6344
[arte] remove two typos
2013-11-17 11:05:49 +01:00
ba3881dffd
Add support for anitube.se ( #1417 )
2013-11-16 18:26:34 +04:00
d1c252048b
[redtube] Do not test md5, seems to vary
2013-11-16 10:30:09 +01:00
eab2724138
[gamekings] Do not test md5 sum, precise file changes regularly
2013-11-16 02:32:23 +01:00
21ea3e06c9
[gamekings] remove unnecessary import
2013-11-16 02:31:02 +01:00
52d703d3d1
[tvp] Skip tests
2013-11-16 02:09:30 +01:00
ce152341a1
[bambuser] Do not test for MD5, seems to be flaky
2013-11-16 01:59:28 +01:00
f058e34011
[dailymotion] Fix playlists
2013-11-16 01:56:23 +01:00
b5349e8721
Fix indentation of (best) and (worst) in --list-formats
2013-11-16 01:39:45 +01:00
7150858d49
[spiegel] Implement format selection
2013-11-16 01:33:12 +01:00
91c7271aab
Add automatic generation of format note based on bitrate and codecs
2013-11-16 01:08:43 +01:00
aa13b2dffd
release 2013.11.15.1
2013-11-15 14:35:00 +01:00
fc2ef392be
[ted] Fix playlists ( Fixes #1770 )
2013-11-15 14:33:51 +01:00
463a908705
[ted] simplify
2013-11-15 14:06:38 +01:00
d24ffe1cfa
[rtlnow] Remove the test for nitro
...
The videos expire.
2013-11-15 12:57:59 +01:00
78fb87b283
Don't accept '>' inside the content attribute in OpenGraph regexes
2013-11-15 12:54:13 +01:00
ab2d524780
Improve the OpenGraph regex
...
* Do not accept '>' between the property and content attributes.
* Recognize the properties if the content attribute is before the property attribute using two regexes (fixes the extraction of the description for SlideshareIE).
2013-11-15 12:24:54 +01:00
85d61685f1
[tvp] Update the title and the description of the test video
2013-11-15 12:10:22 +01:00
b9643eed7c
[youtube:channel] Fix the extraction of autogenerated channels
...
The ajax pages are empty, now it looks directly in the channel's /videos page
2013-11-15 11:51:45 +01:00
feee2ecfa9
Pass the 'download' argument to 'process_video_result' ( fixes #1769 )
2013-11-15 11:04:26 +01:00
a25a5cfeec
release 2013.11.15
2013-11-15 01:47:15 +01:00
0e145dd541
Merge branch 'master' of github.com:rg3/youtube-dl
2013-11-15 01:46:50 +01:00
9f9be844fc
[youtube] Fix protocol-independent URLs ( Fixes #1768 )
2013-11-15 01:45:39 +01:00
e3b9ab5e18
[soundlcoud] Set the correct extension for the tracks ( fixes #1766 )
...
Some tracks are not in mp3 format, they can be wav files.
2013-11-14 19:45:39 +01:00
c66d2baa9c
[livestream] Add an extractor for the original version of livestream ( closes #1764 )
...
The two versions use different systems.
2013-11-14 13:16:32 +01:00
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
ca715127a2
Don't assume the 'subtitlesformat' is set in the params dict ( fixes #1750 )
2013-11-13 17:14:10 +01:00
ea7a7af1d4
[gamekings] Fix the test video checksum
2013-11-13 17:13:06 +01:00
880e1c529d
[youtube:playlist] Login into youtube if requested ( fixes #1757 )
...
Allows to download private playlists
2013-11-13 16:39:11 +01:00
dcbb45803f
[youtube:playlist] Don't use the gdata api ( closes #1508 )
...
Parse the playlist pages instead
2013-11-13 16:26:50 +01:00
80b9bbce86
release 2013.11.13
2013-11-13 11:09:04 +01:00
d37936386f
Credit @saper for tvp IE ( #1730 )
2013-11-13 11:08:07 +01:00
c3a3028f9f
[tvp] Minor improvements ( #1730 )
2013-11-13 11:06:53 +01:00
6c5ad80cdc
Merge remote-tracking branch 'saper/tvp'
2013-11-13 11:03:49 +01:00
b5bdc2699a
Credit @jelly for gamekings extractor ( #1759 )
2013-11-13 10:52:22 +01:00
384b98cd8f
[gamekings] Minor fixes ( #1759 )
2013-11-13 10:51:00 +01:00
eb9b5bffef
Add extractor for gamekings.tv
2013-11-13 10:38:47 +01:00
0bd59f3723
Add support for d8.tv
2013-11-12 23:32:03 +01:00
8b8cbd8f6d
[vine] Fix uploader extraction
2013-11-12 20:50:52 +01:00
72b18c5d34
FFmpegMetadataPP: don't enclose the values with " ( fixes #1756 )
2013-11-12 20:38:13 +01:00
eb0a839866
[common] Simplify og_search_property
2013-11-12 10:36:23 +01:00
1777d5a952
release 2013.11.11
2013-11-11 18:28:17 +01:00
d4b7da84c3
Clarify -c. Do not pass it in if you don't know what you're doing
...
Suggested in #1743
2013-11-11 14:21:14 +01:00
801dbbdffd
Use avconv for downloading with m3u8 manifests if it's available ( fixes #1735 )
2013-11-10 16:47:03 +01:00
0ed05a1d2d
Use the 'rtmp_live' field for the live parameter of rtmpdump
2013-11-10 12:45:17 +01:00
1008bebade
Merge remote-tracking branch 'rzhxeo/rtmpdump_live'
2013-11-10 12:38:40 +01:00
be6dfd1b49
[ted] Return a single info_dict for talks urls
...
It failed with the --list-subs option
2013-11-10 12:09:12 +01:00
231516b6c9
Merge pull request #1705 from iemejia/master
...
[ted] support for subtitles
2013-11-10 11:54:18 +01:00
fb53d58dcf
Merge pull request #1726 from saper/escaped
...
Fix AssertionError when og property not found
2013-11-10 02:51:52 -08:00
2a9e9b210b
Fix the documentation of '--autonumber-size' ( #1743 )
...
it's '--auto-number' not '--autonumber'
2013-11-09 19:21:30 +01:00
897d6cc43a
Improve format listing for long format ids
...
Now arte.tv videos have quite long ids.
2013-11-09 19:07:34 +01:00
f470c6c812
[arte] Improve the format sorting
...
Also use the bitrate.
Prefer normal version and sourds/mal version over original version with subtitles.
2013-11-09 19:05:19 +01:00
566d4e0425
[arte] Make sure the format_id is unique ( closes #1739 )
...
Include the bitrate and use the height instead of the quality field.
2013-11-09 19:01:23 +01:00
81be02d2f9
[cnn] Accept www.cnn.com urls ( fixes #1740 )
2013-11-09 18:16:32 +01:00
c2b6a482d5
[brightcove] the format function requires to specify the index in python2.6
2013-11-09 18:10:11 +01:00
12c167c881
[soundcloud] Allow to download tracks marked as not 'streamable'
...
They use the rtmp protocol but if the are marked as 'downloadable' it can use the direct download link.
2013-11-09 18:08:03 +01:00
20aafee7fa
[kankan] Fix the video url
...
It now requires two additional parameters, one is a timestamp we get from the getCdnresource_flv page and the other is a key we have to build.
2013-11-09 16:51:11 +01:00
be07375b66
Don't recode the video with m3u8 downloads ( fixes #1741 )
2013-11-09 16:40:00 +01:00
c8434e8316
Add support for crunchyroll.com
2013-11-09 11:25:12 +01:00
4894fe8c5b
Report download progress of rtmpdump
2013-11-09 11:14:40 +01:00
dd5bcdc4c9
[brightcove] Set the 'Referer' header if the url has the 'linkBaseUrl' parameter ( fixes #1553 )
2013-11-07 21:06:48 +01:00
6161d17579
release 2013.11.07
2013-11-07 11:06:34 +01:00
4ac5306ae7
Fix the report progress when file_size is unknown ( #1731 )
...
The report_progress function will accept eta and percent with None value and will set the message to 'Unknow ETA' or 'Unknown %'.
Otherwise the values must be numbers.
2013-11-07 08:03:35 +01:00
b1a80ec1a9
[xnxx] Accept urls that start with 'www' ( fixes #1734 )
2013-11-06 23:45:01 +01:00
672fe94dcb
release 2013.11.06.1
2013-11-06 22:11:46 +01:00
51040b72ed
[brightcove] Support redirected urls from bcove.me ( fixes #1732 )
...
'bctid' needs to be changed to '@videoPlayer', and 'bckey' to 'playerKey'.
2013-11-06 22:03:00 +01:00
4f045eef8f
[youtube:channel] Fix the extraction
...
The page don't include the 'load more' button anymore, now we directly get the 'c4_browse_ajax' pages.
2013-11-06 21:42:33 +01:00
5d7b253ea0
Add an extractor for eitb.tv ( fixes #1608 )
...
The BrighcoveExperience object doesn't contain the video id, the extractor adds it and passes the url to BrightcoveIE.
2013-11-06 20:06:14 +01:00
b0759f0c19
[brightcove] Extract all the available formats
2013-11-06 19:05:41 +01:00
065472936a
Add an extractor for space.com ( fixes #1718 )
...
It uses Brightcove, but requires some special process for getting a url with the playerKey field in some videos
2013-11-06 17:37:39 +01:00
fc4a0c2aec
[brightcove] Change the 'videoId' or 'videoID' field to '@videoPlayer' ( fixes #1697 )
...
It seems to be needed when using the htmlFederated page
2013-11-06 17:31:47 +01:00
eeb165e674
[brightcove] Add the extraction of the url from generic
2013-11-06 16:58:03 +01:00
9ee2b5f6f2
tests: don't run the test if any of the extractors listed in the 'add_ie' field is marked as not working
2013-11-06 16:43:26 +01:00
da54be877a
release 2013.11.06
2013-11-06 14:02:52 +01:00
50a886b7ab
Fix reporting when file size is unkown ( Fixes #1731 )
2013-11-06 14:02:33 +01:00
76e67c2cb6
Clean up imports
2013-11-06 14:01:43 +01:00
5137ebac0b
[tvp] Telewizja Polska: new extractor for tvp.pl, fixes #1719
...
Thanks-To: mplonski
https://github.com/mplonski/linux/blob/master/tvp-dl.py
2013-11-05 23:47:40 +01:00
a8eeb0597b
Fix AssertionError when og property not found
...
On tvp.pl some webpages contain OpenGraph
metadata and some don't.
If og property is not found, _og_search_description
fails with
WARNING: unable to extract OpenGraph description; please report this issue on http://yt-dl.org/bug
Traceback (most recent call last):
File "/usr/home/saper/bin/youtube-dl", line 18, in <module>
youtube_dl.main()
File "/usr/home/saper/sw/youtube-dl/youtube_dl/__init__.py", line 766, in main
_real_main(argv)
File "/usr/home/saper/sw/youtube-dl/youtube_dl/__init__.py", line 719, in _real_main
retcode = ydl.download(all_urls)
File "/usr/home/saper/sw/youtube-dl/youtube_dl/YoutubeDL.py", line 715, in download
videos = self.extract_info(url)
File "/usr/home/saper/sw/youtube-dl/youtube_dl/YoutubeDL.py", line 348, in extract_info
ie_result = ie.extract(url)
File "/usr/home/saper/sw/youtube-dl/youtube_dl/extractor/common.py", line 125, in extract
return self._real_extract(url)
File "/usr/home/saper/sw/youtube-dl/youtube_dl/extractor/tvp.py", line 56, in _real_extract
info['description'] = self._og_search_description(webpage)
File "/usr/home/saper/sw/youtube-dl/youtube_dl/extractor/common.py", line 331, in _og_search_description
return self._og_search_property('description', html, fatal=False, **kargs)
File "/usr/home/saper/sw/youtube-dl/youtube_dl/extractor/common.py", line 325, in _og_search_property
return unescapeHTML(escaped)
File "/usr/home/saper/sw/youtube-dl/youtube_dl/utils.py", line 494, in unescapeHTML
assert type(s) == type(u'')
AssertionError
The patch allows me to use:
try:
info['description'] = self._og_search_description(webpage)
info['thumbnail'] = self._og_search_thumbnail(webpage)
except RegexNotFoundError:
pass
2013-11-05 23:19:29 +01:00
4ed3e51080
[ted] fixed error in case of no subtitles present
...
I created a test, but I leave it commented since TED videos get
new subtitles frequently.
2013-11-05 12:00:13 +01:00
2dcf7d8f99
[GenericIE] Also detect youtube if src url of iframe is embedded in ' instaed of "
2013-11-05 02:08:02 +01:00
19b0668251
[canal2c] Accept more urls ( fixes #1723 )
...
The url only needs to have the 'idVideo' field in the query, in any position.
We have to set the 'void=oui' in the webpage url, so that we get the file name.
2013-11-04 22:26:19 +01:00
e7e6b54d8a
[teamcoco] Parse the xml file and extract all the formats
2013-11-03 17:48:12 +01:00
2a1a8ffe41
Merge pull request #1693 from alexvh/teamcoco_fix
...
[teamcoco] Fix video url extraction for some videos
2013-11-03 17:19:51 +01:00
08fb86c49b
[youtube] Add description for YoutubeSearchDateIE ( #1710 )
2013-11-03 15:59:10 +01:00
3633d77c0f
Merge remote-tracking branch 'CBGoodBuddy/ytsearchtime'
2013-11-03 15:56:55 +01:00
165e179764
release 2013.11.03
2013-11-03 15:50:36 +01:00
12ebdd1506
[viddler] Support non-digit IDs ( Fixes #1714 )
2013-11-03 15:49:59 +01:00
1baf9a5938
Merge pull request #1698 from rzhxeo/cinemassacre
...
[CinemassacreIE] Support more embed urls
2013-11-03 05:17:12 -08:00
a56f9de156
Style fixes for extractors: remove spaces around (,),{ and }
2013-11-03 14:06:47 +01:00
fa5d47af4b
Merge pull request #1679 from rzhxeo/mofosex
...
Add support for http://www.mofosex.com
2013-11-03 05:04:14 -08:00
d607038753
Merge pull request #1677 from rzhxeo/xtube
...
Add support for http://www.xtube.com
2013-11-03 03:28:02 -08:00
9ac6a01aaf
Merge pull request #1676 from rzhxeo/extremetube
...
Add support for http://www.extremetube.com
2013-11-03 03:25:46 -08:00
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
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
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
a3dd924871
Add YoutubeSearchDateIE extractor to youtube.py & __init__.py, which searches by publication date.
2013-11-02 22:40:48 -04:00
137bbb3e37
[XTubeIE] Add description to TEST
2013-11-02 22:45:48 +01:00
86ad94bb2e
[ExtremeTubeIE] Set age_limit to 18 and fix uploader extraction
2013-11-02 22:33:49 +01:00
3e56add7c9
Merge pull request #1678 from rzhxeo/keezmovies
...
[KeezMoviesIE] Detect URLs with numbers in the SEO part correct
2013-11-02 14:15:52 -07:00
f52f01b5d2
[brightcove] Don't set the extension
...
If the video only has the 'FLVFullLengthURL' key, it can still be an mp4 file.
2013-11-02 21:20:46 +01:00
98d7efb537
[exfm] skip tests
...
The site is down too often.
2013-11-02 20:51:09 +01:00
cf51923545
[youtube] Remove vevo test
...
The video is no longer available and it seems that vevo video don't use encrypted signatures anymore.
2013-11-02 20:46:26 +01:00
38fcd4597a
Merge remote-tracking branch 'iemejia/master'
2013-11-02 19:56:06 +01:00
165e3bb67a
[bambuser] Add an extractor for channels ( closes #1702 )
2013-11-02 19:50:57 +01:00
38db46794f
Merge branch 'ted_subtitles'
2013-11-02 19:50:45 +01:00
a9a3876d55
[ted] Added support for subtitle download
2013-11-02 19:48:39 +01:00
1f343eaabb
[subtitles] refactor to support websites with subtitle information the
...
webpage.
I added the parameter webpage, so now it's similar to the way automatic
captions are handled. This is an improvement needed for websites like
TED.
2013-11-02 19:29:25 +01:00
72a5b4f702
Add an extractor for bambuser.com ( #1702 )
2013-11-02 19:01:01 +01:00
0a43ddf320
[CinemassacreIE] Add live paramter to extracted info as a workaround
2013-11-02 18:08:35 +01:00
31366066bd
Add support for live parameter to rtmpdump
2013-11-02 18:08:16 +01:00
aa2484e390
release 2013.11.02
2013-11-02 11:21:36 +01:00
8eddf3e91d
[youtube] Encode subtitle track name in request ( Fixes #1700 )
2013-11-02 11:21:05 +01:00
60d142aa8d
Add an extractor for vk.com ( closes #1635 )
2013-11-01 22:34:18 +01:00
66cf3ac342
[metacafe] Fix support for age-restricted videos ( fixes #1696 )
...
The 'Content-Type' header must be set for disabling the family filter.
The 'flashversion' cookie is only needed for AnyClip videos.
Added tests for standard metacafe videos and for age-restricted videos.
Also set the 'age_limit' field.
2013-11-01 11:56:15 +01:00
ab4e151347
[CinemassacreIE] Support more embed urls
2013-11-01 01:24:23 +01:00
ac2547f5ff
[teamcoco] Fix video url extraction for some videos
...
Video url extraction failed for some videos,
e.g. http://teamcoco.com/video/old-time-baseball
The url extracted was also occasionally suboptimal quality,
e.g. http://teamcoco.com/video/louis-ck-interview-george-w-bush
2013-10-31 15:41:14 -04:00
5f1ea943ab
[livestream] fix the extraction of events
...
It now uses a json dictionary from the webpage.
2013-10-31 08:07:26 +01:00
9f1109a564
[dailymotion] Fix support for age-restricted videos ( Fixes #1688 )
2013-10-31 00:20:49 +01:00
33b1d9595d
release 2013.10.30
2013-10-30 01:17:20 +01:00
7193498811
Use index in formt string (Fixes vevo test on Python 2.6)
2013-10-30 01:17:00 +01:00
72321ead7b
[vevo] Readd support for SMIL ( Fixes #1683 )
2013-10-30 01:14:17 +01:00
b5d0d817bc
Remove superfluous space
2013-10-30 01:09:44 +01:00
94badb2599
Fix output indenting for --list-formats
2013-10-30 01:09:26 +01:00
b9a836515f
Update the Vimeo test vector md5
...
confirmed that this is indeed the first 10241 (we went off by one with
byte range 0-10240) of the full, playing mp4, so they probably
reencoded or something
2013-10-29 16:44:35 -04:00
21c924f406
[arte] Download the 'Originalversion' version if it's the only one available ( fixes #1682 )
2013-10-29 20:58:49 +01:00
e54fd4b23b
[vevo] Add more format details
2013-10-29 15:10:09 +01:00
57dd9a8f2f
Nicer --list-formats output
2013-10-29 15:09:45 +01:00
912cbf5d4e
[vevo] Fix timestamp handling
...
( / 1000 is implicit float division )
2013-10-29 14:00:23 +01:00
43d7895ea0
release 2013.10.29
2013-10-29 06:48:39 +01:00
f7ff55aa78
Merge remote-tracking branch 'origin/master'
2013-10-29 06:48:18 +01:00
795f28f871
[youtube] Fix login ( Fixes #1681 )
2013-10-29 06:45:54 +01:00
321a01f971
[mtv] Remove the templates from the mediagen url
2013-10-28 23:37:01 +01:00
2563bcc85c
Add an extractor for MySpace ( closes #1666 )
2013-10-28 22:02:17 +01:00
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
dcc2a706ef
Add support for http://www.xtube.com
2013-10-28 19:23:48 +01:00
2bc67c35ac
[KeezMoviesIE] Detect URLs with numbers in the SEO part correct
2013-10-28 18:22:55 +01:00
77ae65877e
Add support for http://www.mofosex.com
2013-10-28 18:18:58 +01:00
32a35e4418
Add support for http://www.extremetube.com
2013-10-28 17:35:01 +01:00
216d71d001
Check if description and thumbnail are None to prevent crash
2013-10-28 16:28:35 +01:00
78a3a9f89e
Make "requested format not available" expected ( #1655 )
2013-10-28 11:41:59 +01:00
a7685f3bf4
mixcloud does not do any format selection
2013-10-28 11:41:32 +01:00
f088ea5486
release 2013.10.28
2013-10-28 11:34:21 +01:00
1003d108d5
[vimeo] Support hash in URL ( Fixes #1669 )
2013-10-28 11:32:22 +01:00
8abeeb9449
Nicer --list-formats output
2013-10-28 11:31:12 +01:00
c1002e96e9
Let extractors omit ext in formats
2013-10-28 11:28:02 +01:00
77d0a82fef
[addanime] Use new formats system
2013-10-28 11:24:47 +01:00
ebc14f251c
Merge remote-tracking branch 'origin/master'
2013-10-28 10:44:13 +01:00
d41e6efc85
New debug option --write-pages
2013-10-28 10:44:02 +01:00
8ffa13e03e
[Instagram] get the non-https link, as they are serving Akamai cert from a instagram.com domain
2013-10-28 02:34:29 -04:00
750e9833b8
Add the missing age_limit tags; added a devscript to do a superficial check for porn sites without the age_limit tag in the test
2013-10-28 01:50:17 -04:00
82f0ac657c
Merge pull request #1657 by @rzhxeo
...
[YouPornIE] Extract all encrypted links and remove doubles at the end
2013-10-28 01:45:52 -04:00
eb6a2277a2
Merge pull request #1659 by @rzhxeo
...
Add support for http://www.tube8.com
2013-10-28 01:38:28 -04:00
f8778fb0fa
Merge pull request #1663 by @rzhxeo
...
Add support for http://www.spankwire.com
2013-10-28 01:35:11 -04:00
e2f9de207c
Merge pull request #1664 by @rzhxeo
...
Add support for http://www.keezmovies.com
2013-10-28 01:25:46 -04:00
a93cc0d943
Merge pull request #1661 by @rzhxeo
...
Add support for http://www.pornhub.com
2013-10-28 00:50:39 -04:00
7d8c2e07f2
[Exfm] replace the failing Soundcloud test vector (broken also in browser)
2013-10-28 00:33:43 -04:00
efb4c36b18
Merge pull request #1660 from pyed/master
...
[addanime] try to download HQ before normal
2013-10-27 21:14:19 -07:00
29526d0d2b
Merge pull request #1656 from rzhxeo/xhamster
...
[XHamsterIE] Extract SD and HD video
2013-10-27 10:12:59 -07:00
198e370f23
[addanime] better regex.
2013-10-27 19:48:02 +03:00
c19f7764a5
[generic] Detect bandcamp pages that use custom domains ( closes #1662 )
...
They embed the original url in the 'og:url' property.
2013-10-27 14:40:25 +01:00
bc63d9d329
[rtlnow] Change the test for rtlnitronow
2013-10-27 14:26:19 +01:00
aa929c37d5
[generic] Fix test video's checksum
2013-10-27 14:21:37 +01:00
af4d506eb3
[faz] Use a regex for getting the description
...
The page cannot be parsed in python2.6 with the html parser.
2013-10-27 14:18:55 +01:00
5da0549581
[KeezMoviesIE] Correct return value for embedded videos
2013-10-27 12:48:09 +01:00
749a4fd2fd
[facebook] Don't recommend to report the issue if the video is private.
2013-10-27 12:13:55 +01:00
6f71ef580c
[facebook] Report a more meaningful message if the video cannot be accessed ( closes #1658 )
2013-10-27 12:09:46 +01:00
67874aeffa
[facebook] Fix the login process ( fixes #1244 )
2013-10-27 12:07:58 +01:00
3e6a330d38
[addanime] fix md5sum
2013-10-27 13:51:26 +03:00
aee5e18c8f
[addanime] catch 'RegexNotFoundError'
2013-10-27 13:36:43 +03:00
5b11143d05
Add support for http://www.keezmovies.com
2013-10-27 10:10:28 +01:00
7b2212e954
Add support for http://www.spankwire.com
2013-10-27 01:59:26 +02:00
71865091ab
[Tube8IE] Fix regex for uploader extraction
2013-10-27 01:08:03 +02:00
125cfd78e8
Add support for http://www.pornhub.com
2013-10-27 01:04:22 +02:00
8cb57d9b91
[Tube8IE] Escape dot in regex
2013-10-27 00:21:27 +02:00
14e10b2b6e
[addanime] try to download HQ before normal
2013-10-27 01:19:38 +03:00
6e76104d66
[YouPornIE] Make webpage download more robust
2013-10-26 23:33:32 +02:00
1d45a23b74
Add support for http://www.tube8.com
2013-10-26 23:27:30 +02:00
7df286540f
[YouPornIE] Extract all encrypted links and remove doubles at the end
2013-10-26 21:57:10 +02:00
5d0c97541a
[XHamsterIE] Extract SD and HD video
2013-10-26 20:38:54 +02:00
49a25557b0
[8tracks] Use track count instead of looking at at_last_track property
...
This fixes the error:
$ youtube-dl http://8tracks.com/vladmc/counting-stars
[8tracks] counting-stars: Downloading webpage
[8tracks] counting-stars: Downloading song information 1/4
[8tracks] counting-stars: Downloading song information 2/4
[8tracks] counting-stars: Downloading song information 3/4
[8tracks] counting-stars: Downloading song information 4/4
[8tracks] counting-stars: Downloading song information 5/4
Traceback (most recent call last):
File "/usr/lib/python2.7/runpy.py", line 162, in _run_module_as_main
"__main__", fname, loader, pkg_name)
File "/usr/lib/python2.7/runpy.py", line 72, in _run_code
exec code in run_globals
File "/home/phihag/projects/youtube-dl/youtube_dl/__main__.py", line 18, in <module>
youtube_dl.main()
File "/home/phihag/projects/youtube-dl/youtube_dl/__init__.py", line 761, in main
_real_main(argv)
File "/home/phihag/projects/youtube-dl/youtube_dl/__init__.py", line 714, in _real_main
retcode = ydl.download(all_urls)
File "/home/phihag/projects/youtube-dl/youtube_dl/YoutubeDL.py", line 701, in download
videos = self.extract_info(url)
File "/home/phihag/projects/youtube-dl/youtube_dl/YoutubeDL.py", line 342, in extract_info
ie_result = ie.extract(url)
File "/home/phihag/projects/youtube-dl/youtube_dl/extractor/common.py", line 121, in extract
return self._real_extract(url)
File "/home/phihag/projects/youtube-dl/youtube_dl/extractor/eighttracks.py", line 111, in _real_extract
'id': track_data['id'],
KeyError: 'id'
2013-10-25 23:46:19 +02:00
b5936c0059
Document the %(format_id)s field for the output template
2013-10-25 17:18:06 +02:00
600cc1a4f0
[youtube] Set the format_id field to the itag of the format ( closes #1624 )
2013-10-25 17:17:46 +02:00
ea32fbacc8
Fix the extensions of two tests with youtube videos
...
The best quality is now a mp4 video.
2013-10-25 16:55:37 +02:00
00fe14fc75
[youtube] Also use the 'adaptative_fmts' field from the /get_video_info page ( fixes #1649 )
...
The 'adaptative_fmts' field from the video page is not added to the 'url_encoded_fmt_stream_map'
2013-10-25 16:52:58 +02:00
fcc28edb2f
[cinemassacre] Simplify
...
* Remove some rtmp parameters that are not needed.
* Remove the md5 checksums, the video is not downloaded.
* Remove the code used before the current format system.
2013-10-23 20:21:41 +02:00
fac6be2dd5
Merge pull request #1632 from rzhxeo/cinemassacre
...
[Cinemassacre] Download video that is shown in flash player
2013-10-23 20:15:39 +02:00
1cf64ee468
release 2013.10.23.2
2013-10-23 18:38:09 +02:00
cdec0190c4
[dailymotion] Extract all the available formats ( closes #1028 )
2013-10-23 17:33:38 +02:00
2450bcb28b
[nowvideo] Fix key extraction
...
Extract it from the embed page
2013-10-23 17:00:33 +02:00
3126050c0f
Hide the video password on verbose mode
2013-10-23 16:32:17 +02:00
93b22c7828
[vimeo] fix the extraction for videos protected with password
...
Added a test video.
2013-10-23 16:31:53 +02:00
0a89b2852e
release 2013.10.23.1
2013-10-23 15:12:33 +02:00
55b3e45bba
[vimeo] Fix pro videos and player.vimeo.com urls
...
The old process can still be used for those videos.
Added RegexNotFoundError, which is raised by _search_regex if it can't extract the info.
2013-10-23 14:38:03 +02:00
365bcf6d97
Merge remote-tracking branch 'origin/master'
2013-10-23 11:40:46 +02:00
Philipp Hagemeister
Jaime Marquínez Ferrándiz
Nicolas Kaiser
Filippo Valsorda
Takuya Tsuchida
Itay Brandes
Mohamedh Fazal
rzhxeo
Anton Larionov
Janez Troha
Jelle van der Waa
migbac
Marcin Cieślak
Ismaël Mejía
Craig Markwardt
Alex Van't Hof
Filippo Valsorda
Abdulelah Alfntokh
rzhxeo