1
0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-28 06:04:17 +01:00
Commit Graph

551 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
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