Saverr/svtplay-dl
1
0
Fork 0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-12-03 16:44:17 +01:00
Code Issues Projects Releases Wiki Activity
1,085 Commits 15 Branches 130 Tags 5.7 MiB
fb7d4dd1b9
Commit Graph

770 Commits

Author SHA1 Message Date
Johan Andersson
7d54cff825 subtitle_tt: rewrote the function. 
this fixes #111
 2014-07-09 18:39:18 +02:00
Johan Andersson
b8ae4e68ac svtplay: they started to add query string on their hds streams 2014-07-01 19:19:00 +02:00
Johan Andersson
9fe5f1792b ruv: update the service 2014-06-29 23:12:56 +02:00
Johan Andersson
e1915b6be2 viaplay: skip geoblock check if we see RTMP streams 2014-06-27 10:05:40 +02:00
Johan Andersson
4b9b40c9f4 output: better progress width handling 2014-06-26 22:55:54 +02:00
Johan Andersson
45e847d849 viaplay: dont override live flag 2014-06-26 22:16:18 +02:00
Johan Andersson
e19b9e6316 viaplay: debug lines.. 2014-06-26 22:12:16 +02:00
Johan Andersson
115ff10249 viaplay: support for viagame.com 2014-06-26 22:04:34 +02:00
Johan Andersson
9a7378f32d viaplay: error handling when xml filename is f4m file 2014-06-26 22:04:16 +02:00
Johan Andersson
eb762b8084 viaplay: support for HLS with better quality 2014-06-26 21:52:32 +02:00
Johan Andersson
eeb8d39599 expressen: they changed some things again. 
Adding support for HLS and RTMP
 2014-06-26 21:13:15 +02:00
Johan Andersson
0caf19b309 main: better help text for live flag. 2014-06-24 22:56:12 +02:00
Johan Andersson
402fca5bfc get_one_media: display error message when we can’t find any videos. 2014-06-23 21:24:34 +02:00
Johan Andersson
507cf21e3d tv4play: hds live videos looks a bit different from vod hds. 2014-06-23 21:22:26 +02:00
Johan Andersson
abaf1e19a9 viaplay: use data-video-id instead of data-emediate-video_id. 
based on a fix by @magic75 and this fixes #108
 2014-06-22 22:46:00 +02:00
Johan Andersson
b4638d0bb7 get_one_media: show an error message when we cant find any streams 2014-06-18 21:10:05 +02:00
Johan Andersson
cdf9216694 hlsparse: get the full url to playlists 2014-06-18 21:02:03 +02:00
Johan Andersson
0b230d66b6 Makefile: Add subtitle to PACKAGES. 
This fixes #104
 2014-06-14 14:38:21 +02:00
Johan Andersson
bddcbabd0b subtitle_wsrt: it should be --> and not -> 2014-06-07 21:56:28 +02:00
Johan Andersson
f5635980ec kanal5: we have this in a other place now 2014-06-07 20:59:42 +02:00
Johan Andersson
6d6760df18 nrk: remove obsolete options.hls 2014-06-07 20:48:54 +02:00
Johan Andersson
3f4bdd58d8 service: copy options to fetcher 2014-06-07 20:48:54 +02:00
Johan Andersson
e94f2a74b7 subtitle_wrt: set the right variable to True. 2014-06-07 18:54:51 +02:00
Johan Andersson
53b521248f subtitle_wsrt: subtract 10 hours when it begins at >9 hours. 
This fixes #101
 2014-06-07 18:51:29 +02:00
