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

629 Commits

Author SHA1 Message Date
Johan Andersson
cd9cc95dfa Remove unused import sys. 2014-11-25 21:47:29 +01:00
Johan Andersson
0f93c5c1ce Return instead of sys.exit 2014-11-25 21:46:33 +01:00
Johan Andersson
adc39782d7 kanal5: move down subtitle after automagicfilename 2014-11-25 21:34:46 +01:00
Johan Andersson
66c394cca1 kanal5: save cookies to options 2014-11-25 19:03:24 +01:00
Johan Andersson
fa6a4c61d2 viaplay: better error messages 2014-11-25 19:03:24 +01:00
Johan Andersson
b505a03d3c service: replace sys.exit with return 2014-11-25 19:03:24 +01:00
Johan Andersson
9624fbdcaf svtplay: just return if we can’t find any video. 2014-11-25 19:03:24 +01:00
Johan Andersson
8f30de9a85 tv4play: better error message 2014-11-25 19:03:24 +01:00
Johan Andersson
8ceb3ea56d More rewrite 2014-11-25 19:03:24 +01:00
Johan Andersson
dde3672966 viaplay: easier to read .endswith instead if len - 3 2014-11-25 19:03:23 +01:00
Johan Andersson
8cb76b98f5 tv4play: convert it to http rewrite. 2014-11-25 19:03:23 +01:00
Johan Andersson
dcc1367250 subtitle: refactor so we can reuse the try-except-thing 2014-11-25 19:03:23 +01:00
Johan Andersson
b83f001f6f kanal5: bogus cookie thing is not needed. 2014-11-25 18:52:59 +01:00
Johan Andersson
f85840e502 kanal5: remove unused import 2014-11-25 17:07:45 +01:00
Johan Andersson
76e6921771 disney: better automagic filename 
this fixes #148
 2014-11-23 13:04:05 +01:00
Johan Andersson
75c508292e kanal5: Send the cookies to subtitle. 
super hack workaround for #178
 2014-11-16 22:09:16 +01:00
Johan Andersson
ad5399f5de kanal5: proper error message when we try to access premium content 2014-11-16 21:55:54 +01:00
Johan Andersson
12f666b5e6 Forgot r-prefix in re.search 2014-11-09 02:15:43 +01:00
Johan Andersson
9342d0c8bb bigbrother: support for OpenGraphThumbMixin 2014-11-09 02:15:09 +01:00
Johan Andersson
796f649eef viaplay: Unused import 2014-11-09 02:14:31 +01:00
Johan Andersson
c66f6a51e4 disney: Adding support for disney.se 
this fixes #148
 2014-11-08 23:02:02 +01:00
Johan Andersson
6a99f32b10 viaplay: they changed the api so things stopped working 
this fixes #146
 2014-10-23 00:03:14 +02:00
Johan Andersson
0e65654a5a HDS: show an error message when we see DRM files. 2014-10-12 23:31:12 +02:00
Johan Andersson
97e67bc7af aftonbladet: change format again. 2014-10-05 20:44:57 +02:00
Johan Andersson
b567f0b983 aftonbladet: remove old debug data. 2014-09-28 23:33:49 +02:00
cybjit
4221a94d10 use log instead of print 2014-09-28 22:56:57 +02:00
Johan Andersson
ea057fc8fd mtvnn: download the right number of episodes 
this fixes #132
 2014-09-27 22:53:41 +02:00
Johan Andersson
fdd09734db aftonbladet: support for hls “master” playlist. 
this fixes #135
 2014-09-27 22:37:12 +02:00
Johan Andersson
782ad2854e service: no need to check video streams when we force subtitles 2014-09-21 19:12:17 +02:00
Johan Andersson
f249c3c406 svtplay: fix unboundlocal error for subtitle 
this fixes #130
 2014-09-21 18:51:26 +02:00
