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
937 Commits 15 Branches 130 Tags 5.7 MiB
48dd670625
Commit Graph

642 Commits

Author SHA1 Message Date
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
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
Olof Johansson
15af22000b utils.io: Forgot to add pylint disable for E0611 2013-04-27 13:05:10 +02:00
Johan Andersson
aad1993d4e 0.9.2013.04.22 2013-04-22 09:45:10 +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
23ed1b840b Restructure makefiles 
This change makes it easier to add new packages; it's only necessary
to update the sub makefile (lib/Makefile) and add new packaes to the
PACKAGES variable.
 2013-04-21 14:10:30 +02:00
Olof Johansson
bd1ae14e53 Isolate py3/2.7 conditional imports to own modules 2013-04-21 13:45:43 +02:00
Olof Johansson
119a49b0d2 utils: import socket 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
2d2cead9bc hls: catch KeyError exception by name 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
607d6b57ec utils: Remove unused arguments for get_http_data() 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
1372a4e12e svtplay_dl.tests.output: initial set of unit tests for progress() 2013-04-19 18:12:36 +02:00
Olof Johansson
b31834fd6e svtplay_dl.output: Make progress() wrap progressbar() 
The progressbar() currently does not handle the case where the total size is
unknown. But with this change, progress() will internally use progressbar()
for its bar generation, while still supporting a more basic progress info when
total size is unknown.
 2013-04-19 17:44:21 +02:00
Olof Johansson
ae8fda8963 svtplay_dl.output: prettier progressbar generation 2013-04-19 17:39:25 +02:00
Johan Andersson
5ef5e850e4 2013-04-17 2013-04-17 09:42:28 +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
c4382d3d1b Merge branch 'master' of github.com:spaam/svtplay-dl 2013-04-02 15:31:16 +02:00
Johan Andersson
1dfc3909f1 update version number 2013-04-02 15:29:36 +02:00
Johan Andersson
fa3e95ff7c Merge pull request #35 from olof/topic/eta_class 
ETA class for fetchers
 2013-03-25 12:14:32 -07:00
Olof Johansson
13c2ee494e Use ETA class in HDS and HLS fetchers 2013-03-25 19:54:41 +01:00
Olof Johansson
0136c06a3b svtplay_dl.output: add an ETA class 
This class is used to calculate remaining time to process a given
list of items.
 2013-03-25 19:32:06 +01:00
Johan Andersson
370a1b507b util: Fix some exceptions 2013-03-25 19:27:26 +01:00
Daniel
0de19d2c11 Option --flexible-quality (-Q) 2013-03-25 19:05:18 +01:00
Johan Andersson
3cc8752f39 download_http: import HTTPError 2013-03-24 20:37:46 +01: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
a951a0b65e Missing imports in utils 2013-03-24 20:20:16 +01:00
Johan Andersson
ab84546d48 download_http: Request missing from imports 2013-03-24 17:37:31 +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
652218e568 svtplay_dl.tests.output: fix indentation damage 
And add a note about rewriting the mockfile hack.
 2013-03-23 19:21:09 +01:00
Olof Johansson
a02a46752d Add unit tests for timestr() 2013-03-23 18:08:20 +01:00
Olof Johansson
f72f195e35 Fix bugs in timestr(), converting msec to time string 
Also adds a docstring for timestr().
 2013-03-23 18:08:16 +01:00