Johan Andersson
4b06a32753 tests: update the path to timestr 2014-06-03 16:40:19 +02:00
Johan Andersson
95aac29eb1 tv4play: we don’t support drm protected files 2014-06-03 16:25:31 +02:00
Johan Andersson
5d46c53d7f viaplay: check for data-emeidate-video_id first. 2014-06-02 22:13:11 +02:00
Johan Andersson
b8b97d40b4 viaplay: use data-emediate-video_id instead of data-link 2014-06-02 22:11:07 +02:00
Johan Andersson
245f4517fa viaplay: don’t import hdparse two times. 2014-06-02 21:54:18 +02:00
Johan Andersson
d66164f920 dr.dk: support for the new site. 2014-06-02 21:43:22 +02:00
Johan Andersson
4c83522225 lemonwhale: convert into new video fetcher 2014-06-02 21:43:02 +02:00
Johan Andersson
e87c236c51 option to choose which download method is preferred. 2014-06-02 21:27:51 +02:00
Johan Andersson
fe463a1567 viaplay: forgot else after that f4m fix. 2014-06-02 21:27:51 +02:00
Johan Andersson
92ef824fef viaplay: support for hds streams. 2014-06-02 21:27:51 +02:00
Johan Andersson
b3ce95bdb1 svtplay: Unused import HDS 2014-06-02 21:27:51 +02:00
Johan Andersson
663e69eca6 hls: Unused import select_quality 2014-06-02 21:27:51 +02:00
Johan Andersson
5c190169f2 http: complain when the file exists 2014-06-02 21:27:51 +02:00
Johan Andersson
6e037c53d7 rtmp: complain when the file exists 2014-06-02 21:27:51 +02:00
Johan Andersson
9bbf861e1b hls: complain when the file exists 2014-06-02 21:27:50 +02:00
Johan Andersson
ea9bd80356 hds: complain when the file exists 2014-06-02 21:27:50 +02:00
Johan Andersson
c606b9b031 hds: we don't need select_quality anymore inside this class. 2014-06-02 21:27:50 +02:00
Johan Andersson
3398c8f14c get_one_media: force stop when --force-subtitle is used 2014-06-02 21:27:50 +02:00
Johan Andersson
a38a077af5 svtplay: only yield when have have a subtitle. 2014-06-02 21:27:50 +02:00
Johan Andersson
dbf320d9be subtitle: we only need one save function. 2014-06-02 21:27:50 +02:00
Johan Andersson
30798c900a vimeo: use bitrate instead of height 2014-06-02 21:27:50 +02:00
Johan Andersson
79dd600397 tv4play: hdsparse support 2014-06-02 21:27:50 +02:00
Johan Andersson
70f7ca72b7 nrk: hdsparse support 2014-06-02 21:27:50 +02:00
Johan Andersson
ac69ecedf0 hds: left over cruft 2014-06-02 21:27:50 +02:00
Johan Andersson
2eb9af443a select_qualtiy: it wants ints. 2014-06-02 21:27:50 +02:00
Johan Andersson
383c0650d7 hds: parse and kwargssupport 2014-06-02 21:27:50 +02:00
Johan Andersson
218f61b95d justin: we don't want to return false here. 2014-06-02 21:27:50 +02:00
Johan Andersson
a857f1d906 get_one_media: select quality 2014-06-02 21:27:50 +02:00
Johan Andersson
4265d1222b hls: we select quality before we go here. 2014-06-02 21:27:50 +02:00
Johan Andersson
8ef2e2454a hls: use bandwidth instead of resolution now. 2014-06-02 21:27:50 +02:00
Johan Andersson
83b120ef9a tv4play: right value for rtmp path 2014-06-02 21:27:50 +02:00
Johan Andersson
188e47517c services: parse hls playlist first. 2014-06-02 21:27:50 +02:00
Johan Andersson
28a918fa7b HLS: export resolution. 2014-06-02 21:27:49 +02:00
Johan Andersson
8538496d66 subtitle: bad indentation. 2014-06-02 21:27:49 +02:00
Johan Andersson
df6d64d218 Unused import select_quality 2014-06-02 21:27:49 +02:00
Johan Andersson
f5cf37c4a9 remove old subtitle functions from kanal5 and svtplay 2014-06-02 21:27:49 +02:00
Johan Andersson
895623f601 __init__: support for yield 2014-06-02 21:27:49 +02:00
Johan Andersson
8f715bd278 subtitle_tt cosmetics. 2014-06-02 21:27:49 +02:00
Johan Andersson
28bc0f3389 viaplay: yield the subs 2014-06-02 21:27:49 +02:00
Johan Andersson
4e69ebdf39 utils: forgot to remove the subtiles from the old file 2014-06-02 21:27:49 +02:00
Johan Andersson
9591e99e19 tv4play: yield the subs 2014-06-02 21:27:49 +02:00
Johan Andersson
6a02d39ae3 urplay: yield the subs 2014-06-02 21:27:49 +02:00
Johan Andersson
4c50978acf svtplay: yield the subs 2014-06-02 21:27:49 +02:00
Johan Andersson
994e9832fb nrk: yield the subs 2014-06-02 21:27:49 +02:00
Johan Andersson
a374a55c21 kanal5: yield the subs 2014-06-02 21:27:49 +02:00
Johan Andersson
93596eccad Move subtitles into its own file 2014-06-02 21:27:49 +02:00
Johan Andersson
24cdfdcc31 svtplay: it should be elif and not if 2014-06-02 21:27:49 +02:00
Johan Andersson
c734591b8e radioplay: convert into new video fetcher 2014-06-02 21:27:49 +02:00
Johan Andersson
f85afbf095 urplay: convert into new video fetcher 2014-06-02 21:27:49 +02:00
Johan Andersson
50dfb1c159 aftonbladet: convert into new video fetcher 2014-06-02 21:27:49 +02:00
Johan Andersson
3124e4796e svtplay: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
47818019ab justin: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
42e82b88c9 hbo: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
452237942e expressen: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
0bebc2290e dr: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
3d81c70f53 bambuser: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
2249196f30 kanal5: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
6cbc1fd503 mtvservices: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
a4d33a6d44 nrk: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
713e4d59c6 picsearch: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
d1d2c091ce qbrick: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
672cf338ff tv4play: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
474987309d ruv: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
00b1627491 sr: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
8fb6f7f15f viaplay: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
ecb84858fe vimeo: convert into new video fetcher 2014-06-02 21:27:48 +02:00
Johan Andersson
330d7dd925 fetcher: convert to VideoRetriever 2014-06-02 21:27:48 +02:00
Olof Johansson
79f1ea04be hls: don't output progressbar if --silent 2014-05-03 17:58:10 +02:00
Olof Johansson
a9ef1e6cfa hds: don't output progressbar if --silent 2014-05-03 17:57:53 +02:00
Olof Johansson
24750ed1d6 Print newline after Ctrl+C 
Fixes #93.
 2014-05-02 12:07:37 +02:00