Johan Andersson
09b4a6816e viaplay: Show a error message from the site when we can’t find the id. 
this will show two error message but we will fix that later after http-rewrite.
this fixes #129
 2014-09-11 23:51:45 +02:00
Johan Andersson
f0a06007c2 viaplay: better regex to find the video id. 2014-09-11 23:51:45 +02:00
Johan Andersson
2ea3a26ffb tv4play: dont urlencode already urlencoded shows names. 
this fixes #128
 2014-09-06 21:51:02 +02:00
Johan Andersson
3dd251e358 New service bigbrother.se 2014-09-06 11:35:59 +02:00
Olof Johansson
f26573de49 picsearch: add simple "handles url" unit tests 2014-09-04 23:04:25 +02:00
Olof Johansson
e84824ac7d picsearch: supports mobil.dn.se as well 2014-09-04 23:01:44 +02:00
Johan Andersson
46d5279bf8 tv4play: check html data before url. 2014-08-31 00:36:19 +02:00
Johan Andersson
cbbe997311 viaplay: check if subtitle is None before yield it. 
this fixes #125
 2014-08-29 00:11:43 +02:00
Johan Andersson
2b12931366 tv4play: parse.query instead of [4] 2014-08-28 16:48:15 +02:00
Johan Andersson
0544b57b77 Break long lines into two lines. 2014-08-28 07:56:47 +02:00
Johan Andersson
0e9d30a359 kanal5: use options.service instead of hardcoded service name in format string. 2014-08-27 22:59:41 +02:00
Johan Andersson
96f5384e77 svtplay: use options.service instead of hardcoded service name in format string. 2014-08-27 22:59:31 +02:00
Johan Andersson
a941b99cd1 tv4play: support for the new output mode 2014-08-27 22:58:37 +02:00
Johan Andersson
86e569ce1b kanal5: support for the new output mode 2014-08-27 22:47:53 +02:00
Johan Andersson
a8c95d455e svtplay: support for the new output mode 2014-08-27 22:41:38 +02:00
Johan Andersson
9b1d2aa657 viaplay: support all characters for rtmp application value 
this fixes #123
 2014-08-27 15:13:57 +02:00
Johan Andersson
78c5258d23 hbo: better way to detect app and path values 2014-08-19 15:20:50 +02:00
Johan Andersson
187182babe tv4: better detection for HLS streams. 2014-08-18 22:22:03 +02:00
Johan Andersson
a5de20a41d vg: support for vgtv.no 2014-08-18 22:21:44 +02:00
Johan Andersson
8284250df4 service: sort service import list 2014-08-17 10:57:08 +02:00
Johan Andersson
aee8a6ad61 New service vg.no 2014-08-17 10:55:05 +02:00
Johan Andersson
d478dbf563 kanal5: support for kanal11play 2014-08-12 19:57:53 +02:00
Johan Andersson
23d5a45ca7 kanal5: better automagic name 2014-08-12 19:57:03 +02:00
Johan Andersson
951979798d generic: detect embedded aftonbladet videos 2014-08-12 19:08:08 +02:00
Johan Andersson
ec3e8fb131 Fixing some landscape.io warnings 2014-08-12 00:08:51 +02:00
Johan Andersson
30c5da3f93 dbtv: Support for dbtv.no 2014-08-11 23:20:17 +02:00
Johan Andersson
7854cadb63 mtvnn: support for all_episodes 2014-08-11 22:45:59 +02:00
Johan Andersson
804fcbf2fc mtvnn: override automagic name with a better one 2014-08-11 21:25:10 +02:00
Johan Andersson
62913151eb mtvnn: new service support for nickelodeon.(se,no,nl) 
this fixes #119
 2014-08-11 20:41:09 +02:00
Johan Andersson
9b6f838e16 dr.dk: fixed a crash when looking on news videos 2014-08-11 19:46:56 +02:00
Johan Andersson
633a2254f0 viaplay: fix a FutureWarning 
this fixes #120
 2014-08-11 19:44:20 +02:00