Olof Johansson
91cf0e2f15 Add unittests for svtplay.service.svtplay 2013-03-23 17:02:56 +01:00
Johan Andersson
fb6d2a2b8a Making svtplay-dl works again. 2013-03-23 16:30:19 +01:00
Johan Andersson
311f9c4d15 Update version number 2013-03-23 16:12:26 +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
f8d8cd4ecc Make a single file 2013-03-23 15:43:05 +01:00
Johan Andersson
eeac0feb14 Move get_media into lib. 2013-03-23 15:02:41 +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
Johan Andersson
cbf100139c rtmp: missing sys import 2013-03-14 22:44:21 +01:00
Johan Andersson
2ecf53bd93 kanal5: forgot import cookie modules 2013-03-14 22:43:32 +01:00
Johan Andersson
b85926b38a kanal5: typo. 2013-03-14 22:33:28 +01:00
Johan Andersson
69ec4415d0 kanal5: support for users 2013-03-14 22:20:27 +01:00
Johan Andersson
600c827b9e get_http_data: cookie support 2013-03-14 22:19:13 +01:00
Olof Johansson
d656045914 Move svtplay.{http,hls,etc} to svtplay.fetcher.* 2013-03-12 16:21:58 +01:00
Johan Andersson
9251429dca download_http: add an extension if we cant find one 2013-03-12 13:19:12 +01:00
Johan Andersson
9f176d4cc4 download_http: adding a better U-A. need this for vimeo 2013-03-12 13:19:12 +01:00
Johan Andersson
5cc26be3eb Support for vimeo files 2013-03-12 13:19:12 +01:00
Johan Andersson
3456d43062 get_http_data: support for referer-header 2013-03-12 13:19:12 +01:00
Johan Andersson
92266c259d kanal5: update .swf file 2013-03-12 13:19:12 +01:00
Johan Andersson
483babbefc kanal5: add a notice about drm hls files 2013-03-12 13:19:12 +01:00
Johan Andersson
65cafa3107 kanal5: HLS support 2013-03-12 13:19:12 +01:00
Johan Andersson
faabad17b1 kanal5: download_* should set the extention 2013-03-12 13:19:12 +01:00
Johan Andersson
11c4209899 justin.tv: write an error message when we cant find any streams 2013-03-12 13:19:12 +01:00
Johan Andersson
04cc9930f5 viaplay: support for subtitles 2013-03-12 13:19:12 +01:00
Johan Andersson
9bd6562ab6 kanal5.se is now "closed" 2013-03-12 13:19:12 +01:00
Johan Andersson
42c6449727 kanal5play: support for kanal9play.se 2013-03-12 13:19:12 +01:00
Johan Andersson
9ed5021ca6 kanal5play: support for subtitles 2013-03-12 13:19:12 +01:00
Johan Andersson
36aad03298 tv4play: support for subtitles 2013-03-12 13:19:11 +01:00
Johan Andersson
3c24bd3a7b svtplay: support for subtitles 2013-03-12 13:19:11 +01:00
Johan Andersson
a8fe012618 urplay: support for subtitles 2013-03-12 13:19:11 +01:00
Johan Andersson
7fb1f9b514 Adding few subtitle formats. 
json, sami, smi and wsrt
 2013-03-12 13:19:11 +01:00
Johan Andersson
d061054f33 download_rtmp: work around for a bug in python2.7 
python2.7.2 in OSX Mountain Lion has bug in shlex.split().
see http://bugs.python.org/issue6988
 2013-03-12 13:19:11 +01:00
Johan Andersson
3fdc183572 download_hds: fix some decoding problems 
Saw some issues while downloading streams from urplay.
 2013-03-12 13:19:11 +01:00
Johan Andersson
82340f086c download_hds: dont hardcode metadata size. 2013-03-12 13:19:11 +01:00
Johan Andersson
8485218b75 download_rtmp: add a dot before extention and after filename 2013-03-12 13:19:11 +01:00
Johan Andersson
9d76850f69 urplay: use rtmp instead of hds 2013-03-12 13:19:11 +01:00
Johan Andersson
19e25fa07a Generic class a way to find embeded videos 
support for embeded svtplay videos.
 2013-03-12 13:19:11 +01:00
Johan Andersson
8ff50eee0d Support for radioplay.se 2013-03-12 13:19:11 +01:00
Johan Andersson
834f5abcad expressen: it works now again. 2013-03-12 13:19:11 +01:00
Johan Andersson
971c44117b download_hls: add support for relative urls 2013-03-12 13:19:11 +01:00
Johan Andersson
78dd84112b urplay: adding support for ur.se 2013-03-12 13:19:11 +01:00
Johan Andersson
ee375f5d64 urplay: add support for the new site 
some help from @unayok
 2013-03-12 13:18:59 +01:00