Johan Andersson
e986f44581 lemonwhale: svd.se have changed provider for videos. 2014-05-01 23:18:04 +02:00
Olof Johansson
86576128d5 Add initial unittests for expressen 2014-05-01 22:44:38 +02:00
Olof Johansson
c72294c422 Refactor handles URLs tests to mixin 2014-05-01 22:43:36 +02:00
Johan Andersson
b72211b6f9 hls: move live check to the beginning of the function 2014-05-01 22:11:54 +02:00
Johan Andersson
134dcb1367 aftonbladet: they changed how hls works. 2014-05-01 22:11:54 +02:00
Johan Andersson
ad7cdb4265 hls: a way to skip the first playlist with bandwidth info 2014-05-01 22:11:54 +02:00
Olof Johansson
30fdeef25d Real fix for oppetarkiv pylint error 
Silly me. :(
 2014-05-01 22:01:09 +02:00
Olof Johansson
09834ebe3a Fix minor pylint warnings in expressen fetcher 2014-05-01 21:59:51 +02:00
Olof Johansson
0abeffdbc1 Adapt Expressen fetch to changes to website 
Now Expressen is using HLS.
 2014-05-01 21:55:52 +02:00
Olof Johansson
10e7188687 Fix bug caught by pylint in oppetarkiv fetcher 2014-05-01 21:55:29 +02:00
Johan Andersson
d2068050b4 picsearch: They have two ways to write mediaId and media-id. 
this fixes #94
 2014-05-01 21:10:25 +02:00
Olof Johansson
5deeb84fc9 Break out OppetArkiv to subclass of Svtplay 2014-05-01 20:07:55 +02:00
Johan Andersson
8225cff429 option to choose which download method is preferred. 2014-05-01 17:13:46 +02:00
Johan Andersson
924cca1380 viaplay: forgot else after that f4m fix. 2014-05-01 17:06:24 +02:00
Johan Andersson
c2a389841f viaplay: forgot else after that f4m fix. 2014-05-01 17:04:08 +02:00
Johan Andersson
5e47b7bc26 viaplay: support for hds streams. 2014-05-01 16:52:05 +02:00
Johan Andersson
28a1d4deaf viaplay: move subtitle force thing before download_hds 2014-05-01 16:47:51 +02:00
Johan Andersson
ea45d78dad viaplay: some of their streams are HDS 
this fixes #90
 2014-05-01 16:44:36 +02:00
Johan Andersson
a80786183a svtplay: Unused import HDS 2014-04-27 20:48:13 +02:00
Johan Andersson
2b34b0ff15 hls: Unused import select_quality 2014-04-27 20:47:56 +02:00
Johan Andersson
c35ca5780f http: complain when the file exists 2014-04-27 16:13:07 +02:00
Johan Andersson
8b93f902a7 rtmp: complain when the file exists 2014-04-27 16:12:58 +02:00
Johan Andersson
ea96cd165b hls: complain when the file exists 2014-04-27 16:12:46 +02:00
Johan Andersson
cb579828f5 hds: complain when the file exists 2014-04-27 16:12:38 +02:00
Johan Andersson
3a3fbaaf63 hds: we don't need select_quality anymore inside this class. 2014-04-27 16:01:26 +02:00
Johan Andersson
4a7a72f6e7 get_one_media: force stop when --force-subtitle is used 2014-04-27 16:00:57 +02:00
Johan Andersson
32fbe5051f svtplay: only yield when have have a subtitle. 2014-04-27 15:36:57 +02:00
Johan Andersson
ee2b032c51 subtitle: we only need one save function. 2014-04-27 15:33:05 +02:00
Johan Andersson
cd6efcda43 vimeo: use bitrate instead of height 2014-04-27 13:38:32 +02:00
Johan Andersson
8d31431611 tv4play: hdsparse support 2014-04-27 13:24:53 +02:00
Johan Andersson
6c229c77f9 nrk: hdsparse support 2014-04-27 13:24:44 +02:00
Johan Andersson
d880ba4d1a hds: left over cruft 2014-04-27 13:22:02 +02:00
Johan Andersson
1f6d4fe8e1 select_qualtiy: it wants ints. 2014-04-27 13:19:56 +02:00
Johan Andersson
6be0efa655 hds: parse and kwargssupport 2014-04-27 13:19:34 +02:00
Johan Andersson
0dfc9598da justin: we don't want to return false here. 2014-04-27 10:43:49 +02:00
Johan Andersson
69b28712b3 get_one_media: select quality 2014-04-27 10:43:26 +02:00
Johan Andersson
850eabf276 hls: we select quality before we go here. 2014-04-27 10:42:13 +02:00
Johan Andersson
e53142b02c hls: use bandwidth instead of resolution now. 2014-04-27 10:41:20 +02:00
Johan Andersson
c8ee46fd6f tv4play: right value for rtmp path 2014-04-27 09:11:58 +02:00
Johan Andersson
305ecf75a8 services: parse hls playlist first. 2014-04-27 09:11:58 +02:00
Johan Andersson
15e8fc94b7 HLS: export resolution. 2014-04-27 09:11:58 +02:00
Johan Andersson
4afd897a71 subtitle: bad indentation. 2014-04-27 09:11:58 +02:00
Johan Andersson
db8a50131b Unused import select_quality 2014-04-27 09:11:58 +02:00
Johan Andersson
179689ad19 remove old subtitle functions from kanal5 and svtplay 2014-04-27 09:11:58 +02:00
Johan Andersson
8acc75999a __init__: support for yield 2014-04-27 09:11:57 +02:00
Johan Andersson
e2051436d0 subtitle_tt cosmetics. 2014-04-27 09:11:57 +02:00
Johan Andersson
d1e0757dd4 viaplay: yield the subs 2014-04-27 09:11:57 +02:00
Johan Andersson
89567e297f utils: forgot to remove the subtiles from the old file 2014-04-27 09:11:57 +02:00
Johan Andersson
7600da2299 tv4play: yield the subs 2014-04-27 09:11:57 +02:00
Johan Andersson
328f01d2f2 urplay: yield the subs 2014-04-27 09:11:57 +02:00
Johan Andersson
ee5c8cde3c svtplay: yield the subs 2014-04-27 09:11:57 +02:00
Johan Andersson
ac17851fa9 nrk: yield the subs 2014-04-27 09:11:57 +02:00
Johan Andersson
e9792c629a kanal5: yield the subs 2014-04-27 09:11:57 +02:00
Johan Andersson
69505e5e08 Move subtitles into its own file 2014-04-27 09:11:57 +02:00
Johan Andersson
e35e3c6932 svtplay: it should be elif and not if 2014-04-27 09:11:57 +02:00
Johan Andersson
153615e918 radioplay: convert into new video fetcher 2014-04-27 09:11:57 +02:00
Johan Andersson
8864d916ae urplay: convert into new video fetcher 2014-04-27 09:11:57 +02:00
Johan Andersson
388ab9486c aftonbladet: convert into new video fetcher 2014-04-27 09:11:57 +02:00
Johan Andersson
2c94002f46 svtplay: convert into new video fetcher 2014-04-27 09:11:57 +02:00
Johan Andersson
d8751b97d9 justin: convert into new video fetcher 2014-04-27 09:11:57 +02:00
Johan Andersson
4f1bee49a6 hbo: convert into new video fetcher 2014-04-27 09:11:56 +02:00
Johan Andersson
65576df0d3 expressen: convert into new video fetcher 2014-04-27 09:11:56 +02:00
Johan Andersson
28d8f453c8 dr: convert into new video fetcher 2014-04-27 09:11:56 +02:00
Johan Andersson
30e23c171d bambuser: convert into new video fetcher 2014-04-27 09:11:56 +02:00
Johan Andersson
5b5b039e9b kanal5: convert into new video fetcher 2014-04-27 09:11:56 +02:00
Johan Andersson
b07a16bf6f mtvservices: convert into new video fetcher 2014-04-27 09:11:56 +02:00
Johan Andersson
d78ced05d9 nrk: convert into new video fetcher 2014-04-27 09:11:56 +02:00
Johan Andersson
06d7da454f picsearch: convert into new video fetcher 2014-04-27 09:11:56 +02:00
Johan Andersson
b8752b7ae1 qbrick: convert into new video fetcher 2014-04-27 09:11:56 +02:00
Johan Andersson
efeaff58be tv4play: convert into new video fetcher 2014-04-27 09:11:56 +02:00
Johan Andersson
79a5e82370 ruv: convert into new video fetcher 2014-04-27 09:11:56 +02:00
Johan Andersson
f6898084a7 sr: convert into new video fetcher 2014-04-27 09:11:56 +02:00
Johan Andersson
e89f69e577 viaplay: convert into new video fetcher 2014-04-27 09:11:56 +02:00
Johan Andersson
341be4b8e7 vimeo: convert into new video fetcher 2014-04-27 09:11:56 +02:00
Johan Andersson
4c11d831b6 fetcher: convert to VideoRetriever 2014-04-27 09:11:56 +02:00
Johan Andersson
fb82005658 New version 0.9.2014.04.27 2014-04-27 09:06:47 +02:00
Johan Andersson
e05b1c2583 svtplay: basic svtflow.se support 2014-04-27 09:05:41 +02:00
Johan Andersson
a175a7410a Merge pull request #68 from olof/topic/justin_archive_content 
Support archived content from Justin/Twitch
 2014-04-27 09:05:28 +02:00
Johan Andersson
45f9d81007 svtplay: NoneType is not a valid execpt type. 2014-04-12 21:07:53 +02:00
Johan Andersson
d2185d35a9 urplay: find all episodes support. 2014-04-03 21:09:42 +02:00
Johan Andersson
cba3bed554 svtplay: all episodes for öppet arkiv. 2014-04-03 21:02:51 +02:00
Johan Andersson
9303550de1 tv4play: support for all episodes. 2014-04-03 19:52:51 +02:00
Johan Andersson
0a5f283475 Forgot to remove tab in __main__ 2014-04-02 20:14:38 +02:00
Johan Andersson
fd35357de0 We should catch KeyboardInterrupt in __init__.py 
We don't catch it if someone install it via setup.py with the old fix.
 2014-04-02 19:32:35 +02:00
Johan Andersson
5449e26766 New version 0.9.2014.04.01 2014-04-01 19:21:50 +02:00
Johan Andersson
2b111ecd9c picsearch: download_hls import is not used. 2014-03-31 23:05:37 +02:00
Johan Andersson
05972c7b43 picsearch: better error messages 2014-03-31 19:15:40 +02:00
Johan Andersson
0046d05987 qbrick: this code is not valid anymore 2014-03-31 14:07:32 +02:00
Johan Andersson
7685944bdf kanal5: dont override -l value 2014-03-26 22:47:30 +01:00
Johan Andersson
aad965b8b6 generic: replace & with & on svt.se 2014-03-25 20:22:21 +01:00
Johan Andersson
051565b2cf viaplay: support for all episodes 
This only works for latest season.
 2014-03-25 20:21:52 +01:00
Johan Andersson
24dd893fca picsearch: New service. 
DN.se is using picsearch now days instead of qbrick
 2014-03-25 15:37:41 +01:00
Johan Andersson
0659214816 get_one_media: This will fix #80. 
the problem is that c:\test will became c:_tab_est and that is a wrong
filename. because \t is tab.
 2014-03-24 21:54:03 +01:00
Johan Andersson
3dc633df12 subtitle: When we only see the name without extension, add .srt to it. 2014-03-21 21:01:00 +01:00
Johan Andersson
5e1e6dbbc9 subtitle: a way to download only subtitle. 2014-03-21 21:01:00 +01:00
Olof Johansson
cb710e6001 fetcher.http: send url to debug log before request 2014-03-19 23:30:24 +01:00
Olof Johansson
d6eba115ba justin: adjust error msg in case of type being unknown 2014-03-19 23:29:16 +01:00
Olof Johansson
2aae49003a justin: support archived content from twitch and justin 
Archive contents have URLs that look like justin.tv/<channel>/b/<id> and
twitch.tv/<channel>/b/<id>. Otherwise, the implementation is equivalent with
that of _get_video, which is now renamed to _get_chapter.

Closes #67.
 2014-03-19 23:28:42 +01:00
Olof Johansson
f5aceffad7 svtplay_dl: silence pylint warning when using % with log 2014-03-19 23:03:31 +01:00
Olof Johansson
0efff3c2fe Remove unused imports 2014-03-19 23:03:31 +01:00
Olof Johansson
1850c0473d service: silence unused-argument warning from pylint 
The options parameter is unused, but is part of the interface, so
we don't want to remove it.
 2014-03-19 23:03:28 +01:00
Olof Johansson
c906b989c2 justin: don't assume Exception has message attribute 
In Python3, the Exception class does not have a message attribute.
Stringifying the Exception object results in the same thing though,
and it works in both Python 2 and 3.
 2014-03-19 22:48:40 +01:00
Olof Johansson
b31f6f6d85 Add editor modelines 2014-03-19 22:45:19 +01:00
Johan Andersson
0f98db73a9 __main__: remove leftover tab from previous commit 2014-03-19 20:44:38 +01:00
Olof Johansson
20dcc5e3ce Catch KeyboardInterrupt to avoid traceback 
Fixes #75
 2014-03-17 17:47:54 +01:00
Johan Andersson
2cece32246 subtitle_sami: this fixes #74 2014-03-11 16:05:32 +01:00
Johan Andersson
81f1f49301 subtitle_json: fixing #73 2014-03-11 16:04:38 +01:00
Johan Andersson
368fa3c7ed Merge pull request #70 from olof/topic/viaplay_latest_ep_url 
viaplay: try harder when extracting video IDs
 2014-03-09 17:32:27 +01:00
Johan Andersson
e568bef14c viaplay: this fixes #69 because streams are using non-standard port. 2014-03-09 17:26:40 +01:00
Johan Andersson
4e83665af5 rtmp: show the command during verbose. 2014-03-09 16:51:14 +01:00
Olof Johansson
58140554c8 viaplay: try harder when extracting video IDs 
Before this change, the viaplay class would look for the video id only in the
URL. With this change, it will also look for it in the HTML document (after
fetching it) if it isn't in the URL. This makes svtplay-dl able to support
"latest episode" URLs, like:

    http://www.viasat4play.no/programmer/viva-la-bam

vs

    http://www.viasat4play.no/programmer/viva-la-bam/359853
 2014-03-09 16:27:06 +01:00
Johan Andersson
2d0a4f2beb qbrick: this will fix #72 2014-03-09 16:26:54 +01:00
Olof Johansson
316509de8e fetcher.rtmp: call rtmpdump with -V if verbose 
With this change, you can make rtmpdump verbose as well if you call svtplay-dl
with -v.
 2014-03-09 15:34:58 +01:00
Johan Andersson
ebbbef85c5 get_media: change order on Generic and service_handler 
Generic is now a fallback if we can't find any site that handles the url.
bonus with this is one less fetch of data at the beginning if we have
a site that handles that url.
 2014-02-23 11:52:22 +01:00
Anders Waldenborg
6799899bcf Add --all-episodes option (for svt only currently) 2014-02-18 19:00:20 +01:00
Anders Waldenborg
baa8d76551 Add get_urldata() method to service 
self.get_urldata() is eqivalent to get_http_data(self.url), but
also caches the data, so no additional requests are made if it
is called multiple times (e.g when grabbing title or downloading
thumbnail).

Generic().get(url) still causes it to be fetched an extra time.
 2014-02-18 19:00:20 +01:00
Anders Waldenborg
904e16d457 Split out opengraph getter to separate function 
...and add doctests
 2014-02-18 19:00:20 +01:00
Anders Waldenborg
5fe5eb40f2 Fix automatic filename generation when output is a directory 2014-02-18 18:59:18 +01:00
Johan Andersson
35827e7e6e New version 0.9.2014.02.15 2014-02-15 11:33:25 +01:00
Olof Johansson
f695063307 Reraise UIExceptions when called with --verbose 2014-02-11 18:46:54 +01:00
Olof Johansson
8e46384048 hds: Error on live streams 
This can be overriden using the --force flag.
 2014-02-11 18:46:53 +01:00
Olof Johansson
b9107b20b6 hls: Error on live streams 
This can be overriden using the --force flag, but the output may
be a bit disappointing --- only the current state of the HLS
playlist is downloaded, and no reload is attempted.
 2014-02-11 18:46:53 +01:00
Olof Johansson
045ef96252 logging: adjust message format, <level>: <message> 2014-02-11 18:46:53 +01:00
Olof Johansson
a89127c384 sr: add http scheme to url only if it's missing 2014-02-11 18:46:37 +01:00
Johan Andersson
0a88eb1009 svtplay: sometimes subtitleReferences is None 2014-02-11 18:16:26 +01:00
Johan Andersson
85e286937a Merge pull request #63 from olof/topic/twitch-fixes 
Add HLS support for Twitch/Justin
 2014-02-09 20:59:11 +01:00
Johan Andersson
c7634399a7 generic: detect embeded svtplay streams 2014-02-08 22:47:47 +01:00
Olof Johansson
3aef528b5d justin: Add HLS support 2014-02-08 17:40:25 +01:00
Olof Johansson
159d0d929d justin: refactoring 
Break out logic for video and channel fetching to functions and introduce a
JustinUrlException class, that represents faulty URLs.
 2014-02-08 17:40:25 +01:00
Olof Johansson
38b3c7820b hls: automatically detect baseurl 2014-02-08 17:40:25 +01:00
Olof Johansson
b50fd6b907 Fix pylint anomalous-backslash-in-string warnings 
Also, avoid having to escape " in strings by delimiting it with '
instead.
 2014-02-08 17:31:54 +01:00
Olof Johansson
e8dc4781db urllib: export quote (url encoding) 2014-02-08 17:10:58 +01:00
Johan Andersson
701ce4fcdc aftonbladet: support for the new site 2014-02-05 23:15:19 +01:00
Johan Andersson
a7b114398b kanal5: print error message when we see drm 2014-02-05 22:13:26 +01:00
Johan Andersson
05364d2f08 viaplay: some streams need live flag set 2014-02-05 22:03:16 +01:00
Johan Andersson
3ad91fcdf4 viaplay: support for tvplay.lv 2014-02-05 21:50:31 +01:00
Johan Andersson
16c7240f53 viaplay: print the geolock error message. 2014-02-05 21:46:19 +01:00
Johan Andersson
e26a32e140 sr: this will work with the new site from last year. 2014-02-05 21:34:58 +01:00
Johan Andersson
a3c74d2ac1 generic: support for embed bambuser streams 2014-02-05 20:43:28 +01:00
Johan Andersson
ab4d50beed bambuser: new service 2014-02-05 20:43:28 +01:00
Olof Johansson
d4b03b53af make: Make shebang line overrideable 2014-02-05 18:52:31 +01:00
Johan Andersson
1a329ecae7 qbrick: they are using space in the path. 2014-02-05 12:42:11 +01:00
Johan Andersson
3d44657775 viaplay: they changed the urls 
maybe look for a better way to detect the id?
 2014-02-05 12:28:10 +01:00
Johan Andersson
2844e0dc33 generic: detect embeded tv4play streams 2014-02-04 20:20:36 +01:00
Johan Andersson
a7c9043301 urplay: better handling for HD streams 2014-02-02 18:22:35 +01:00
Johan Andersson
fd5801965a viaplay: support for thumbnail 2014-01-26 01:54:20 +01:00
Johan Andersson
dfe756afe9 vimeo: support for thumbnail 2014-01-26 01:52:11 +01:00
Johan Andersson
f3ede2ae15 dr: support for thumbnail 2014-01-26 01:51:53 +01:00
Johan Andersson
b4238d708e nrk: support for thumbnail 2014-01-26 01:51:35 +01:00
Johan Andersson
ef3834dcfb nrk: better support for nrk.no 2014-01-26 01:50:54 +01:00
Johan Andersson
7c1320c366 nrk: support for domain tv.nrk.no 2014-01-26 01:27:45 +01:00
Johan Andersson
f37353deb0 qbrick: support for thumbnail. 2014-01-26 01:19:47 +01:00
Johan Andersson
77e2235b48 OpenGraphThumbMixin: more matches for this. 
I saw this variant on dn.se
 2014-01-26 01:19:17 +01:00
Johan Andersson
7010adc6e6 utils: use FIREFOX_UA in check_redirect 2014-01-25 23:53:09 +01:00
Anders Waldenborg
b1871b3834 Add --thumbnail 
Names thumbnails as $basename.tbn (Hi xbmc!)
 2014-01-25 22:57:50 +01:00
Anders Waldenborg
9804d80302 Split subtitle getting to separate method 2014-01-25 22:57:50 +01:00
Anders Waldenborg
f331a653b6 Move url to object attribute 2014-01-25 22:57:50 +01:00
Anders Waldenborg
231eaf00e6 Make Service.handles a classmethod 
This way it can be called without instantiating the class.
 2014-01-25 22:57:49 +01:00
Anders Waldenborg
dcf4c1bd23 Add doctests for new functions in utils 
The print call is there to make it py2/3 compatible (py2 adds u'' where py3 just adds '')
 2014-01-25 22:57:49 +01:00
Anders Waldenborg
9d3ffd07d8 Fix reverse logic in io 2014-01-25 22:57:49 +01:00
Anders Waldenborg
d6ab73679e Improve title to filename conversion. 
Does unicode NFD decomposition on the string before stripping non ascii chars.

This means that chars like 'ü' is decomposed into 'u' and '¨', which mean that
when non-ascii chars are dropped we will still keep the 'u'.

Fixes #60
 2014-01-25 22:57:37 +01:00
Anders Waldenborg
712901cc8e Decode html entities in title tag 2014-01-25 13:01:01 +01:00
Anders Waldenborg
0671b2418e Display http request urls and time with --verbose 2014-01-25 13:01:01 +01:00
Anders Waldenborg
06023e5b04 Add --verbose option 2014-01-25 13:01:01 +01:00
Anders Waldenborg
db426b804c Fix slow regex for grabbing title-tag. 
Changes regex to not allow matching overlapping matches, which
made compilation of the regex noticeable slow.
 2014-01-25 13:01:01 +01:00
Johan Andersson
560145a4ff New version 0.9.2014.01.18 
python3 support for HDS, more viaplay sites and hd support for urplay
 2014-01-18 18:56:17 +01:00
Johan Andersson
14b888b09e viaplay: support for tv[36]play.{dk,no,lv,ee,lt and viasat4play.no 2014-01-16 21:41:59 +01:00
Johan Andersson
7e591c2733 get_media: dont add options.output to tmp variable 2014-01-16 20:57:30 +01:00
Johan Andersson
b14ba49f74 get_media: output to dir and get automagic name again. 
removed it in f51d804d. but this one is better
 2014-01-16 19:46:28 +01:00
Johan Andersson
08be2f55cb svtplay: add support for beta.s.s 2014-01-16 12:33:54 +01:00
Johan Andersson
ec8fe2a5b9 tv4play: print error message when there is no streams 2014-01-15 19:21:05 +01:00
Johan Andersson
dcdfbd1e4e urplay: support for HD streams 2014-01-09 00:32:14 +01:00
Johan Andersson
e63e23bd70 urplay: missing imports 2014-01-08 23:36:57 +01:00
Johan Andersson
b5e67876c4 hds: python3 support 2014-01-07 20:52:03 +01:00
Johan Andersson
c24123dc61 service: missing urlparse for py3 2014-01-05 17:28:00 +01:00
Johan Andersson
89ab7259b7 New version with for urplay 2014-01-03 16:55:56 +01:00
Johan Andersson
2972555cbc urplay: forgot to remove old line.. 2014-01-03 16:53:48 +01:00
Johan Andersson
c7dfdcf6f5 New version with fixes for viaplay, urplay and dr. 2014-01-03 16:40:19 +01:00
Johan Andersson
21916bbf78 Merge pull request #58 from olof/topic/default_handles_method 
Refactor our handles() method to baseclass
 2014-01-03 07:10:32 -08:00
Johan Andersson
959c3ad599 get_media: with this it takes forever to get the titel. 2014-01-03 12:23:44 +01:00
Johan Andersson
a80a41974a urplay: it is not necessary to replace characters anymore 2014-01-03 12:15:21 +01:00
Olof Johansson
e838384c52 Support supported_domains regexp for services 
Lets services with more complex domains (like domains with language/country
codes) use a regular expressions that will match the supported domains for
the handles() method.
 2014-01-01 16:22:07 +01:00
Olof Johansson
436090ddf9 Rename Service's handle method to handles 
handle can be ambiguous (i.e, not a verb).

Signed-off-by: Olof Johansson <olof@ethup.se>
 2014-01-01 16:22:07 +01:00
Olof Johansson
9f9bcad0c7 Add default handle method in Service base class 
The default handle method will look for a supported_domains attribute
(a list), containing the supported domains. The subclassed service
class can of course override this if other means of determining support
is needded.
 2014-01-01 16:22:07 +01:00
Olof Johansson
dfeadd152c urplay: fix pylint warning (anomalous-backslash-in-string) 2014-01-01 16:21:35 +01:00
Olof Johansson
768558a0a6 justin: exit with failure if regexp does not match 
This change will avoid an ugly stacktrace, but the issue is still present. The
"real" error message won't be drowned out though.
 2014-01-01 16:06:54 +01:00
Johan Andersson
9345284547 Make pylint bit happier 2013-12-30 01:43:59 +01:00
Johan Andersson
9b5a67e874 dr: missing imports 2013-12-30 01:39:05 +01:00
Johan Andersson
cceb60f8b3 get_http_data: use space instead of tab one line 2013-12-30 01:37:13 +01:00
Johan Andersson
33bb2c5c13 Replace sys.version_info with pyX 2013-12-30 01:35:08 +01:00
Johan Andersson
b09fc7b319 get_media: remove html entities in titel 2013-12-30 01:12:38 +01:00
Johan Andersson
f51d804d4f get_media: options.output could never happen 2013-12-30 01:02:42 +01:00
Johan Andersson
e0e75f5116 rtmp: we always get an .flv file not mp4 2013-12-29 18:38:39 +01:00
Johan Andersson
ed7f18b2af viaplay: they use longer first dirname nowdays 2013-12-25 19:26:40 +01:00
Johan Andersson
af0bfdde00 viaplay: only match numeric id:s 2013-12-22 21:28:42 +01:00
Johan Andersson
14b93c0cef New version 
tv4play fixes
outputfilename fix when title tag is on more then one line.
 2013-12-11 17:25:53 +01:00
Johan Andersson
dbcf83e519 options: set default quality to 0 2013-12-11 17:22:46 +01:00
Johan Andersson
facfc6833b output: fixes a problem when title-tag is on multiple lines. 2013-12-11 17:19:15 +01:00
Johan Andersson
7ce8f4a8a2 tv4play: select mp4 for mediaformat 2013-11-17 13:32:33 +01:00
Johan Andersson
8071ca12a3 New version: svtplay and vimeo fixes 2013-11-15 00:27:49 +01:00
Johan Andersson
35c54623ad vimeo: don't depend on lxml now. 2013-11-14 22:56:32 +01:00
Johan Andersson
78e3da190f Merge pull request #55 from antoneliasson/master 
Fixed Vimeo module.
 2013-11-14 13:47:03 -08:00
Johan Andersson
8df8823893 svtplay: check for ?, if it exists remove it from json request. 2013-11-14 22:46:08 +01:00
Johan Andersson
26bd057689 svtplay: only check swf for rtmp stream 2013-11-14 22:44:46 +01:00
Johan Andersson
8535e6f106 generic: catch embed svt videos. 2013-11-14 22:43:39 +01:00
Anton Eliasson
3e8f8015bd Fixed Vimeo module. 
This introduces an external dependency for lxml (http://lxml.de/). The standard
library xml.etree doesn't support invalid XML and Vimeo's source is fairly
broken. There are several third party XML parsers so I just chose my favorite.
We might have been able to get away this time by using a regexp search but that
would have introduced brittle code instead.

I've also ripped out some old safeguards that didn't make sense anymore and
put the quality auto-selection code in a separate method. As the quality setting
on Vimeo is a string (hd, sd or mobile), we can't use
svtplay_dl.utils.select_quality which just picks the highest number in a list.

Signed-off-by: Anton Eliasson <devel@antoneliasson.se>
 2013-11-12 21:00:58 +01:00
Johan Andersson
50aab78454 New version with svtplay and subtitle_tt fix 2013-10-28 20:22:18 +01:00
Johan Andersson
4348b93167 subtitle_tt: urplay changed from dur till duration 2013-10-28 20:16:12 +01:00
Johan Andersson
dfcd714429 svtplay: replace some urlmatchning with urlparse 2013-10-21 14:01:52 +02:00
Johan Andersson
e3977bf524 New version 2013-10-14 20:24:18 +02:00
Johan Andersson
54ac6ccd3c hls: dont search for bandwidth at a fixed position. 
On svtplay they added subtitle info in the playlist.
Beacuse of that the script crashed when we tried to access it
 2013-10-14 20:18:09 +02:00
Johan Andersson
71b1b585d0 svtplay: fixing a regression from last version 2013-10-14 20:05:03 +02:00
Johan Andersson
d549f7c374 New version 2013-10-08 22:17:13 +02:00
Johan Andersson
0cec19b780 svtplay: correct condition for rtmp-streams 2013-10-08 18:36:23 +02:00
Johan Andersson
d3b181f90e svtplay: bring back rtmp support 2013-10-08 15:27:00 +02:00
Johan Andersson
f68d47bab8 nrk: subtitle support 2013-09-15 00:29:26 +02:00
Johan Andersson
8a72d889b8 subtitle_tt: make up an end time when it does not exists. 
In some streams end time does not exists.
so we make our own from beginning + duration.
 2013-09-15 00:28:23 +02:00
Johan Andersson
4d4e785dd5 dr.dk: News still use the old thing 2013-09-14 22:39:37 +02:00
Johan Andersson
5a3936b4f7 dr.dk: support for HLS 2013-09-14 22:13:34 +02:00
Johan Andersson
1ac99d5f73 dr.dk: Support for more qualities 2013-09-14 21:58:55 +02:00
Per Goransson
2b0998de30 BUG: make dr.dk work again 2013-09-14 19:03:50 +02:00
Johan Andersson
6f7cd4bcd0 get_media: Check for embed videos first. 
sydsvenskan.se are using qbrick for their own videos.
but they used tv4play.se for some videos ex: obama visit in sweden.
 2013-09-04 15:02:58 +02:00
Johan Andersson
545d78840b qbrick: support for automagic detect live videos. 2013-09-04 14:59:52 +02:00
Johan Andersson
90f26988ac qbrick: dn.se changed their site again. 2013-09-04 14:59:21 +02:00
Johan Andersson
08280809ad hls: simplify encrypted part 2013-09-03 19:10:07 +02:00
Johan Andersson
f918821145 New version with tv10 support 2013-09-03 14:55:46 +02:00
Johan Andersson
27779a62f6 viaplay: support for tv10play.se 2013-09-03 14:48:41 +02:00
Johan Andersson
3a2a6e8fcc new version 2013-08-31 11:01:37 +02:00
Johan Andersson
fcd83a2a61 justin: support for non-subscriber channels 2013-08-31 10:59:20 +02:00
Olof Johansson
b5c9339b2c hls: support keys over https as well as http 2013-08-29 20:46:02 +02:00
Johan Andersson
2bf02d1a2b utils: remove old comment 2013-08-15 16:36:38 +02:00
Johan Andersson
7ee2dd5c1e viaplay: new site update. 2013-08-15 14:20:02 +02:00
Johan Andersson
dcf140475d utils: refactor get_http_data 2013-08-13 20:06:46 +02:00
Johan Andersson
feb480a8f1 New version 2013-08-10 21:21:28 +02:00
Johan Andersson
24462e6545 bsd find need a path before expression 2013-08-10 20:50:52 +02:00
Johan Andersson
c33541ee87 viaplay: correct url to .swf file 2013-08-10 20:40:08 +02:00
Johan Andersson
b27fb86305 viaplay: support for live streams 2013-08-10 20:38:42 +02:00
Johan Andersson
979b8c43f7 subtitle_sami: remove an extra space in the beginning 2013-08-10 20:29:06 +02:00
Johan Andersson
4c858f173f subtitle_sami: fix unicode encode issue 2013-08-10 20:29:06 +02:00
Olof Johansson
7da961b511 justin: add missing verb to error message 2013-08-09 18:02:57 +02:00
Olof Johansson
3cfbd6b679 Print help text when called without arguments 2013-07-25 21:05:29 +02:00
Johan Andersson
455fbf3fd1 Merge pull request #46 from olof/topic/manual 
Add a user manual
 2013-05-29 14:23:02 -07:00
Johan Andersson
4c30886d53 subtitle: python 2/3 fixes. 2013-05-29 23:21:15 +02:00
Johan Andersson
c982f29551 subtitle_tt: converting didn't work. 
based on a fix from quite @ github
 2013-05-29 23:21:14 +02:00
Johan Andersson
358803c722 justin: new path for vod files. 2013-05-29 23:21:14 +02:00
Johan Andersson
608497d335 tv4play: uncomment necessary info to rtmpdump 2013-05-29 23:21:13 +02:00
Olof Johansson
7f99c30b31 Remove unused make stuff in lib/Makefile 
Doing `make install` with lib/Makefile is not supported.
 2013-05-27 20:47:51 +02:00
Olof Johansson
5fb13353f2 make: recurse make clean and remove *.pyc 2013-05-15 18:39:43 +02:00
Johan Andersson
1b722f188b New version 0.9.2013.05.06 2013-05-06 12:18:38 +02:00
Johan Andersson
49a92b98f8 svtplay: they removed playertype from jsonfile. 2013-05-06 12:17:46 +02:00
Johan Andersson
f7760ee640 Adding missing r prefixes to regex string 2013-05-05 12:57:42 +02:00
Johan Andersson
195e3b7184 Mtvservices: better error message 
Print a better error message when the video is not available
 2013-05-05 12:35:49 +02:00
Johan Andersson
06368689de Qbrick: this condition never happen 2013-05-03 16:59:40 +02:00
Johan Andersson
aede0ce993 Qbrick: support for sydsvenskan.se 2013-05-03 16:51:18 +02:00
Johan Andersson
98ccd0573b qbrick: fixed detection for di.se videos. 2013-04-29 14:34:03 +02:00
Olof Johansson
73694a1703 get_http_data: Create Request object 
The OpenerDirector does not support .adddata(), but it OpenerDirector.open()
does accept being passed a Request object.
 2013-04-27 13:46:38 +02:00