Johan Andersson
8fd7639b1a Space after # 2014-07-28 16:01:27 +02:00
Johan Andersson
89a8fc766b Wrong indentation. 2014-07-28 15:57:25 +02:00
Olof Johansson
0aa10b7b5d qbrick: add missing import: copy 
Reported by pylint.
 2014-07-22 10:16:30 +02:00
Olof Johansson
e56e5385e9 tv4play: avoid using builtin keyword id as varname 
Reported by pylint.
 2014-07-22 10:13:49 +02:00
Olof Johansson
91a4718b36 lemonwhale: don't use file as symbolname (py builtin) 
Reported by pylint.
 2014-07-22 10:10:11 +02:00
Olof Johansson
fc8a2fef9f expressen: Fix anomalous-backslash-in-string pylint warning 2014-07-22 09:37:57 +02:00
Olof Johansson
7d9b5e0537 kanal5: Fix pylint warnings (whitespace issues) 2014-07-22 09:32:58 +02:00
Johan Andersson
cd1194c1e1 kanal5: some streams don’t have videos for IPAD 2014-07-21 15:38:36 +02:00
Johan Andersson
eb21340039 aftonbladet: support for akamai streams. 2014-07-14 14:49:03 +02:00
Johan Andersson
9aeea1b9d0 tv4play: support for HLS 2014-07-13 22:48:34 +02:00
Johan Andersson
40726e01a2 kanal5: always have rtmp live flag on. 2014-07-13 16:04:33 +02:00
Johan Andersson
1ae8bf3329 kanal5: divide the bitrate with 1000 2014-07-13 14:27:34 +02:00
Johan Andersson
b4832a9f5f kanal5: We only see streamBaseUrl on RTMP 2014-07-10 18:35:27 +02:00
Johan Andersson
ce2d7cbab5 kanal5: Add support for HLS again. 2014-07-10 18:23:30 +02:00
Johan Andersson
0c6b458e5e svtplay: hdcore 3.3.0 2014-07-10 18:08:48 +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
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
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
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
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
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
a38a077af5 svtplay: only yield when have have a subtitle. 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
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
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
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
28bc0f3389 viaplay: yield the subs 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
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
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
134dcb1367 aftonbladet: they changed how hls works. 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
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
32fbe5051f svtplay: only yield when have have a subtitle. 2014-04-27 15:36:57 +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
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
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
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
d1e0757dd4 viaplay: yield the subs 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
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
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
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
5e1e6dbbc9 subtitle: a way to download only subtitle. 2014-03-21 21:01:00 +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
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
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
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
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
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
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
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
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
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
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
c24123dc61 service: missing urlparse for py3 2014-01-05 17:28:00 +01:00
Johan Andersson
2972555cbc urplay: forgot to remove old line.. 2014-01-03 16:53:48 +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
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
33bb2c5c13 Replace sys.version_info with pyX 2013-12-30 01:35:08 +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
7ce8f4a8a2 tv4play: select mp4 for mediaformat 2013-11-17 13:32:33 +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
dfcd714429 svtplay: replace some urlmatchning with urlparse 2013-10-21 14:01:52 +02:00
Johan Andersson
71b1b585d0 svtplay: fixing a regression from last version 2013-10-14 20:05:03 +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
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
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
27779a62f6 viaplay: support for tv10play.se 2013-09-03 14:48:41 +02:00
Johan Andersson
fcd83a2a61 justin: support for non-subscriber channels 2013-08-31 10:59:20 +02:00
Johan Andersson
7ee2dd5c1e viaplay: new site update. 2013-08-15 14:20:02 +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
Olof Johansson
7da961b511 justin: add missing verb to error message 2013-08-09 18:02:57 +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
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
a688e0494f kanal5: Don't redefine builtin "format" 2013-04-27 13:27:30 +02:00
Olof Johansson
32cf9ff45f mtvservices: minor pylint cleanup 2013-04-27 13:26:19 +02:00
Olof Johansson
c9b38e21f6 Don't use deprecated builtin map() 2013-04-27 13:25:31 +02:00
Olof Johansson
22d06ba0fe Disable pylint warning E1103 when using urlparse 
pylint has issues with urlparse, e.g:

    Instance of 'ParseResult' has no 'query' member (but some types could not be inferred)
 2013-04-27 13:17:00 +02:00
