Jouke Waleson
2514d2635e
PEP8: E225,E227
2014-11-23 21:23:05 +01:00
Jouke Waleson
8bcc875676
PEP8: more applied
2014-11-23 21:20:46 +01:00
Jouke Waleson
5f6a1245ff
PEP8 applied
2014-11-23 20:41:03 +01:00
Philipp Hagemeister
f3a3407226
[youtube] Clarify keywords
2014-11-23 20:09:10 +01:00
Sergey M․
598c218f7b
[smotri] Adapt to new API and modernize
2014-11-23 23:53:41 +06:00
Naglis Jonaitis
4698b14b76
[rtlxl] Strip additional dot from video URL ( #4115 )
2014-11-23 13:28:09 +02:00
Philipp Hagemeister
d16abf434a
[vk] Some PEP8 love
2014-11-23 10:11:52 +01:00
Philipp Hagemeister
a8363f3ab7
[vk] Clarify test
2014-11-23 10:11:04 +01:00
Philipp Hagemeister
010cd3a3ee
Merge remote-tracking branch 'WillSewell/vk-playlists'
2014-11-23 10:09:45 +01:00
Philipp Hagemeister
aa79ac0c82
[youtube] Support controversy videos ( Fixes #4275 )
2014-11-23 09:59:02 +01:00
Philipp Hagemeister
dd60be2bf9
[telebruxelles] Simplify ( #4270 )
2014-11-23 09:44:42 +01:00
Philipp Hagemeister
119b3caa46
Merge remote-tracking branch 'nulloz/telebruxelles'
2014-11-23 09:38:18 +01:00
Naglis Jonaitis
49f0da7ae1
[rtlxl] Use unencrypted m3u8 streams ( #4115 )
2014-11-22 21:06:45 +02:00
nulloz
2cead7e7bc
telebruxelles Add new extractor
2014-11-22 13:34:29 +01:00
Will Sewell
9262867e86
[vk.com] Added newline at the end of the file.
2014-11-21 23:25:05 +00:00
Will Sewell
b9272e8f8f
[vk.com] Removed redundant log message -- this information is already being logged.
2014-11-21 23:22:52 +00:00
Will Sewell
021a0db8f7
[vk.com] Simplified the page_id acquisition by using the id matched in the URL earlier on.
2014-11-21 23:22:44 +00:00
Will Sewell
e1e8b6897b
[vk.com] Updated the extract_videos_from_page function with a much simpler 1-liner.
2014-11-21 23:16:12 +00:00
Will Sewell
53d1cd1f77
[vk.com] Updated the _VALID_URL regex for the playlist IE. Removed optional m, and named the id group.
2014-11-21 23:03:31 +00:00
Will Sewell
cad985ab4d
[vk.com] Updated the description to include vk.com.
2014-11-21 23:00:43 +00:00
Will Sewell
c52331f30c
[vk.com] Updated a test video that has been removed, and added a comment for others to update two other test videos that are also now removed.
2014-11-21 23:00:33 +00:00
Will Sewell
42e1ff8665
[vk.com] Added upload_date variable to the test cases that still work.
2014-11-21 23:00:17 +00:00
Philipp Hagemeister
6127693ed9
[folketinget] Add extractor ( Fixes #4262 )
2014-11-21 22:36:24 +01:00
Philipp Hagemeister
71069d2157
[sztv] Remove useless determine_ext call
2014-11-21 22:03:29 +01:00
Philipp Hagemeister
f3391db889
[sztvhu] Modernize
2014-11-21 22:02:16 +01:00
Philipp Hagemeister
9b32eca3ce
[generic] Add support for single quotes in HTML5 videos ( Fixes #4265 )
2014-11-21 22:01:25 +01:00
Philipp Hagemeister
be53e2a737
[blip.tv:user] Modernize and add a test
2014-11-21 00:25:13 +01:00
Philipp Hagemeister
a1c68b9ef2
Merge remote-tracking branch 'origin/master'
2014-11-21 00:17:58 +01:00
Jaime Marquínez Ferrándiz
4d46c1c68c
[brightcove] Improve error message detection ( #4256 )
2014-11-20 18:44:54 +01:00
Jaime Marquínez Ferrándiz
d6f714f321
[brightcove] Remove the namespace from the BrightcoveExperience html object
2014-11-20 18:37:08 +01:00
Philipp Hagemeister
8569f3d629
[vh1] Modernize
2014-11-20 16:51:33 +01:00
Philipp Hagemeister
fed5d03260
[extractor/common] Document _type values (Motivated by #4254 )
2014-11-20 16:47:59 +01:00
Philipp Hagemeister
6adeffa7c6
[comedycentral] Modernize
2014-11-20 16:36:53 +01:00
Philipp Hagemeister
b244b5c3f9
remove unused imports
2014-11-20 16:36:13 +01:00
Philipp Hagemeister
f42c190769
[stanfordoc] Modernize
2014-11-20 16:34:54 +01:00
Philipp Hagemeister
5239075bb6
[mtv] Return a proper playlist result ( #4254 )
2014-11-20 16:25:19 +01:00
Philipp Hagemeister
aff2f4f4f5
[arte] Clean up format sorting mess
...
We now use our standard sorting facilities. As a side effect, it's finally possible to download German videos from French URLs and vice versa.
2014-11-20 12:06:35 +01:00
Naglis Jonaitis
480b7c32a9
[rtlxl] Fix format order
2014-11-19 01:21:02 +02:00
Naglis Jonaitis
37eddd3143
[rtlxl] Use m3u8 streams instead of f4m ( #4115 , #4118 )
2014-11-19 00:26:44 +02:00
Will Sewell
02a12f9fe6
[vk] date_added is now extracted from the video page.
2014-11-18 20:19:56 +00:00
Will Sewell
6fcd6e0e21
[vk] Updated the regex for matching user video pages. It now matches optional URL parameters too.
2014-11-18 19:34:12 +00:00
Philipp Hagemeister
0857baade3
[youtube] Add webm audio formats ( Fixes #4229 )
2014-11-18 11:08:37 +01:00
Will Sewell
469d4c8968
[vk] Added a new information extractor for pages that are a list of a user\'s videos on vk.com. It works in a same way to playlist style pages for the YT information extractors.
2014-11-17 17:53:34 -05:00
Philipp Hagemeister
23ad44b57b
[youtube] Better error message for DASH manifest
2014-11-17 20:12:52 +01:00
Philipp Hagemeister
6a68bb574a
[eporner] Fix duration ( Closes #4188 )
2014-11-16 14:55:22 +01:00
Philipp Hagemeister
2707b50ffe
[spiegel] Correct handling of redirects to spiegel.tv ( Closes #4211 )
2014-11-16 00:51:31 +01:00
Philipp Hagemeister
939fe70de0
[spiegeltv] Match hash-style URLs ( Closes #4210 )
2014-11-16 00:40:09 +01:00
Philipp Hagemeister
89c15fe0b3
[spiegeltv] Modernize
2014-11-16 00:33:51 +01:00
Naglis Jonaitis
8caa0c9779
[bliptv] Fix the resolve of lookup ID ( Closes #4197 )
2014-11-15 16:56:04 +02:00
Philipp Hagemeister
bbefcf04bf
[goldenmoustache] Fix title ( Closes #4203 )
2014-11-15 15:21:34 +01:00
Philipp Hagemeister
00d9ef0b70
[mailru] Adapt to new data format ( Fixes #4201 )
2014-11-15 11:01:17 +01:00
Philipp Hagemeister
0cc8888038
[crunchyroll] Remove NOP code ( #2782 )
2014-11-15 00:34:03 +01:00
Jaime Marquínez Ferrándiz
71f8c7ce7a
[mtvservices:embedded] Improve config url ( fixes #4092 )
2014-11-14 19:02:18 +01:00
Jaime Marquínez Ferrándiz
5fee0eeac0
[ComedyCentralShows] Use the rtmp urls transform function from the MTV IE ( fixes #3364 )
...
It produces the right mp4 urls, so we stop prefering the rtmp urls.
2014-11-14 18:36:04 +01:00
Philipp Hagemeister
609a61e3e6
[npo] Improve npo.nl ( Fixes #4173 )
2014-11-13 16:28:05 +01:00
Philipp Hagemeister
af63fed7d8
[generic] Add support for livestream embeds ( Fixes #4185 )
2014-11-13 16:12:51 +01:00
Philipp Hagemeister
3deed1e91a
[freevideo] Simplify and raise error for foreigners ( Fixes #4131 )
2014-11-13 15:59:22 +01:00
Philipp Hagemeister
11b28e93d3
Merge remote-tracking branch 'yaccz/add-extractor/freevideo'
2014-11-13 15:53:16 +01:00
Philipp Hagemeister
3fa5bb3802
[sexu] Modernize ( #4171 )
2014-11-13 15:20:49 +01:00
Philipp Hagemeister
c47ec62b83
Merge remote-tracking branch 'peugeot/sexu'
2014-11-13 15:18:38 +01:00
Philipp Hagemeister
e4bdb37ec6
[spiegel] Add support for embeds
2014-11-13 15:02:31 +01:00
Philipp Hagemeister
0e15e725a0
[spiegel] Modernize
2014-11-13 14:45:17 +01:00
peugeot
437f68d868
Update sexu.py
2014-11-13 14:02:53 +01:00
peugeot
d91d124081
fix python 2 test
2014-11-13 13:57:10 +01:00
Aaron Wojnowski
894dd8682e
Fix YouTube signature extraction.
2014-11-13 00:33:27 -06:00
Jaime Marquínez Ferrándiz
9e05d039e0
[dailymotion] Fix extraction of vevo videos ( fixes #4168 )
2014-11-12 23:32:27 +01:00
peugeot
bbd5f2de5e
[sexu] initial support
2014-11-12 20:41:13 +01:00
Naglis Jonaitis
73689dafbf
[tvplay] Fix f4m URL extraction ( Closes #4119 )
...
Add query parameters which are needed by AkamaiHD F4M player.
Also, modernize a bit.
2014-11-12 19:26:00 +02:00
Philipp Hagemeister
5ccaddf5b1
[goldenmoustache] Simplify ( #4128 )
2014-11-12 15:36:59 +01:00
Philipp Hagemeister
0b201a3134
Merge remote-tracking branch 'xantares/goldenmoustache'
2014-11-12 15:34:31 +01:00
Philipp Hagemeister
ffe38646ca
[funnyordie] Remove test md5sum ( Fixes #4113 )
2014-11-12 15:33:15 +01:00
Michael Käufl
732c848c14
[abc] Update test case
...
Old video has expired.
2014-11-12 15:26:29 +01:00
Michael Käufl
9d2a4dae90
[allocine] Update test
2014-11-12 15:26:09 +01:00
Michael Käufl
7009a9047a
[byutv] Update test
2014-11-12 15:24:37 +01:00
Philipp Hagemeister
28465df1ff
[youjizz] Modernize ( #4131 )
2014-11-12 15:19:23 +01:00
Philipp Hagemeister
ef89dba58f
[myspass] Modernize test case
2014-11-12 15:01:52 +01:00
Philipp Hagemeister
13ba3a6461
[bandcamp:album] Fix test case
2014-11-12 15:00:54 +01:00
Jaime Marquínez Ferrándiz
eb4cb42a02
[ted] Extract duration ( closes #4155 )
2014-11-12 09:30:57 +01:00
Pascal Brax
2774852c2f
Fix MTV/GameTrailers "Bad Request" error
...
Bugfix for bug #4123 & #4153
2014-11-12 01:10:08 +01:00
Naglis Jonaitis
bbcc21efd1
[wrzuta] Fallback to mp3 on unknown media type ( #4156 )
2014-11-11 16:47:54 +02:00
Naglis Jonaitis
60526d6bcb
[wrzuta] Fix audio extension lookup ( Closes #4156 )
...
Also, replace deleted test case
2014-11-11 16:23:06 +02:00
Philipp Hagemeister
a1cf99d03a
[YoutubeDL] Add playlist_id and playlist_title fields ( Fixes #4139 )
2014-11-09 22:32:35 +01:00
Naglis Jonaitis
3c6af203cc
[streamcloud] Match URLs without fname ( Closes #4144 )
...
Also, modernize a bit.
2014-11-09 22:00:51 +02:00
Naglis Jonaitis
1a92e086a7
[tapely] Add Referer header ( Closes #4138 )
2014-11-09 15:01:12 +02:00
Jaime Marquínez Ferrándiz
519c73f267
Merge pull request #4136 from andikmu/master
...
fix swrmediathek for new formats.
2014-11-09 12:17:18 +01:00
Jaime Marquínez Ferrándiz
a6dae6c09c
[ndr] Improve video url regex ( fixes #4140 )
2014-11-09 11:15:50 +01:00
Philipp Hagemeister
8bb9b97c97
Merge remote-tracking branch 'origin/master'
2014-11-09 08:30:12 +01:00
andi
d6fdc38682
fix swrmediathek for new formats.
2014-11-08 15:56:35 +01:00
Jaime Marquínez Ferrándiz
2fdbf27ad8
[niconico:playlist] Use the same video url the webpage uses ( closes #4133 )
2014-11-08 14:53:23 +01:00
yac
3898c8a7b2
[FreeVideo] Add new extractor
2014-11-08 00:13:28 +01:00
Naglis Jonaitis
29ed169cd6
[wrzuta] Add mp3 as a possible format ( Closes #4126 )
2014-11-07 22:53:54 +02:00
xantares
b868c972d1
Add support for goldenmoustache.com
2014-11-07 17:44:06 +00:00
Jaime Marquínez Ferrándiz
9908e03528
Merge pull request #4076 from ghedo/direct_type
...
[generic] indicate when a direct video has been extracted
2014-11-06 22:23:14 +01:00
Jaime Marquínez Ferrándiz
1fe8fb8c20
[vice] Re-add extractor ( fixes #4120 )
...
The generic extraction no longer works.
2014-11-06 21:44:07 +01:00
Naglis Jonaitis
5d63b0aa93
[goshgay] Fix title extraction and modernize
...
Also remove width and height as they are not of the actual video.
2014-11-06 01:19:20 +02:00
Philipp Hagemeister
4164f0117e
[utils] Remove unused import
2014-11-05 23:56:54 +01:00
Naglis Jonaitis
37aab27808
[brightcove] Extract m3u8 formats ( #3541 )
2014-11-06 00:14:33 +02:00
Jaime Marquínez Ferrándiz
6110bbbfdd
[niconico] Catch deleted videos ( closes #4064 )
2014-11-05 19:52:34 +01:00
Jaime Marquínez Ferrándiz
cde9b380e6
Merge pull request #4110 from nemunaire/channel9-fix
...
[channel9] Fix extraction
2014-11-05 19:03:24 +01:00
Sergey M․
dab647a7b6
[cinemassacre] Keep both extraction approaches and make more robust ( Closes #4109 )
2014-11-05 21:32:46 +07:00
nemunaire
a316a83d2b
[channel9] Fix extraction
2014-11-05 11:23:11 +01:00
Naglis Jonaitis
81b22aee8b
[izlesene] Update test cases and modernize
...
The timestamp fluctuates with DST.
2014-11-05 01:00:33 +02:00
Philipp Hagemeister
20436c30c9
[youtube] Clarify output
2014-11-04 23:35:34 +01:00
Philipp Hagemeister
11fba1751d
[imdb] Simplify
2014-11-04 23:26:23 +01:00
Philipp Hagemeister
9c3e870393
[gamespot] Remove unused import
2014-11-04 23:17:43 +01:00
Philipp Hagemeister
44789f2457
[ustream] Use modern helper function instead of old HTML parser
2014-11-04 23:15:16 +01:00
Philipp Hagemeister
711ede6e1b
[heise] Fix description, thumbnail and format ID
2014-11-04 23:14:16 +01:00
Philipp Hagemeister
a32f253112
[gamespot] Modernize
2014-11-04 23:04:12 +01:00
Philipp Hagemeister
94bd361318
[youtube] Skip sts if missing ( Fixes #4095 , fixes #4103 )
2014-11-04 22:45:43 +01:00
Philipp Hagemeister
acd40f64ed
[cnn] Modernize test definitions
2014-11-04 22:25:15 +01:00
Sergey M․
766306450d
[played] Capture and output error message
2014-11-04 17:34:53 +07:00
Sergey M․
e7642ab572
[wimp] Fix video URL regex
2014-11-04 17:13:17 +07:00
Naglis Jonaitis
bdf9701729
[generic/brightcove] Add a new test case for kijk.nl ( #3541 )
2014-11-03 23:13:46 +02:00
Naglis Jonaitis
b5af6fcdad
[brightcove] Make _VALID_URL less greedy and check for empty URLs ( #3541 )
2014-11-03 23:12:24 +02:00
Sergey M․
fdca55fe34
[trutube] Strip title
2014-11-03 20:14:18 +07:00
Philipp Hagemeister
8c25f81bee
[util] Move compatibility functions out of util
...
utils is large enough without these compatibility functions.
Everything that is present in newer versions of Python (i.e. with dev Python it's just an import) goes into compat.py .
Everything else (i.e. youtube-dl-specific helpers) goes into utils.py .
2014-11-02 11:23:42 +01:00
Sergey M․
d9116714f2
[cinemassacre] Fix extraction ( Closes #4083 )
2014-11-02 08:01:14 +07:00
Alessandro Ghedini
ccdd0ffb80
[generic] indicate when a direct video has been extracted
...
Fixes #4052 .
2014-11-01 15:34:00 +01:00
Sergey M․
5263cdfcf9
[generic] Improve MLB iframe regex
2014-11-01 04:01:58 +07:00
Sergey M․
b2a68d14cf
[mlb] Improve _VALID_URL ( Closes #4063 )
2014-11-01 04:01:18 +07:00
Sergey M․
6e1cff9c33
[canalplus] Improve and merge with d8 extractor
2014-10-31 21:54:30 +07:00
Sergey M․
72975729c8
[canalplus] Tweak extractor to support piwiplus ( Closes #4046 )
2014-10-31 20:19:30 +07:00
Sergey M․
d319948b6a
[funnyordie] Add articles URL test
2014-10-31 19:26:56 +07:00
anovicecodemonkey
2a834bdb21
[FunnyOrDie] Add support for "/articles/" URLs
2014-10-31 21:20:37 +10:30
Philipp Hagemeister
0d2c141865
[youtube] Detect formats 298 et al as mp4 ( Fixes #4066 )
2014-10-31 11:13:02 +01:00
Philipp Hagemeister
7b6de3728a
[youtube] Add format 266 ( Fixes #4055 )
2014-10-30 09:53:43 +01:00
Philipp Hagemeister
a51d3aa001
[youtube] Add support for formats 302 and 303 ( Fixes #4060 )
2014-10-30 09:43:11 +01:00
Philipp Hagemeister
2c8e03d937
Sort formats by fps as well
2014-10-30 09:40:52 +01:00
Philipp Hagemeister
fbb21cf528
[youtube] Add formats 298, 299 ( Fixes #4056 )
2014-10-30 09:34:13 +01:00
Naglis Jonaitis
b8a618f898
[ro220] Fix broken extractor and modernize ( #4054 )
2014-10-30 01:42:52 +02:00
Jaime Marquínez Ferrándiz
d65d628613
[crunchycroll] Fix building of ass subtitles (reported in #4019 )
...
Parse the xml document instead of using regexes, otherwise unicode characters are left unescaped.
2014-10-29 21:19:20 +01:00
Philipp Hagemeister
ac645ac7d0
[generic] Allow soundcloud embeds with additional attributes
2014-10-29 20:27:58 +01:00
Philipp Hagemeister
7d11297f3f
Merge branch 'master' of github.com:rg3/youtube-dl
2014-10-29 20:10:07 +01:00
Philipp Hagemeister
6ad4013d40
[drtv] Allow fractional timestamps ( Fixes #4059 )
2014-10-29 20:10:00 +01:00
Sergey M․
dbd1283d31
[naver] Capture and output error message ( #4057 )
2014-10-29 21:50:37 +07:00
Sergey M․
c451d4f553
[trutube] Fix extraction
2014-10-29 21:16:10 +07:00
Jaime Marquínez Ferrándiz
a9bad429b3
[niconico] Add extractor for playlists ( closes #4043 )
2014-10-29 11:04:48 +01:00
Philipp Hagemeister
50c8266ef0
Merge branch 'master' of github.com:rg3/youtube-dl
2014-10-28 23:40:44 +01:00
Philipp Hagemeister
00edd4f9be
[laola1tv] Mark as broken
...
When the f4m downloader gets live stream support, I expect this to work magically or with very minor changes.
2014-10-28 17:29:27 +01:00
Philipp Hagemeister
e5193599ec
[laola1tv] Add new extractor
...
The extractor works fine, but the f4m downloader cannot handle the resulting bootstrap information.
2014-10-28 16:51:34 +01:00
Philipp Hagemeister
01d663bca3
[auengine] Simplify
2014-10-28 15:51:15 +01:00
Sergey M․
e0c51cdadc
[vk] Generalize errors
2014-10-28 21:35:25 +07:00
Sergey M․
9334f8f17a
[vk] Handle deleted videos
2014-10-28 21:06:07 +07:00
Sergey M․
632256d9ec
[wimp] Update video URL regex
2014-10-28 20:35:02 +07:00
Philipp Hagemeister
9fdece5d34
[srmediathek] Choose variable name more wisely
2014-10-28 10:44:47 +01:00
Philipp Hagemeister
bbf1092ad0
[fktv] Remove unused import
2014-10-28 10:44:17 +01:00
Philipp Hagemeister
9ef55c5bbc
[quickvid] Add new extractor
2014-10-28 10:41:37 +01:00
Philipp Hagemeister
48a24ab746
[generic] Fix HTML5 video regexp
2014-10-28 10:41:24 +01:00
Philipp Hagemeister
27c542c06f
[iconosquare] Simplify
2014-10-28 09:12:28 +01:00
Philipp Hagemeister
8cc3eba79a
[phoenix] Add new extractor ( Fixes #4036 )
2014-10-27 02:43:59 +01:00
Philipp Hagemeister
b0fb6d4db1
[ku6] Modernize
2014-10-27 02:32:44 +01:00
Philipp Hagemeister
81515ad9f6
[extractor/common] Improve m3u8 output
2014-10-27 02:28:37 +01:00
Philipp Hagemeister
8112d4b284
[lrt] Modernize
2014-10-27 02:27:49 +01:00
Philipp Hagemeister
bf7aa6301b
[fktv] Modernize
2014-10-27 02:26:05 +01:00
Philipp Hagemeister
aea856621f
[zdf] Simplify
2014-10-27 02:14:07 +01:00
Philipp Hagemeister
f24a5a2faa
Merge remote-tracking branch 'olebowle/ard'
2014-10-27 01:36:50 +01:00
Philipp Hagemeister
ecfe623422
[heise] Fix extraction
...
Now they use an XML format instead of JSON.
2014-10-27 01:33:51 +01:00
Philipp Hagemeister
4a6c94288a
[kickstarter] Simplify and fix test case
2014-10-27 01:16:18 +01:00
Philipp Hagemeister
10e3d73472
[nbc] Fix ThePlatform embedded videos
2014-10-27 01:14:17 +01:00
Philipp Hagemeister
15956b5aa1
[promptfile] Fix check for deleted videos
2014-10-27 00:50:22 +01:00
Philipp Hagemeister
586f7082ef
[francetv] Remove changing md5sum
2014-10-27 00:46:34 +01:00
Philipp Hagemeister
d6d9186f0d
[generic] Fix test title
2014-10-27 00:45:15 +01:00
Philipp Hagemeister
2e9ff8f362
[gorillavid] Fix test title
2014-10-27 00:44:27 +01:00
Philipp Hagemeister
249efaf44b
[pornhub] Modernize and fix test definition
2014-10-27 00:33:35 +01:00
Philipp Hagemeister
8d32abff9e
[ruhd] Simplify
2014-10-27 00:20:54 +01:00
Philipp Hagemeister
94f052cbf4
[syfy] Remove test checksum
...
We have the minsize test now.
2014-10-27 00:19:15 +01:00
Philipp Hagemeister
446a03bd96
[ustream:channel] Change test playlist size (Seems to have been limited that way on the website as well)
2014-10-27 00:18:10 +01:00
Philipp Hagemeister
6009b69f81
[vgtv] Fix test title
2014-10-27 00:16:01 +01:00
Philipp Hagemeister
3d6047113c
[vgtv] Simplify
2014-10-27 00:14:52 +01:00
Philipp Hagemeister
9dec99303d
[vimeo:review] Fix test title
2014-10-27 00:13:40 +01:00
Philipp Hagemeister
7706927370
[vine:user] Adapt test to changed list size
2014-10-27 00:11:34 +01:00
Philipp Hagemeister
3adba6fa2a
[xtube] Fix test description
2014-10-27 00:08:37 +01:00
Philipp Hagemeister
f46a8702cc
[youtube:playlist] Fix test title
2014-10-27 00:06:47 +01:00
Philipp Hagemeister
8d11b59bbb
[ynet] Remove test md5sums
...
These fluctuate regularly.
2014-10-27 00:06:00 +01:00
Philipp Hagemeister
cf501a23d2
[srmediathek] Correct IE_NAME/IE_DESC
2014-10-26 23:23:53 +01:00
Philipp Hagemeister
2bcae58d46
[srmediathek] New extractor
2014-10-26 23:23:10 +01:00
Philipp Hagemeister
c9f08154a3
Remove unused imports
2014-10-26 23:13:42 +01:00
Philipp Hagemeister
526b276fd7
[faz] Modernize
2014-10-26 23:11:15 +01:00
Philipp Hagemeister
bfc2bedcfc
[youtube] Make confirm_age non-fatal ( #4042 )
2014-10-26 21:49:29 +01:00
Philipp Hagemeister
83855f3a1f
[livestream:original] Fix RTMP parameters ( Fixes #4040 )
2014-10-26 21:44:29 +01:00
Philipp Hagemeister
37d66e7f1e
[generic] Correct call to _webpage_read_full_content
2014-10-26 20:58:09 +01:00
Philipp Hagemeister
70b7e3fbb6
[generic] Add a test case for direct links with broken HEAD ( #4032 )
2014-10-26 20:49:51 +01:00
Jaime Marquínez Ferrándiz
579657ad87
[soundcloud] Set the 'webpage_url' field for each track
...
For playlists, YoutubeDL would set it to the playlist url.
2014-10-26 19:08:36 +01:00
Philipp Hagemeister
09e5d6a6e5
[crunchyroll:playlist] Simplify ( #3988 )
2014-10-26 17:28:09 +01:00
Philipp Hagemeister
274b12b5a8
Merge remote-tracking branch 'gabeos/crunchyroll-show-playlist'
2014-10-26 17:06:35 +01:00
Philipp Hagemeister
23be51d8ce
[generic] Handle audio streams that do not implement HEAD ( Fixes #4032 )
2014-10-26 17:05:44 +01:00
Philipp Hagemeister
a7e97f6db1
[generic] Allow new SWFObject()-style imports
...
This embed style is used on http://www.bitburger-open.de/ , but that is not included as a test case since the format is likely to be temporary.
2014-10-26 14:15:49 +01:00
Sergey M․
911344e5ac
[vrt] Improve extractor
2014-10-26 16:48:11 +07:00
dinesh
03936f6e6d
[BelgianNational] corrected indentation
2014-10-26 13:47:41 +05:30
dinesh
b13ccb1b87
[BelgianNational] New extractor added
2014-10-26 13:35:00 +05:30
Sergey M․
f64f8a4662
[sportbox] Remove view count
2014-10-26 08:00:01 +07:00
Jaime Marquínez Ferrándiz
681b9caa9c
[tumblr] Fix extraction ( fixes #4029 )
2014-10-25 22:42:56 +02:00
Jaime Marquínez Ferrándiz
0eb9fb9f24
[soundcloud] Modernize and fix tests
2014-10-25 22:32:01 +02:00
Naglis Jonaitis
9a76f416ce
[lrt] Updated test
2014-10-25 13:24:46 +03:00
Philipp Hagemeister
603821161f
Merge branch 'master' of github.com:rg3/youtube-dl
2014-10-25 09:55:05 +02:00
Philipp Hagemeister
d3c72db894
[audiomack] Simplify
2014-10-25 08:58:03 +02:00
Sergey M․
43d9718fb9
[nhl] Improve video URL extraction ( Closes #4013 )
2014-10-25 13:56:21 +07:00
Philipp Hagemeister
7fc54e5262
Merge remote-tracking branch 'xavierbeynon/audiomack'
2014-10-25 08:55:12 +02:00
xavier
d36cae46d8
Not directly calling soundcloud extractor anymore
2014-10-24 21:11:46 -05:00
xavier
fdfefa1b9c
Made changes per phihag
2014-10-24 21:07:01 -05:00
Philipp Hagemeister
c64ed2a310
[viddler] Use API
2014-10-25 00:11:12 +02:00
Philipp Hagemeister
cdc5cb7c2b
[hark] Modernize
2014-10-24 22:31:55 +02:00
Philipp Hagemeister
8efd06aa42
[motherless] Simplify
2014-10-24 19:53:48 +02:00
Filip B
7f9ced64cb
Add group videos support for motherless
...
Modified motherless regular expression.
Previously it matched only URLs like this:
motherless.com/ID
Now it also matches this:
motherless.com/g/group_name/ID
All tests including the newly added one passed.
2014-10-24 21:44:21 +04:00
Filip B
7608815cc2
Add another motherless test
...
This test is for videos posted in groups.
URL looks like this:
motherless.com/g/group_name/ID
which is basically the same as
motherless.com/ID
So far this test fails because I haven't improved the extractor yet.
2014-10-24 21:43:27 +04:00
Filip B
5823eda139
Fix motherless test 0
...
Apparently motherless no longer serves flv for that video (or maybe even
other videos). So I changed expected extension from flv to mp4 and
changed expected md5 accordingly.
2014-10-24 21:26:32 +04:00
Philipp Hagemeister
1ede5b2481
[glide] Simplify
2014-10-24 15:34:19 +02:00
Philipp Hagemeister
98e1d28982
Merge remote-tracking branch 'thornomad/glide'
2014-10-24 15:29:03 +02:00
Philipp Hagemeister
2c26df763c
[vidzi] Use proper test case and simplify ( #3989 )
2014-10-24 15:27:02 +02:00
Philipp Hagemeister
018e835594
[vidzi] Simplify
2014-10-24 15:17:17 +02:00
Philipp Hagemeister
e65e06fbe2
[vidzi] Correct order in imports ( #3989 )
2014-10-24 15:15:54 +02:00
winwon
95ee84421e
vidzi Add new extractor
2014-10-24 15:15:13 +02:00
Philipp Hagemeister
b5a14350b9
[bild] Simplify ( #3983 )
2014-10-24 15:10:32 +02:00
Philipp Hagemeister
8d81f872fb
Merge remote-tracking branch 'capital-G/master'
2014-10-24 15:02:50 +02:00
xavier
9e9bc793f3
Finished audiomack extractor
2014-10-23 23:54:59 -05:00
xavier
5c565ac9e7
Added init.py initializer
2014-10-23 16:58:11 -05:00
xavier
67500bf939
Initial version of audiomack.py
2014-10-23 16:55:39 -05:00
Philipp Hagemeister
b1edd7a48a
[crunchyroll] Correct parsing ( Fixes #4014 )
2014-10-23 23:25:02 +02:00
Jaime Marquínez Ferrándiz
2c63ccec78
[mitele] Fix on python 2.x
2014-10-23 21:26:48 +02:00
Philipp Hagemeister
f2f2c0c2c6
[generic] Allow --default-search without colon
2014-10-23 21:13:45 +02:00
Philipp Hagemeister
f3cd403c2b
[telecino] Add coding declaration
2014-10-23 20:21:27 +02:00
Jaime Marquínez Ferrándiz
ad5f53ac72
[telecinco] Add extractor ( closes #4005 )
...
It uses the same extraction process as mitele.es, but with a few small differences.
2014-10-23 20:08:55 +02:00
Sergey M․
75da98e9e1
[funnyordie] Fix extraction ( Closes #4011 )
2014-10-23 23:07:58 +07:00
Sergey M․
281d3f1d68
[generic/wistia] Improve regex
2014-10-23 23:03:07 +07:00
Sergey M.
6283c10b1c
Merge pull request #4009 from Dineshs91/thoughtworks
...
[thoughtworks] wistia support added
2014-10-23 22:59:53 +07:00
dinesh
85d7b76586
[thoughtworks] wistia regex modified
2014-10-23 21:23:56 +05:30
Sergey M․
2399535fd1
[francetv] Lower preference of direct links ( Closes #4010 , closes #3947 )
...
Direct links fail with 403, fallback on f4m for now until further investigations.
2014-10-23 22:30:34 +07:00
dinesh
52cffcb186
[thoughtworks] wistia support added
2014-10-23 20:28:39 +05:30
Sergey M․
8f3b5397a7
[cinemassacre] Fix extraction ( Closes #4008 )
2014-10-23 21:35:51 +07:00
Sergey M․
9bbec55255
[pbs] Add support for tabbed frontline videos ( Closes #4006 )
2014-10-23 20:41:45 +07:00
Philipp Hagemeister
6b445558ff
[youtube] Only set language when necessary
...
We only need to set the language when we are using a login; otherwise it will always be English.
2014-10-23 00:44:22 +02:00
Ole Ernst
bfd91588f3
[ard] make rss match more universal
2014-10-22 14:24:53 +02:00
Sergey M․
6bf6962062
[francetv] Force m3u8 formats extension to mp4 ( Closes #3997 )
2014-10-22 01:24:04 +07:00
Sergey M․
40bca5f927
[arte.tv] Remove unused import
2014-10-21 21:06:24 +07:00
Sergey M․
74214d35c5
[arte.tv:+7] Improve title extraction ( Closes #3995 )
2014-10-21 20:08:20 +07:00
Gabriel Schubiner
1b10a011ec
Forgot to reverse extracted video urls so they are in correct order for video selection args
2014-10-20 18:38:42 -07:00
Sergey M․
d24a2b20b4
[arte.tv:+7] Use original format ids to avoid duplicates
2014-10-20 20:27:59 +07:00
Gabriel Schubiner
8230018c20
Added extractor for crunchyroll 'playlists' i.e. series. so that one can, e.g. download all episodes of a series
2014-10-19 22:47:05 -07:00
Jaime Marquínez Ferrándiz
cc98a3f096
[cnn] Fix for urls ending in '.cnn-ap' ( fixes #3985 )
2014-10-19 15:14:37 +02:00
scheiba
ce519b747e
added "bild.de" as extractor
2014-10-18 22:15:47 +02:00
Sergey M
16efb3695f
[sexykarma] Add support for watchindianporn
2014-10-19 01:53:15 +07:00
Sergey M
95fa5fb569
[sexykarma] Improve and simplify
2014-10-19 00:48:05 +07:00
Sergey M
77c3c5c5ed
Merge branch 'sexykarma' of https://github.com/CkuT/youtube-dl into CkuT-sexykarma
2014-10-19 00:06:53 +07:00
Sergey M
159444a668
[twitch] Remove superfluous comma
2014-10-18 21:57:24 +07:00
Sergey M․
f9befee1f5
[arte.tv:+7] Append media type to format_id ( Closes #3967 )
2014-10-18 18:14:49 +07:00
Naglis Jonaitis
9471c44405
[generic] Make sure Wistia embed URLs contain the protocol ( Closes #3977 )
...
Also, improve detection (Addresses #3662 )
2014-10-18 01:55:21 +03:00
Sergey M․
013bfdd84c
[twitch] Update tests and minor improvements
2014-10-17 23:46:53 +07:00
Sergey M․
46fd0dd5a5
[twitch] Rename extractor and support channel videos
2014-10-17 22:58:18 +07:00
Jaime Marquínez Ferrándiz
4698f0d858
[vimeo] Improve regex for the config js dict ( fixes #3955 , fixes #3974 )
...
The javascript code contains assignments of empty dicts with the same variable name
2014-10-17 15:55:58 +02:00
Sergey M․
355d074ff9
[twitch] Adapt to new API ( Fixes #3946 , Fixes #3949 , Fixes #3965 )
...
Work in progress
2014-10-16 22:23:35 +07:00
CkuT
7da224c907
Add categories
2014-10-15 22:34:35 +02:00
CkuT
1723edb1a5
Few improvements
2014-10-15 20:17:07 +02:00
CkuT
4740864508
[SexyKarma] Add new extractor
2014-10-15 18:24:32 +02:00
Philipp Hagemeister
09a42738fc
[generic] Correct handling of embedded vimeo players ( #3955 )
2014-10-15 13:50:53 +02:00
Jaime Marquínez Ferrándiz
a72cbfacf0
[ted] Add support for external videos ( fixes #3948 )
2014-10-15 12:24:11 +02:00
Philipp Hagemeister
62a164e713
[mixcloud] Output downloading progress
2014-10-15 00:53:54 +02:00
Sergey M․
5f58165def
[extractor/common] Fix dumping requests with long file abspath on Windows
2014-10-14 21:43:48 +07:00
Damon Timm
a86c73cf80
[glide] Add new extractor
...
Added an extractor for glide.me shared messages. Glide is a movile video messaging services. You can share the link to the messages easily enough and this would allow you to download and save the actual video.
2014-10-13 14:08:29 -07:00
Jaime Marquínez Ferrándiz
bd4e40df1a
[brightcove] Add a test for playlists
2014-10-13 16:26:53 +02:00
Sergey M․
1419fafd36
[condenast] Add support for embedded videos ( Closes #3929 )
2014-10-13 19:59:35 +07:00
Philipp Hagemeister
72961c2a8a
Merge remote-tracking branch 'Dineshs91/KontrTube-fix'
2014-10-13 10:09:57 +02:00
Philipp Hagemeister
4c1ce987b0
[huffpost] Modernize
2014-10-13 10:08:59 +02:00
dinesh
8a2300a597
[kontrtube] Fix video title extraction
2014-10-13 10:03:55 +05:30
Philipp Hagemeister
1cc887cbf0
[youtube] Add support for format 278
2014-10-13 00:09:19 +02:00
Philipp Hagemeister
203fb43f36
[youtube] Download DASH manifest by default ( Closes #3887 )
2014-10-13 00:03:08 +02:00
Naglis Jonaitis
23d83ad4d5
[niconico] Fix ignored --netrc flag
...
See issue #3753
2014-10-12 23:18:42 +03:00
dinesh
2c9f31188b
Description changed
2014-10-12 20:09:12 +05:30
Naglis Jonaitis
d18be55533
[theonion] Fix a small mistake in string formatting
2014-10-12 15:47:31 +03:00
Naglis Jonaitis
ac20fc047a
[theonion] Add new extractor ( closes #3928 )
2014-10-12 15:42:35 +03:00
Jaime Marquínez Ferrándiz
b4c3c8c172
[mixcloud] Fix metadata extraction ( fixes #3930 )
2014-10-12 13:06:31 +02:00
Jaime Marquínez Ferrándiz
3357110a4c
[vimeo] Make the protocol mandatory in the url ( fixes #3926 )
...
If it's missing, it will be correctly handled by the generic IE.
2014-10-11 22:26:26 +02:00
Sergey M.
e29fdedb45
Merge pull request #3923 from Dineshs91/howstuffworks-fix
...
Replace 404 url
2014-10-12 01:48:11 +07:00
Sergey M․
4828703f14
[googleplus] Modernize and extract all formats
2014-10-12 01:44:13 +07:00
dinesh
071420e136
Fix download error in GooglePlus
2014-10-11 21:10:53 +05:30
dinesh
f4cf848d1d
Replace 404 url
2014-10-11 15:59:42 +05:30
dinesh
1409704afa
Fix ndr.de outdated test url
2014-10-11 12:20:13 +05:30
Ole Ernst
3741302a10
[ard] Add rss support
2014-10-10 20:35:34 +02:00
Sergey M․
823f1e015a
[yahoo] Wipe out yahoo news extractor
2014-10-10 22:18:37 +07:00
Sergey M․
3c06d3715e
[yahoo] Generalize, support arbitrary subdomains, support iframe videos, capture error message ( Closes #2470 )
2014-10-10 22:11:30 +07:00
Sergey M․
762958d5af
[yahoo] Add support for regional subdomains and extract duration ( Closes #3915 )
2014-10-10 19:50:29 +07:00
Sergey M․
fc6861b175
[sportbox] Add extractor ( Closes #3906 )
2014-10-09 21:05:39 +07:00
Sergey M․
b097b5f246
[mlb] Remove unused import
2014-10-09 20:07:34 +07:00
Sergey M․
385009fc44
[mlb] Fix thumbnails extraction ( Closes #3905 )
2014-10-09 19:56:55 +07:00
Sergey M․
ced659bb4d
[generic] Ignore some non-video file extensions during generic extraction ( Closes #3900 )
2014-10-09 19:26:23 +07:00
Sergey M․
842cca7d56
[pornhd] Fix formats extraction ( Closes #3898 )
2014-10-08 20:08:29 +07:00
Sergey M․
7bc8780c57
[walla] Fix extractor and add subtitle tests
2014-10-07 22:23:05 +07:00
Sergey M․
c59c3c84ed
Merge branch 'walla' of https://github.com/lenaten/youtube-dl into lenaten-walla
2014-10-07 20:24:52 +07:00
net
31d06400ec
add missed init file
2014-10-06 03:03:05 +03:00
Philipp Hagemeister
b10609d98c
[dailymotion] Alternative title search ( Fixes #3882 )
2014-10-05 21:59:53 +02:00
Sergey M
3ae165aa10
[gorillavid] Add check for non existing videos
2014-10-06 01:48:01 +07:00
Sergey M
e4b85e35d0
[gorillavid] Fix title extraction and make thumbnail optional ( Closes #3884 )
2014-10-06 01:47:22 +07:00
Philipp Hagemeister
b81f484b60
[gorillavid] Add support for movpod.in ( Fixes #3881 )
2014-10-05 07:53:02 +02:00
Naglis Jonaitis
5e69192ef7
[thesixtyone] Add new extractor ( closes #3781 )
2014-10-04 22:40:36 +03:00
Sergey M․
f47754f061
[globo] Initial extractor implementation ( Closes #3823 )
2014-10-04 18:56:36 +07:00
Philipp Hagemeister
d838b1bd4a
[utils] Default age_limit to None
...
If we can't parse it, it means we don't have any information, not that the content is unrestricted.
2014-10-03 20:17:12 +02:00
Naglis Jonaitis
fe506288bd
[planetaplay] Add new extractor ( closes #3839 )
2014-10-03 19:43:36 +03:00
Sergey M․
d397c0b3dd
[breakcom] Extract all formats
2014-10-03 19:37:47 +07:00
Sergey M․
f78c01f68b
[breakcom] Cover more URLs with _VALID_URL ( Closes #3876 )
2014-10-03 18:57:18 +07:00
Naglis Jonaitis
8489578df4
[generic] Support embedded Dailymotion playlists ( fixes #3822 )
2014-10-02 21:42:45 +03:00
Sergey M․
d9bf465200
[bandcamp] Fix id extraction and modernize ( Closes #3866 )
2014-10-02 20:22:46 +07:00
Sergey M․
01384d6e4b
[jpopsuki] More modernize
2014-10-02 19:58:28 +07:00
Sergey M․
08d5230945
[jpopsukitv] Improve _VALID_URL and modernize
2014-10-02 19:43:25 +07:00
Sergey M.
852f8641e8
Merge pull request #3865 from diffycat/jpopsuki
...
[jpopsuki] Support category links
2014-10-02 19:38:29 +07:00
Jaime Marquínez Ferrándiz
18937a50a4
[dropbox] Fix the video url query ( fixes #3868 )
...
Previously it would convert urls without a query into 'something.mp4&dl=1'
2014-10-01 23:19:56 +02:00
net
e4d6cca0c1
[walla] Add new extractor
2014-10-01 23:45:35 +03:00
Anton Larionov
d5feab9aaa
[jpopsuki] Support category links
2014-10-01 23:24:23 +04:00
Naglis Jonaitis
9e77c60c9a
[tapely] Catch SoundCloud tracks
2014-10-01 21:53:45 +03:00
Naglis Jonaitis
1414df5ce2
[izlesene] Prepend scheme to thumbnails
2014-10-01 21:11:38 +03:00
Naglis Jonaitis
e80f40e5ca
[tapely] Add new extractor ( closes #3861 )
2014-10-01 17:26:09 +03:00
Sergey M․
d3c9af84fc
[spankwire] Fix extraction
2014-10-01 20:53:58 +07:00
Sergey M․
59d206ca2d
[sunporno] Fix duration extraction and make more robust
2014-10-01 20:44:43 +07:00
Philipp Hagemeister
e7b6d12254
[utils] Improve and test js_to_json
2014-10-01 00:08:34 +02:00
Philipp Hagemeister
07e764439a
[generic] Delete test case
...
The page is not available any more.
2014-10-01 00:08:19 +02:00
Naglis Jonaitis
f8fb4a7ca8
[nfl] Use compatible urlparse
2014-09-30 20:01:37 +03:00
Sergey M․
e497a7f2ca
[tvigle] Extract format file sizes
2014-09-30 20:00:21 +07:00
Sergey M․
a3b6be104d
[tvigle] Replace 404 test
2014-09-30 19:55:30 +07:00
Sergey M․
b7bb0df21e
[vgtv] Fix tests' exts
2014-09-30 19:50:14 +07:00
Naglis Jonaitis
4dc19c0982
[lrt] Add new extractor
2014-09-30 02:26:16 +03:00
Philipp Hagemeister
58ea7ec81e
[vimeo] Fix description extraction
2014-09-29 22:23:21 +02:00
Philipp Hagemeister
2d29ac4f23
[vuclip] Fix regexp
2014-09-29 21:48:44 +02:00
Philipp Hagemeister
a7a747d687
[vuclip] Remove test code
2014-09-29 21:47:57 +02:00
Sergey M․
fdb4d278bf
[spankwire] Fix extraction and modernize
2014-09-29 20:11:51 +07:00
Philipp Hagemeister
59c03a9bfb
[vuclip] Fix extraction
2014-09-29 13:07:58 +02:00
Philipp Hagemeister
e7db973328
[yahoo] Remove test case
...
This video seems to have been removed entirely
2014-09-29 12:45:57 +02:00
Philipp Hagemeister
99b67fecc5
[arte] Fix upload date extraction
2014-09-29 12:45:18 +02:00
Philipp Hagemeister
72d53356f6
[internetvideoarchive] Fix test case
2014-09-29 12:24:48 +02:00
Philipp Hagemeister
9e1e67fc15
[internetvideoarchive] Modernize
2014-09-29 12:23:52 +02:00
Philipp Hagemeister
1e60e5546e
[funnyordie] Fix test case md5
2014-09-29 12:20:25 +02:00
Philipp Hagemeister
457749a703
[prosiebensat1] Fix test case
2014-09-29 12:18:49 +02:00
Philipp Hagemeister
937f935db0
[jukebox] Remove md5 sum, it fluctuates
2014-09-29 12:15:49 +02:00
Philipp Hagemeister
80bcefcd77
[cliphunter] Remove duration
2014-09-29 06:22:54 +02:00
Philipp Hagemeister
8c23945c72
[eporner] Adapt to changed default format
2014-09-29 06:19:18 +02:00
Philipp Hagemeister
2a7b4681c6
[godtube] Fix on Python 2.6
2014-09-29 05:51:41 +02:00
Philipp Hagemeister
8157ae3904
[golem] Fix under 2.6
...
It's a sad story; 2.6 does not support any non-trivial xpaths.
2014-09-29 05:48:56 +02:00
Philipp Hagemeister
e50e2fcd4d
[br] fix test case
2014-09-29 05:40:20 +02:00
Philipp Hagemeister
5e4f06197f
[facebook] Fix test case
2014-09-29 05:19:56 +02:00
Philipp Hagemeister
761e1645e0
[generic] Remove unstable test checksum
2014-09-29 05:18:45 +02:00
Philipp Hagemeister
8ff14175e2
[sportdeutschland] Fix testcase
2014-09-29 05:17:16 +02:00
Philipp Hagemeister
dbe3043cd6
[ynet] Fix test checksums
2014-09-29 05:15:42 +02:00
Philipp Hagemeister
a8eb5a8e61
[generic] Fix testcases
2014-09-29 05:12:57 +02:00
Philipp Hagemeister
6043f1df4e
[ign] Return proper playlist object
2014-09-29 05:05:06 +02:00
Philipp Hagemeister
12548cd933
[worldstarhiphop] Correct title extraction
2014-09-29 05:02:58 +02:00
Philipp Hagemeister
2593039522
[vimeo] Use regexps to find description
...
This fixes descriptions on 2.6 and makes the code simpler.
2014-09-29 04:58:31 +02:00
Philipp Hagemeister
27aede9074
[pbs] Add support for series/jwplayer type video ( Fixes #3849 )
2014-09-29 04:48:50 +02:00
Philipp Hagemeister
a1f934b171
[youtube] Correct language cookie handling
2014-09-29 02:04:16 +02:00
Philipp Hagemeister
e2dce53781
[youtube] Always request webpage in English ( Fixes #3844 )
2014-09-29 01:39:26 +02:00
Philipp Hagemeister
1770ed9e86
[thvideo] Simplify ( #3848 )
2014-09-29 00:38:37 +02:00
Philipp Hagemeister
457ac58cc7
Merge remote-tracking branch 'diffycat/thvideo-update'
2014-09-29 00:36:55 +02:00
Philipp Hagemeister
9c44d2429b
[vimeo:likes] Support large like lists ( Fixes #3847 )
2014-09-29 00:36:06 +02:00
Anton Larionov
67077b182b
[thvideo] Add support for playlists
2014-09-28 23:36:55 +04:00