Saverr/svtplay-dl
1
0
Fork 0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-24 12:15:40 +01:00
Code Issues Projects Releases Wiki Activity
784 Commits 15 Branches 130 Tags 5.7 MiB
17500539a5
Commit Graph

494 Commits

Author SHA1 Message Date
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