Johan Andersson
dd763ce846 Cosmetic fixes 2013-04-21 22:59:27 +02:00
Johan Andersson
447528d4c5 mtvservices: better error message. 2013-04-21 22:58:34 +02:00
Johan Andersson
078df0b3e5 forgot to add mtvservices.py 2013-04-21 21:59:25 +02:00
Johan Andersson
7feba77677 Support for Mtvservices (thedailyshow & colbertnation) 2013-04-21 21:51:45 +02:00
Olof Johansson
bd1ae14e53 Isolate py3/2.7 conditional imports to own modules 2013-04-21 13:45:43 +02:00
Olof Johansson
e9bd5b8004 Make all services inherit svtplay_dl.service.Service 2013-04-21 13:45:43 +02:00
Olof Johansson
8d605f2819 Remove unused variable warnings 2013-04-21 13:45:43 +02:00
Olof Johansson
a0b7a755dc service.sr: use if "foo" in dict instead of catching KeyError 2013-04-21 13:45:43 +02:00
Olof Johansson
eef049cc0c hds: remove swf argument (it was unused) 2013-04-21 13:45:43 +02:00
Olof Johansson
a4202238c9 Remove unused imports 2013-04-21 13:45:43 +02:00
Olof Johansson
b931d58319 Add unit test for oppetarkiv.se 2013-04-16 17:51:31 +02:00
Johan Andersson
4ebf565652 svtplay: support for oppetarkiv.se 2013-04-16 13:18:40 +02:00
Johan Andersson
514ed7e546 python3 fixes, urlparse and addinfourl. 2013-04-14 21:26:39 +02:00
Johan Andersson
c47fae0cb4 justin.tv: fixes for swf-file 2013-04-14 21:08:12 +02:00
Johan Andersson
f959af260c kanal5: import download_hls 2013-03-24 20:33:39 +01:00
Johan Andersson
613b31413d radioplay: sys.exit is the right one 2013-03-24 20:31:26 +01:00
Johan Andersson
6e49f503a8 urplay: import subtitle_tt 2013-03-24 20:28:14 +01:00
Johan Andersson
fc6a91c03a svtplay: right subtitle variable 2013-03-24 20:27:35 +01:00
Johan Andersson
b6a91a9d31 cosmetics add a space 2013-03-24 20:26:24 +01:00
Johan Andersson
15af0a5418 svtplay: right subtitle url 2013-03-24 20:24:34 +01:00
Johan Andersson
df70896c84 import subtitle functions 2013-03-24 20:24:08 +01:00
Johan Andersson
78d5b2a212 Generic: embeded tv4play videos 2013-03-24 14:55:14 +01:00
Johan Andersson
12ca98359f Right module name in svtplay test 2013-03-24 14:13:32 +01:00
Olof Johansson
91cf0e2f15 Add unittests for svtplay.service.svtplay 2013-03-23 17:02:56 +01:00
Johan Andersson
01bb02ea68 Fix so embedded videos works again 2013-03-23 16:11:36 +01:00
Johan Andersson
0ae6ec8634 service: move sites variable out from handler 2013-03-23 15:58:15 +01:00
Johan Andersson
56304a36c6 Move classes under the imports in service/ 2013-03-23 15:56:25 +01:00
Johan Andersson
cfd20232ab Rename module from lib/svtplay to lib/svtplay_dl 
less confusion with the service.
 2013-03-17 19:55:19 +01:00