Johan Andersson
60baa1dba0 download_http: fix a problem when content-length is not present 2013-03-03 10:52:48 +01:00
Johan Andersson
d5646c5715 tv4play: some fixes for tv4.se 
In some cases we dont have vid in the url
 2013-03-03 10:45:29 +01:00
Johan Andersson
e85fd9163d Update the comment about pyamf 2013-03-02 22:12:10 +01:00
Olof Johansson
ecb630c51f svtplay.output: Fix unused variable pylint warning 2013-03-02 22:02:52 +01:00
Olof Johansson
a6ec593c0a tests: Silence pylint naming conventions warning 
The naming conventions of the unittest module does not adhere to
Python coding standards as specified in PEP8. This isn't our fault
however...
 2013-03-02 22:01:25 +01:00
Olof Johansson
d9ad8a1eda Remove __init__.py in module hierarchy topdir 2013-03-02 21:48:12 +01:00
Olof Johansson
81d208dd61 Fix whitespace damage (causing indentation errors) 2013-03-02 21:28:58 +01:00
Olof Johansson
663287b541 Add editor modelines 2013-03-02 21:26:42 +01:00
Olof Johansson
1ef76e2f9d Add unit tests for svtplay.output.progressbar 2013-03-02 00:00:32 +01:00
Olof Johansson
53ecb46338 Use absolute_import from __future__ everywhere 2013-03-01 23:39:42 +01:00
Olof Johansson
2affb9aa55 Move handler selection to svtplay.service 2013-02-28 21:44:28 +01:00
Olof Johansson
dacd3e715a ruv: Temporary import modules as lib.* 
Need to solve this... later.
 2013-02-28 21:43:34 +01:00
Olof Johansson
7a4f76ca95 Fix whitespace damage 2013-02-28 21:27:00 +01:00
Olof Johansson
1fe642593e log: Import correct module (logging, not logger) 2013-02-28 21:26:07 +01:00
Olof Johansson
c08155a074 Add minimal set of imports for services to work 2013-02-12 19:43:37 +01:00
Olof Johansson
b2635fd52a HBO: Add options argument to get() 2013-02-12 19:43:00 +01:00
Olof Johansson
f786c01c78 svtplay.output: don't import log (not used) 2013-02-12 19:42:17 +01:00
Olof Johansson
caf8ab5d11 Break out HLS fetcher to module 2013-02-12 19:39:52 +01:00
Olof Johansson
60af70bb9d Breakout rtmp fetcher to own module 2013-02-12 19:23:56 +01:00
Olof Johansson
aad4907a4f hds: import progress_stream from svtplay.output 2013-02-12 19:22:22 +01:00
Olof Johansson
6266a757f3 Breakout http fetcher to own module 2013-02-12 19:19:46 +01:00
Olof Johansson
5fed1b2a4a Break out progress() to svtplay.output module 
Now it is very clear that progressbar() duplicates an existing function. But
obsoleting one or the other is work for the future.
 2013-02-12 19:19:35 +01:00
Olof Johansson
7433c0465e svtplay: Fix import of HLS fetcher 2013-02-12 19:03:53 +01:00
Johan Andersson
e41925987a aftonbladet: handle live streams automagic 2013-02-12 18:52:01 +01:00
Johan Andersson
81c776b94b aftonbladet: get only take 3 arguments. 2013-02-12 18:50:39 +01:00
Mikael Wikström
762cac8084 svtplay: don't crach when using --hls 2013-02-12 18:49:32 +01:00
Olof Johansson
115e795835 Initial work on splitting script to modules 
Does not work reliably (downloading SVTPlay videos with HDS may work
if you're lucky).
 2013-01-17 00:21:47 +01:00