1
0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-24 20:25:41 +01:00
Commit Graph

612 Commits

Author SHA1 Message Date
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
7f7d79a3db output: Don’t download the file if we already have it for some other fetcher 2014-08-27 22:40:31 +02:00
Johan Andersson
b1473f2eae tests: fix output tests after changed progressbar size. 2014-08-27 19:29:32 +02:00
Johan Andersson
1d222eacc3 progressbar: make it bit smaller.
this should fix #122
2014-08-27 19:29:00 +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
9de3961c0b subtitle: show a warning if subtitle exists. 2014-08-23 13:33:38 +02:00
Johan Andersson
8eec519577 output: make pylint happier. 2014-08-21 22:10:16 +02:00
Johan Andersson
e3f311b0b6 rtmp: removing unused imports. 2014-08-21 21:37:30 +02:00
Johan Andersson
686f5f615a refactor output to its own function
Almost the same code for all the fetchers.
2014-08-20 20:27:45 +02:00
Johan Andersson
79b9c15977 init: removing unused imports. 2014-08-19 15:21:27 +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
3f6bd29a13 fetchers: fix a crash on stdout python3 2014-08-12 17:14:12 +02:00
Johan Andersson
4209f14e26 Fixing some more warnings. 2014-08-12 00:15:46 +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
ebe21c49c5 get_one_media: override filename if it is set automagic 2014-08-11 21:24:35 +02:00
Johan Andersson
c19ba14e4c options: sync options from options parser 2014-08-11 21:00:19 +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
Johan Andersson
329d149d29 subtitle: inherit from object 2014-07-28 15:53:23 +02:00
Johan Andersson
96fb261d04 Merge pull request #118 from olof/topic/progressbar_test_failz
Fix progressbar unittest failures
2014-07-24 20:26:13 +02:00
Olof Johansson
0fc0c02b99 VideoRetriever: inherit from object
Reference: #ep14boat
2014-07-24 20:24:03 +02:00
Olof Johansson
5e8f36305a VideoRetriever: default to bitrate=0
Reference: #ep14boat
2014-07-24 20:23:58 +02:00
Olof Johansson
a6e030b803 tests: test that progressbar adjusts to term width
Reference: #ep14boat
2014-07-24 18:46:28 +02:00
Olof Johansson
17500539a5 Fix unittest failures for progessbar
This solution is not super nice, but solves the current errors. A proper mock
based solution would probably be preferable.

Reference: #ep14boat
2014-07-24 18:39:15 +02:00
Olof Johansson
b494a61d41 output: fix typo in docstring
Reference: #ep14bot
2014-07-24 17:56:36 +02:00
Olof Johansson
ad98867700 utils: ignore pylint import-error warning
This is a python3 fallback.
2014-07-22 10:19:10 +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
a8e63f4e60 hls: avoid unused variable warning (pylint) 2014-07-22 10:12:51 +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
6719cd0e15 svtplay_dl: remove unnecessary pass statement
(Reported by pylint)
2014-07-22 09:36:33 +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
52a18ee7ca main: better help text to -H and -P 2014-07-13 16:06:35 +02:00
Johan Andersson
40726e01a2 kanal5: always have rtmp live flag on. 2014-07-13 16:04:33 +02:00
Johan Andersson
a52fbe6985 select_quality: move preferred option to get_one_media 2014-07-13 16:03:03 +02:00
Johan Andersson
d272c9bb84 rtmp: it should be rtmp and not hds 2014-07-13 15:19:12 +02:00
Johan Andersson
d9b945bf9e select_quality: print the fetcher name after bitrate. 2014-07-13 15:12:06 +02:00
Johan Andersson
1ae8bf3329 kanal5: divide the bitrate with 1000 2014-07-13 14:27:34 +02:00
Johan Andersson
e811bd2513 HLS: 1000 is the new thing 2014-07-10 18:55:59 +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
ed85f9cf0f hds: Support for starting on NN fragment and use same query string as manifest. 2014-07-10 18:07:59 +02:00
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