Saverr/svtplay-dl
1
0
Fork 0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-30 23:24:16 +01:00
Code Issues Projects Releases Wiki Activity
2,501 Commits 15 Branches 130 Tags 5.7 MiB
757c571a48
Commit Graph

1883 Commits

Author SHA1 Message Date
Johan Andersson
a84b89bafd Rewrote big parts of the _dashparser 2019-07-13 14:31:13 +02:00
Johan Andersson
d33186e54e wrstsegments: fix sync issues 
Fixes: #1063
 2019-04-13 17:45:29 +02:00
Johan Andersson
be21f7d695 Tv4play: support for the new site 
fixes: #1058
 2019-04-08 23:24:07 +02:00
Johan Andersson
60c043da62 wrstsegments: fix so we handle newlines better 
Fixes: #1050
Fixes: #1038
 2019-04-08 23:21:59 +02:00
Johan Andersson
7649c2dad5 Remove newline and the end of the file 2019-03-25 23:33:31 +01:00
Johan Andersson
7fb5f02032 dr: they have started to use encrypted url’s 
Fixes: #1056
Fixes: #1047
 2019-03-24 21:06:23 +01:00
Johan Andersson
c4bf81fa9e hls: move cryptography to top imports. 2019-03-24 21:04:41 +01:00
Johan Andersson
05c322a52a hls: don’t finalize after we decrypt the data. 
In cases where we have several keys in a stream we can run finalize on the data.
 2019-03-23 02:36:01 +01:00
Johan Andersson
ecaced7b5c dashparse: use == compare ints.. 2019-03-23 02:02:11 +01:00
Johan Andersson
feb503e013 daskparse: search for contentType on adaptationset instead of mimype 
Svtplay stopped using mime type on adaptionset.
Fixes: #1054
 2019-03-23 01:20:56 +01:00
Johan Andersson
5b6779edf2 Replace pycryptodome with cryptography. 
This will make it easier to support older distros. For example ubuntu 16.04 and Debian stable (9)
 2019-03-23 01:00:44 +01:00
Johan Andersson
525d33a516 Cosmetic changes from flake8 2019-03-23 00:57:19 +01:00
Johan Andersson
dcbf6a8a0e sr: they have updated the site a little. 
Fixes #1033
 2019-01-09 21:35:12 +01:00
Johan Andersson
f47e729c01 fetcher.http: if we can detect its mp3, use that as extension. 2019-01-09 21:34:21 +01:00
Johan Andersson
806fd55d3b svt: support for subtitles on the page. 
fixes #1026
 2019-01-06 21:55:48 +01:00
Johan Andersson
a4d4769457 service: don’t crash if configfile is not set 
Fixes #1015
 2019-01-06 20:21:45 +01:00
Jan
9f2e0ef806 Viaplay: Fix video-id extraction 2019-01-02 20:59:05 +01:00
iwconfig
256ca145b2 flake8 fix 2018-12-12 00:20:17 +01:00
iwconfig
1d1574a019 Added option to only download nfo 2018-12-12 00:20:17 +01:00
Johan Andersson
79f77cb785 get_media: check for all_episode from the service config 
Fixes: #1009
 2018-12-11 01:03:12 +01:00
Johan Andersson
72143b7172 output.findexpisode: don’t crash if we don’t have an id 
fixes: #1000
 2018-11-18 12:54:37 +01:00
Johan Andersson
36116c7a3b Remove old logging 2018-11-18 12:47:19 +01:00
Johan Andersson
a665f98836 expressen: fixed an issue we cant find the id 
fixes: #1003
 2018-11-18 12:36:18 +01:00
Johan Andersson
1c302d4a18 flake8 fixes for eurosport 2018-11-14 00:46:42 +01:00
Johan Andersson
951b8d7b7c Eurosportplayer: fix for their new site. 
fixes: #989
 2018-11-14 00:42:52 +01:00
Johan Andersson
a65a32267b eurosport: add support for more subdomains. 2018-11-13 19:54:39 +01:00
Johan Andersson
5f21f27f76 service. readd the service to the list of services. 2018-11-13 19:52:20 +01:00
Johan Andersson
74f68a535b fetcher.rtmp: RIP. Who use flash in 2018 anyway. 
Removing old RTMP and related code.
qbrick is not used anyway.
 2018-11-12 19:05:41 +01:00
Johan Andersson
f910e66efb hbo: this is not working anyway. 2018-11-12 18:51:13 +01:00
Johan Andersson
d72c3dd558 bambuser: old service. removing 2018-11-12 18:49:29 +01:00
Johan Andersson
772670b6c9 parser.readconfig: handle permission denied while reading config 2018-11-04 22:04:50 +01:00
Johan Andersson
884ad99f9f parser.readconfig: don’t crash on empty file 
fixes: #992
 2018-11-04 22:01:24 +01:00
Johan Andersson
e0403a9ac0 viafree: remove unused import 2018-11-02 18:17:38 +01:00
Johan Andersson
d5a1ec1197 subtitle.sami: in some cases they have extra xml code in Text element 
fixes: #990
 2018-11-02 00:38:39 +01:00
Johan Andersson
ff42f884a5 viafree: remove some old code for rtmp 
fixes: #950
 2018-11-02 00:37:05 +01:00
Johan Andersson
ca295d461d flake8: new version detecting more stuff 2018-10-28 23:16:00 +01:00
Johan Andersson
bd73466265 fetcher.http: rename options to config 2018-10-28 22:36:22 +01:00
Harald Gustafsson
61c76824a9 Added some checks in the NFO writing to not throw exception if some metadata is None. Also skips NFO if not even the title is available. 2018-10-28 22:34:49 +01:00
Harald Gustafsson
c86c111931 Barnkanal have started missing season number for some shows, now defaults to "01" if episode number exist. 2018-10-28 22:34:49 +01:00
Harald Gustafsson
171bd25084 SVT changed thumbnail path, fix for using the new path (and still old until we know it is completely gone). 2018-10-28 22:34:49 +01:00
Johan Andersson
4fbf861985 subtitle.wrst: add translation of names to hex 
fixes: #963
 2018-10-28 20:47:41 +01:00
Johan Andersson
647d119ce8 tv4play: better message if the video is not available 
fixes: #981
 2018-10-28 16:37:58 +01:00
Johan Andersson
0596ee743b riksdagen: add support without subdomain. 
fixes: #976
 2018-10-28 16:29:17 +01:00
Johan Andersson
1e72958dc4 subtitle.sami: handle characters in squeeze number. 
Fixes: #987
 2018-10-28 14:17:27 +01:00
Johan Andersson
41cee01ab3 cmore: new site, new update 2018-10-13 13:55:25 +02:00
Johan Andersson
a72d8e4e3c hls.download: when we see key url as skd:// abort 2018-10-13 13:53:10 +02:00
Johan Andersson
8595586053 get_multiple_media: fix a crash when outputting to folder 2018-10-13 13:52:10 +02:00
Johan Andersson
7ac0b5fc65 get_media: support for raw mpd files 2018-10-07 19:54:43 +02:00
Johan Andersson
f0efb1b685 tests.dash: add some basic tests for _dashparse 2018-10-07 19:53:09 +02:00
Johan Andersson
5ac273dc47 dash.parse_dates: add a new time of date format.. 2018-10-06 23:17:45 +02:00
Johan Andersson
72591c20f0 dashparse: split the function into two 2018-10-06 23:17:19 +02:00
Johan Andersson
f183c3014e service.test: add some opengraph_get test cases 2018-10-05 23:46:52 +02:00
Johan Andersson
2b49c2259b service.test: add one more handler test case 2018-10-05 23:45:09 +02:00
Johan Andersson
b5aed11c17 tests._formatname: add some test on different format test configurations 2018-10-05 23:28:05 +02:00
Johan Andersson
7c2d86375e utils.output: dot and dash is optional 2018-10-05 23:28:05 +02:00
Johan Andersson
22d387717e service.tests: more service tests. 2018-10-05 23:28:05 +02:00
Johan Andersson
1499a006f7 get_one_media: fix a crash in older versions of py3 
fixes #969
 2018-10-01 22:33:27 +02:00
Johan Andersson
10e1413eb6 get_media: use logging instead of log 2018-10-01 22:07:01 +02:00
Kristoffer Hallqvist
0c1ccf9c51 Added leading space in line comment 2018-10-01 22:02:39 +02:00
Kristoffer Hallqvist
1d716d5963 Ignores unexpected empty lines in subtitle format 2018-10-01 22:02:39 +02:00
Olof Johansson
8c19f96e46 output: Adapt test suite to new location of module 
The output module was moved from svtplay_dl.output to
svtplay_dl.utils.output some time ago.
 2018-09-30 19:00:13 +02:00
Olof Johansson
bbf10ee077 hls: Break out get_full_url tests to new test suite (http) 
The get_full_url was moved some time ago from the hls module to the
svtplay_dl.utils.http module.
 2018-09-30 19:00:13 +02:00
Olof Johansson
228d34c500 filenamify: Make the test suite import module from right location 2018-09-30 19:00:13 +02:00
Olof Johansson
5f087f0efa protocol_prio: Make the test suite import module from right location 
The tests are still failing, but not from ImportError anymore.
 2018-09-30 19:00:13 +02:00
Johan Andersson
559e950e68 getmedia: in some cases after_case is None 
fixed: #974
 2018-09-24 00:27:24 +02:00
Johan Andersson
e292e39a59 tv4play: fixed a crash if someone tried to download a geoblock file 
fixed: #972
 2018-09-23 21:32:02 +02:00
Johan Andersson
ad75ef77f0 tv4play: fix so all episodes work again 2018-09-23 20:05:36 +02:00
Johan Andersson
f90267b9f9 main: fix so --cmore-operatorlist work again 
fixes: #955
 2018-09-23 19:43:04 +02:00
Harald Gustafsson
fd0171d257 New option to only download videos that are published on or after a certain date. Relies on the new metadata extraction. When metadata is missing defaults to download. Useful for channels that don't publish episodes in order e.g. barnkanalen. 2018-09-05 21:43:52 +02:00
Harald Gustafsson
073f26e618 Added broadcast/publishing datetime to metadata extraction and NFO file creation. 2018-09-05 21:43:52 +02:00
Harald Gustafsson
4388e57112 Move the new metadata based thumbnail download into a reusable class instead of directly in Svtplay (requires that the service extract thumbnail urls during parsing of the video info into the self.output variable and the keys 'showthumbnailurl' and 'episodethumbnailurl'). Change OpenGraphThumbMixin to use the new download_thumbnails which makes correct filenames. Removed the old download_thumbnail. 2018-09-05 21:43:52 +02:00
Harald Gustafsson
fc71a8d8e4 flake8 fixes. 2018-09-05 21:43:52 +02:00
Harald Gustafsson
c15d7607eb Create NFO files with the extracted metadata. TVshows get a tvshow.nfo file as well. 2018-09-05 21:43:52 +02:00
Harald Gustafsson
184f79a377 Option to automatically create a subfolder for tvshows, named as the show title. When not a series will use a subfolder titled movies. 2018-09-05 21:43:52 +02:00
Harald Gustafsson
bf0e38a6f9 Working thumbnail download. Used by svtplay and barnkanalen, downloads both episode and show thumbnails. 2018-09-05 21:43:52 +02:00
Harald Gustafsson
dbdf7dc851 Get extra metadata, like thumbnails and descriptions. Currently implemented for svtplay and barnkanalen. 2018-09-05 21:43:52 +02:00
Harald Gustafsson
71b40f975a Fix bug that get_thumbnail could never be called, due to overwrite of the stream variable. 2018-09-05 21:43:52 +02:00
Jakob Schlyter
57e51c8bb1 parse date periods with hours and seconds only 2018-09-05 21:37:38 +02:00
Harald Gustafsson
7736af04b5 Fix find all episodes for tv4play, some dictionary keys sometimes missing. 2018-09-05 21:37:08 +02:00
Gustav Ahlberg
dd76a21fbe use vars 2018-09-05 21:36:27 +02:00
Gustav Ahlberg
8cc2d5625e more cleanup 2018-09-05 21:36:27 +02:00
Gustav Ahlberg
471a3a8711 small cleanup 2018-09-05 21:36:27 +02:00
Gustav Ahlberg
47655df815 service for koket to download lessons 2018-09-05 21:36:27 +02:00
Johan Andersson
a7aa860f61 viafree: fix a warning with multiple spaces after ',' 2018-09-05 16:45:50 +02:00
Johan Andersson
7bd1d3a1f3 viafree: fix for downloading a specific season 
fixes #944
 2018-09-05 16:40:56 +02:00
Johan Andersson
e7bc0c1abe viafree: set episode name when its a text 
fixes #941
 2018-09-05 16:40:56 +02:00
Johan Andersson
a6e2bae955 utils.stream: remove some debug prints 2018-09-05 16:40:56 +02:00
Harald Gustafsson
8297d6614f Fix missed option to config change in barnkanalen service. 2018-07-22 23:02:43 +02:00
Johan Andersson
d693e16596 get_multiple_media: this should be config 2018-07-16 21:21:18 +02:00
Johan Andersson
c97ec9030e subtitle.remux: remove copyts 
copyts made that videos started at 10s and made subtitles be wrong.
 2018-07-12 00:53:55 +02:00
Johan Andersson
3ad8c509f9 subtitle: wrstsegment is ten second off 2018-07-12 00:52:19 +02:00
Johan Andersson
6a324ed319 subtitle: missing whitespace around arithmetic operator 2018-07-10 23:00:44 +02:00
qnorsten
6813862727 Fix timecodes for segmented subtitles 2018-07-10 22:55:01 +02:00
Johan Andersson
1b0385a102 Remove unused module 2018-07-10 22:28:44 +02:00
Johan Andersson
1275421e08 remove certifi hack 2018-07-10 21:33:30 +02:00
Johan Andersson
446cdd89bc better why to get the version 2018-07-10 21:32:54 +02:00
Johan Andersson
9b839dfaf4 subtitle.wrst: tv4play split their wrst into several .m3u8 files 
it have some dupe codes. that we need to fix in the future....
 2018-07-05 01:26:43 +02:00
Johan Andersson
e377ee7386 output: --force should work on subtitles too 2018-07-05 01:26:43 +02:00
Johan Andersson
a0ab26a939 utilis.http: move get_full_url from hls to http 2018-07-05 01:26:43 +02:00
Johan Andersson
d61e5793e6 use which from stdlib instead our own version 2018-07-05 01:26:43 +02:00
Johan Andersson
7aba2589ec _checktracks: support for language in the stream 2018-06-24 21:55:18 +02:00
Johan Andersson
21b3ec0ffa tv4play: add support for the new site 
fixes: #918 #916 #914
 2018-06-24 16:15:55 +02:00
Johan Andersson
8b54c05ca8 getmedia: use logging instead of log 2018-06-24 16:14:57 +02:00
Johan Andersson
7668ed7a68 generic: change to config 2018-06-24 16:10:41 +02:00
Johan Andersson
43b67dfa86 appveyor: ship cacert.pem when built with nuitka 2018-06-17 17:03:46 +02:00
Johan Andersson
e3939a4bbe viafree: we should check if this is a sport page or not 2018-06-03 20:49:45 +02:00
Johan Andersson
138995925e _formatname: check if we have season in output 2018-06-03 18:03:09 +02:00
Johan Andersson
18b00ae673 viafree: support for downloading video from the program page. 2018-06-03 18:00:01 +02:00
Johan Andersson
585ea7b0d6 viafree: unused import 2018-06-03 17:59:36 +02:00
Johan Andersson
70bffe6f5e viafree._autoname: In some cases we dont have episode info. 2018-06-03 15:50:34 +02:00
Johan Andersson
2a94b927d0 _formatname: in some cases we dont have the episode and only season. 
we want to have like "name.s01.new.stuff.service.id.ext"
its better than "name.new.stuff.service.id.ext"
 2018-06-03 15:48:48 +02:00
Johan Andersson
fbffce1c12 hlsparse: return dict instead of nothing 2018-06-03 15:20:46 +02:00
Johan Andersson
fa3b16bfcd get_one_media: use logging instead of log. 2018-06-03 12:49:49 +02:00
Johan Andersson
668bbceac5 aftonbladet: update so it works with the site again. 2018-06-03 12:49:25 +02:00
Johan Andersson
a411750a67 nrk: output missing for subtitle 2018-06-03 01:39:19 +02:00
Johan Andersson
12cbe91d7b dbtv.no: thet use youtube now for their videos 2018-06-03 01:35:19 +02:00
Johan Andersson
aa39a52f15 dr: missing output 2018-06-03 01:18:15 +02:00
Johan Andersson
a261094731 öppetarkiv: this need to have output set 2018-06-03 00:24:44 +02:00
Johan Andersson
66b45cd4b1 öppetarkiv: unused import 2018-06-03 00:17:05 +02:00
Johan Andersson
00814e690d öppetarkiv: no need to check if streams are empty or not 2018-06-03 00:13:45 +02:00
Johan Andersson
512f8a0979 öppetarkiv: missing output value 2018-06-03 00:13:18 +02:00
Johan Andersson
1677349a42 öppetarkiv: we only send one argument to outputfilename 2018-06-03 00:12:45 +02:00
Johan Andersson
276b55dc8c get_one_media: we get the config nowadays 2018-06-03 00:12:15 +02:00
Johan Andersson
12021ee355 get_one_media: dont try to run exclude on exceptions 2018-05-31 01:30:25 +02:00
Johan Andersson
89104b830e viafree: support for the new page 
fixes #893
 2018-05-31 01:30:25 +02:00
Johan Andersson
9619936f2a flake8 fixes 2018-05-27 16:10:22 +02:00
Johan Andersson
4fc53137d1 dplay: use logging instead of log 2018-05-27 16:05:54 +02:00
Johan Andersson
25831bd1a9 twitch: this should be episodename 2018-05-27 16:04:39 +02:00
Johan Andersson
f754197713 dplay: support for several subtitle languages 
In some cases we dont want to download everything.
by default we will download the language as the .tld
 2018-05-27 16:04:13 +02:00
Johan Andersson
af8fcc7581 hlsparse: put together subtitles when we are done with the other media. 
use random bitrate so we can extract several subtitles if we need to extract it.
 2018-05-27 16:00:05 +02:00
Johan Andersson
bfe7089c58 subtitle: Add subfix after episodename if we want to download all subtitles. 2018-05-27 15:55:25 +02:00
Johan Andersson
0f0e9fc459 urplay: only send the label to the subtitle 2018-05-27 15:54:24 +02:00
Johan Andersson
d69244d39c merge: dont try to merge when new is None 2018-05-26 01:26:30 +02:00
Johan Andersson
526c6bbdbe get_one_media: always remux hls 
fixes #903
 2018-05-25 22:49:05 +02:00
Johan Andersson
326a26aa21 fetcher: use .format for repr 2018-05-25 22:47:48 +02:00
Johan Andersson
bbf2f82b79 fetcher: make name a property 2018-05-25 22:47:26 +02:00
Johan Andersson
72d11fd3d0 setup: rewrite the version information to its own file. 
this will help setup to find new deps that we are missing
 2018-05-24 23:05:34 +02:00
Johan Andersson
dea461c198 get_one_media: instead of using hardcoded name of fetcher check for audio 2018-05-24 21:18:14 +02:00
Johan Andersson
30f09b4bad output: we can have separate a/v stream in .ts but there is no extension to separate them 
fixes: #902
 2018-05-24 21:15:14 +02:00
Johan Andersson
66f102cd92 tv4play: add some extra space around arithmetic operator 2018-05-22 20:19:53 +02:00
Johan Andersson
389acf6a6c npo: use the correct path to urlparse 2018-05-22 20:19:16 +02:00
Johan Andersson
7a8b4af606 tv4play: remove " - " från the name 2018-05-22 00:51:00 +02:00
Johan Andersson
2718f55db7 tv4play: send hls_time_stamp as a argument to fetchers 2018-05-22 00:03:14 +02:00
Johan Andersson
3dd8285c8a qbrick: send other as a argument 2018-05-22 00:02:48 +02:00
Johan Andersson
35d8eb6dd1 Some more options to config 2018-05-22 00:02:20 +02:00
Johan Andersson
b77b78b121 output: dont try to check empty values 2018-05-21 23:37:00 +02:00
Johan Andersson
ae89f52606 tv4play: Add the id number to output 
fixes: #899
 2018-05-21 23:36:34 +02:00
Johan Andersson
24c1be3fd2 viafree: replace options with config 2018-05-21 22:56:22 +02:00
Johan Andersson
81e327ec19 tv4play: send other as a argument to the fetcher class 2018-05-21 22:13:30 +02:00
Johan Andersson
bbc0b70368 tv4play: remove some old option code 2018-05-21 22:13:08 +02:00
Johan Andersson
c5b436e20e services: add output variable to fetchers 2018-05-21 00:56:22 +02:00
Johan Andersson
7aee5164f5 viafree: remove old variable 2018-05-21 00:38:04 +02:00
Johan Andersson
7275829dae hls.download: the extension should be ts not tls 2018-05-21 00:05:31 +02:00
Johan Andersson
1300ab7032 setup_log: use pathname instead of filename 2018-05-20 23:06:15 +02:00
Johan Andersson
8b340bb103 get_media: use config inside of stream 2018-05-20 21:09:49 +02:00
Johan Andersson
a8fa7a8aa3 get_media: we already have this code in parser 2018-05-20 21:05:24 +02:00
Johan Andersson
2605f4ff94 output.formatname: this should be path 2018-05-20 20:51:34 +02:00
Johan Andersson
600afef12b parser.setup_default: add missing default values 2018-05-20 20:29:16 +02:00
Johan Andersson
c41dba7077 parser.merge: rewrite and dont update items with std values 2018-05-20 20:28:49 +02:00
Johan Andersson
2e0bf58a3f parser: this can be on one line 2018-05-20 19:05:35 +02:00
Johan Andersson
e97b104573 unused imports 2018-05-20 19:05:17 +02:00
Johan Andersson
6dfdc8c6c0 Support for config files 
this will search for config file in
unix: ~/.svtplay-dl.yaml
windows: %APPDATA%\svtplay-dl\svtplay-dl.yaml
 2018-05-20 18:21:40 +02:00
Johan Andersson
2543ed7f46 move some special config values to parser 2018-05-20 13:16:00 +02:00
Johan Andersson
6c526a62e1 remove some more excludes 2018-05-13 15:15:11 +02:00
Johan Andersson
8fcd201ddc dash: use exception instead of nothin 2018-05-13 14:21:27 +02:00
Johan Andersson
6b186291dd vimeo: fix bad merge from before.. 2018-05-13 14:20:57 +02:00
Johan Andersson
d2776c3b12 Remove some debug prints 2018-05-13 13:18:36 +02:00
Johan Andersson
a5f1ee4c25 postprocess: set the right output filename when using remux 2018-05-13 13:18:36 +02:00
Johan Andersson
8192fe025d getmedia: right import path to which 2018-05-13 13:18:36 +02:00
Johan Andersson
836084f1fb output: user should be able to set its own output name 2018-05-13 13:18:36 +02:00
Johan Andersson
9a2aafefda parser: set output to None 2018-05-13 13:18:36 +02:00
Johan Andersson
09eac51d6c subtitle: remove unused cookies variable 2018-05-13 13:18:29 +02:00
Johan Andersson
1b1cde811c subtitle: use config instead of options 2018-05-13 13:09:27 +02:00
Johan Andersson
d3799d7660 rtmp: generate correct filename 2018-05-13 13:09:27 +02:00
Johan Andersson
55b07c1dfb fetcher: set output extension 2018-05-13 13:09:27 +02:00
Johan Andersson
9ce61f499d postprocess: generate correct filename 2018-05-13 13:09:27 +02:00
Johan Andersson
5474da2251 postprocess: use config 2018-05-13 13:09:27 +02:00
Johan Andersson
335ff16c8c output: fix detection of already downloaded files 2018-05-13 13:09:27 +02:00
Johan Andersson
81011d4b53 svtplay: only add desc if available 2018-05-13 13:09:27 +02:00
Johan Andersson
bf21419afd output.formatname: this should be ints 2018-05-13 13:09:27 +02:00
Johan Andersson
850ec4612d getmedia: do exclude inside of the streams loop. 2018-05-13 13:09:25 +02:00
Johan Andersson
92763977ed subtitle: better represent line 2018-05-13 13:08:27 +02:00
Johan Andersson
d3841e17da options to commit 2018-05-13 13:08:24 +02:00
Johan Andersson
d4dc9693df postprocess: use output in streams instead of options 2018-05-13 13:07:37 +02:00
Johan Andersson
193edae667 mtvnn: send other as a argument instead of using options 2018-05-13 13:07:37 +02:00
Johan Andersson
77115279e1 remove some old naming methods that we dont need now 2018-05-13 13:07:37 +02:00
Johan Andersson
4271bbe615 remove some old excludes 2018-05-13 13:07:37 +02:00
Johan Andersson
6d490879a4 Remove some empty lines 2018-05-13 13:07:37 +02:00
Johan Andersson
1a14d26b1b Return empty dict instead of None 2018-05-13 13:07:37 +02:00
Johan Andersson
f300e24ca3 more options to config replaces 2018-05-13 13:07:34 +02:00
Johan Andersson
ca49366002 Options to config 2018-05-13 13:06:45 +02:00
Johan Andersson
28dcc90d7e flake8 fixes 2018-05-13 12:10:19 +02:00
Johan Andersson
698ad195b7 rewrite logging a bit 2018-05-13 12:10:19 +02:00
Johan Andersson
a051418dab utils: move functions out of init to its own files. 2018-05-13 12:10:19 +02:00
Johan Andersson
39f1f2c162 change order of operator 2018-05-13 12:09:27 +02:00
Johan Andersson
a7dfff596b svtplay: missing import 2018-05-13 12:09:27 +02:00
Johan Andersson
859fd50efa flake8 break long lines 2018-05-13 12:09:27 +02:00
Johan Andersson
50ef5821f4 flake8 add some space for the operator 2018-05-13 12:09:27 +02:00
Johan Andersson
07b84c1f2e flake8 no need for extra space 2018-05-13 12:09:27 +02:00
Johan Andersson
5339bdc265 flake8 over-indented for visual indent 2018-05-13 12:09:27 +02:00
Johan Andersson
8f126c3d49 flake8 add new line end of file 2018-05-13 12:09:27 +02:00
Johan Andersson
22e3c8e5ac urljoin in hls 2018-05-13 12:09:27 +02:00
Johan Andersson
5d1f86d8fc flake8 fixes 2018-05-13 12:09:27 +02:00
Johan Andersson
8af26fb5c7 unused imports 2018-05-13 12:09:27 +02:00
Johan Andersson
903a4ae71d No need for utils.io 2018-05-13 12:09:27 +02:00
Johan Andersson
7e351530e9 No need for utils.urllib anymore 2018-05-13 12:09:27 +02:00
Johan Andersson
86a8ea52e9 use logging? 2018-05-13 12:09:27 +02:00
Johan Andersson
7137278213 Do the merge and check some options in main 2018-05-13 12:09:27 +02:00
Johan Andersson
a6c4de8d9d flake fix 2018-05-13 12:09:27 +02:00
Johan Andersson
b82831df03 Move services to its own file 2018-05-13 12:09:27 +02:00
Johan Andersson
d496955cb4 Move Options to parser? 2018-05-13 12:09:27 +02:00
Johan Andersson
03c8b68bb6 Move get_* to its own file 2018-05-13 12:09:27 +02:00
Johan Andersson
3da6728ae3 move mergeparseroption to parser.py 2018-05-13 12:08:11 +02:00
Johan Andersson
c135ed3593 move parser to its own file 2018-05-13 12:08:11 +02:00
Johan Andersson
8109b592a6 pep8 fixes 2018-05-13 12:08:11 +02:00
Johan Andersson
e5fff7a15f get_one_media: remove some stdout code 2018-05-13 12:08:11 +02:00
Johan Andersson
2283d3e593 postprocess: fix indentation 2018-05-13 12:08:11 +02:00
Johan Andersson
2c4e3b5843 main: no need for usage 2018-05-13 12:08:11 +02:00
Johan Andersson
022eda0c56 postprocess: rewrite some subfixes checks 2018-05-13 12:08:11 +02:00
Johan Andersson
ddce6ae2aa use argparse instead of optionparser 2018-05-13 12:08:11 +02:00
Johan Andersson
b8c1163852 remove a bunch of is_py. time for py3. 2018-05-13 12:08:11 +02:00
iwconfig
bdf33167d3 check subtitle length before random.sample() 
Pass random.sample() the total number of sentences in the subtitle if less than 8.
i.e. max 8 sentences.

fixes #659
 2018-05-06 20:02:07 +02:00
dalgr
6ee5cbbc80 Make '_autoname' in 'Tv4play' safer by adding value checks and try/except 2018-05-06 19:03:50 +02:00
dalgr
a5ad609a6c Add a new service npo, for 'npo.nl' 2018-05-06 15:36:04 +02:00
dalgr
f474fb9b0c Fix for issue #888, viafree not working 2018-05-06 15:35:23 +02:00
dalgr
346b40dfbf Add better parsing of dates in dash fetcher 2018-03-30 22:52:20 +02:00
dalgr
e77b5e12cd Adjust 'end_time_stamp' for tv4 live, to avid fetching before the stream is publlished 2018-03-30 22:52:20 +02:00
dalgr
8b25a606ee Remove 'window.svt.nyh.reduxStat', for svt.se 2018-03-20 06:56:39 +01:00
dalgr
0bf050df22 Fix support of Clips on svt.se 2018-03-20 06:56:39 +01:00
dalgr
77f0c47be9 Add support for hls fetching from vimeo 2018-03-19 20:55:10 +01:00
dalgr
ca2de62e6f Fix bug with vimeo 2018-03-19 20:55:10 +01:00
dalgr
db0cf86866 Cleanup code for silent, 'File (%s) already exists.' 2018-03-13 22:04:31 +01:00
Johan Andersson
62a59549e9 New version 1.9.11 2018-03-11 23:40:02 +01:00
Johan Andersson
b9d6d5b50c output need some parenthesis in silent. 2018-03-11 21:22:23 +01:00
dalgr
f7bac8754b Avoid printing 'File (%s) already exists.' when running in silent mode. 2018-03-11 19:33:05 +01:00
dalgr
ec483a7045 Fix for the problem cused by 'Crypto.Random' 2018-03-11 10:19:29 +01:00
dalgr
6dc0595765 Improve the name of the outputed file 2018-03-10 22:16:16 +01:00
dalgr
f818993bcd Fixes: 'Another ViaFree issue' 
...
 2018-03-10 22:16:16 +01:00
Johan Andersson
fbb511981e select_quality: this should be get and not pop 2018-03-10 10:09:26 +01:00
Johan Andersson
aff4a0716a select_quality: Sometimes cookies is not present in the stream 
fixes: #858
 2018-03-10 09:56:32 +01:00
Johan Andersson
4b64e1bb9f hlsparse: sometimes we thought that subtitles was audio track 
fixes #853
 2018-03-09 23:20:52 +01:00
Johan Andersson
0eaf0ec8f8 don't hide import errors 2018-03-09 22:53:33 +01:00
Olof Johansson
b18a166898 postprocess: Give up on failure, not success when muxing 
This, I suspect, accidental inversion of the error case led to files not
being cleaned up properly.

Fixes #856, reported by @pulsatorius
 2018-03-09 22:36:30 +01:00
Johan Andersson
281a8ba48c New version 1.9.10 2018-03-08 01:02:42 +01:00
Johan Andersson
735ba0197c get_one_media: dont try to remux the already muxed files 2018-03-06 21:49:43 +01:00
Johan Andersson
3818ee1ee9 postprocess.merge: when we merge .ts to .mp4 we need to have bsf:a 
fixes: #825
 2018-03-06 21:49:43 +01:00
Johan Andersson
35691d85cc hls: we should use .ts and not .mp4 2018-03-06 21:49:43 +01:00
Johan Andersson
4282992719 viafree: they changed from using StartPageStore to ApplicationStore 
fixes: #845
 2018-03-06 21:49:43 +01:00
dalgr
4c62d87087 Modify after review, issue 846 2018-03-06 21:04:48 +01:00
dalgr
f06c09e9c3 Fix issue 846, DASH crash on a video on svtplay 2018-03-06 21:04:48 +01:00
dalgr
8b3a5dacbe hls AES use avilable IV or 'Random.new()' from 'Crypto' 2018-03-04 19:48:17 +01:00
Johan Andersson
58f4c7fdcb dplay: download the video on the program page 
fixes: #824
 2018-03-04 15:06:54 +01:00
dalgr
0d216719b8 Fix issue 829, compare with slug when avilabel 2018-03-04 12:35:05 +01:00
Johan Andersson
3de9396f7d remove some debug prints.. 2018-03-04 11:41:22 +01:00
Johan Andersson
24213562ad postprocess: try to detect the bad audio track and skip it 
this will only work for files with one audio track.
i have never seen file with several
fixes #814
 2018-03-04 11:41:22 +01:00
Peter Janson
e9ce045838 Fixing filename creation for dplay 
Encoding of show name failed. Fixed that!

fixes: #826
 2018-03-04 11:28:21 +01:00
dalgr
848dc12a3a Fix for issue 833, not abble to download hds streams 2018-03-04 11:26:30 +01:00
dalgr
33756e99c4 remove service vidme 2018-03-04 11:24:58 +01:00
Johan Andersson
f1befe0638 dplay: remove debug print for cookies 2018-02-26 10:02:05 +01:00
Johan Andersson
92398d8036 New version 1.9.9 2018-02-26 00:38:54 +01:00
Johan Andersson
61ff824fd6 dplay: fix url for .no and .dk 
fixes: #823
 2018-02-26 00:37:17 +01:00
Johan Andersson
706e8921d0 New version 1.9.8 2018-02-25 21:34:21 +01:00
Johan Andersson
28bbfc6eab dplay: show an error message if its a bad url 2018-02-25 21:25:03 +01:00
Johan Andersson
f8877bb970 dplay: add support for detecting channels 
live stream won't work because the audio and video is in different files.
this can be fixed later.
 2018-02-25 21:25:03 +01:00
dalgr
70fafc7f90 Improve parsing of 'mediaPresentationDuration', for dash 2018-02-25 18:27:19 +01:00
dalgr
b800322f06 Remove usage of 'dateutil.parser' 2018-02-25 18:27:19 +01:00
dalgr
bad41cb1ed Fix support for svt melodifestivalen 2018-02-25 18:27:19 +01:00
dalgr
a82f5fed40 Improvements to dash pasing, avoid empty lists 
Quick fix for added MPD Live support
 2018-02-25 18:27:19 +01:00
Johan Andersson
650d2896e2 dplay: add name of the episode in the filename 
fixes: #819
 2018-02-25 00:09:08 +01:00
Johan Andersson
149c637ce8 dplay: support for exclude 
fixes: #818
 2018-02-24 20:59:23 +01:00
Johan Andersson
a3406c8c53 cmore: add support for .dk/fi/no 
fixes: #815
 2018-02-24 17:39:26 +01:00
Johan Andersson
bdc646b885 cmore: fix login issue with the new site 
fixes: #804
 2018-02-24 17:07:14 +01:00
Johan Andersson
6d3c57a667 svtplay: use parse_qs instead of regex to parse the query 2018-02-21 23:04:20 -05:00
Johan Andersson
3a1735144c svtplay: dont crash if we cant find the show using -A 
fixes: #802
 2018-02-21 22:50:31 -05:00
Johan Andersson
b47ce3ba26 viafree: fix -A so it works again 
fixes 805
 2018-02-21 22:44:19 -05:00
Johan Andersson
2fb54e368b svtplay: in -A and --all-last sort the list if we have episodeNumber 
fixes #800
 2018-02-21 22:12:52 -05:00
Johan Andersson
68553d9870 get_one_media: we should only show this error message when we cant find ffmpeg/avconv 
fixes 813
 2018-02-21 21:38:07 -05:00
Johan Andersson
f42a50ca5f dplay: support for the new design of the page 
fixes #777
 2018-02-21 21:30:36 -05:00
Johan Andersson
083188f8ac subtitle: we need to tell requests to use utf8 for encoding 2018-02-21 21:29:21 -05:00
Johan Andersson
497771a478 hls: support for extracting subtitles 
we need this for dplay
 2018-02-21 21:28:44 -05:00
PO Lenhoff
8401f2f72b hls are now always muxed 2018-02-18 19:03:36 +01:00
dalgr
ccf22ec692 Determine segments if URI attribute is incuded 
Fix bug in '__str__'
 2018-02-12 21:40:27 +01:00
dalgr
10f0807b9a fix bug in raw service 2018-02-12 21:40:27 +01:00
dalgr
0813dfbb70 Alternet way of detecting segments for hls 2018-02-12 21:40:27 +01:00
Johan Andersson
0b920aebe0 eurosportplayer: new site 2018-02-12 00:55:51 +01:00
Johan Andersson
c4f3c8d6f2 fetcher: we need to send a custom header to fetch key in HLS 2018-02-12 00:08:09 +01:00
dalgr
70c94e4131 Adds two fallback options for tv4 autonaming 2018-02-11 21:18:28 +01:00
dalgr
e721c45acd Remove unused 'extention' in raw service 2018-02-11 21:17:37 +01:00
dalgr
fb07e84fa6 Add support of downloading mpd files to service raw 2018-02-11 21:17:37 +01:00
dalgr
7aaa68b267 Compare URI when appending a 'm3u8.media_segment' list 2018-02-10 14:54:38 +01:00
dalgr
9b631e595a Fix service Nickelodeon.se 2018-02-10 14:54:14 +01:00
Johan Andersson
6ed19abb62 hls: we need to add slash at the end of srcurl for urljoin 2018-02-10 00:38:52 +01:00
Johan Andersson
f017d5cf2c hls.get_full_url: use urljoin instead of format string 2018-02-10 00:16:04 +01:00
dalgr
e79251eb7e Fix support for hls segments streams 2018-02-04 23:38:11 +01:00
dalgr
da5ec62241 Improve preformance of hls parser, skip checking all posible videos 2018-02-04 20:40:25 +01:00
Johan Andersson
7b6ceb4737 Flake8 fixes 2018-01-30 20:17:33 +01:00
dalgr
530aef4ed6 Change title formating from custom to 'utils.filenamify' 2018-01-28 21:21:02 +01:00
dalgr
cf7f8c1da8 Add support for service ATG 2018-01-28 21:21:02 +01:00
Olof Johansson
251965ed7e tests/hls: Specify static m3u in module instead of fetching with http 
This avoids dependency on networking to run the test suite, as well as
making the test suite more robust in case of changes at the remote
location. Because of possible copyright issues, I opted not the use the
m3u file, but create a new one with similar properties.

This change also avoids hash ordering issues, by comparing the python
data structures directly, instead of a dumped json representation. There
are no guarantees that keys are ordered the same way when run in
different environments (and possibly in the same environment at
different times).
 2018-01-27 00:29:23 +01:00
Bart Coppens
3b8969eb2f dn.se has data-id attributes with a slightly different format 2018-01-27 00:29:10 +01:00
dalgr
f6e46178a2 Add support for service mtv.se 2018-01-27 00:28:43 +01:00
Johan Andersson
81c0eea37b remove unused imports 2018-01-27 00:07:27 +01:00
dalgr
67421bc6fb Add try/except for json parsing in Aftonbladet service 2018-01-25 22:43:10 +01:00
dalgr
78d1ad6934 Add support for Aftonbladet embedded videos 2018-01-25 22:43:10 +01:00
dalgr
c27e098593 Use max_duriation in hls and wait for tv4 video during commercials. 2018-01-23 19:01:40 +01:00
dalgr
4f7f3aaf7b Change to use international time for tv4 live 2018-01-23 19:01:40 +01:00
dalgr
709618068e Add default value for 'hls_time_stamp', Add live protocol prio 2018-01-23 19:01:40 +01:00
dalgr
938bb81a1b Change hds to display all url when using '--get_url', '-g' 2018-01-21 21:12:14 +01:00
dalgr
f73f5d0b81 fix hls live download for tv4,sjuan,tv12 2018-01-15 22:16:07 +01:00
dalgr
b8dfbd1e3a proof of concept, tv4play live 2018-01-15 00:37:18 +01:00
dalgr
31e5546e26 Add support of downloading a 'media_segment' m3u8 file 2018-01-14 22:29:20 +01:00
Johan Andersson
4cbe743693 New version 1.9.7 2018-01-09 23:46:40 +01:00
Johan Andersson
d33e9a5e85 missing proxy in options 2018-01-09 23:33:21 +01:00
Johan Andersson
4826c22781 nrk: dont try to run keys if streams is None 2018-01-09 22:32:36 +01:00
Johan Andersson
564de61fed barnkanalen: fix sorting on -A 2018-01-09 21:14:01 +01:00
Johan Andersson
503bb540f5 svtplay: remove rss support in find all 
In rss the sorting is way wrong.
 2018-01-09 14:37:32 +01:00
Johan Andersson
dca6e90a80 svtplay: in find all, dont sort the already sorted list. 2018-01-09 14:37:32 +01:00
Johan Andersson
699412dc09 hls._get_tuple_attribute: in some cases there is a space in beginning of the name. 
I saw this on some dplay live streams
 2018-01-09 14:37:32 +01:00
Nick Leppänen Larsson
1f8b7f793f Barnkanalen: inherit from Svtplay 
svtplay modified to better support being inherited
 2018-01-09 00:41:16 +01:00
Nick Leppänen Larsson
bfa6e6e296 Add service Barnkanalen 
Heavily based on svtplay
 2018-01-09 00:41:16 +01:00
Johan Andersson
02ae9767b4 dplay: live support for channels using HLS 2018-01-09 00:40:24 +01:00
dalgr
cace17260a Add capture_time to hls fetcher 2018-01-08 20:15:54 +01:00
dalgr
8ed47dfed6 Add input varibel 'capture_time' 2018-01-08 20:15:54 +01:00
dalgr
939f277f86 Add support for live svtplay using hls 2018-01-08 20:15:54 +01:00
dalgr
786fc6a027 simplify m3u media_segment by adding tag 'URI' 2018-01-07 01:53:00 +01:00
dalgr
c28e35b1cb Add tag 'URI' and simplify m3u json 2018-01-07 01:53:00 +01:00
dalgr
73bdf87b38 Fix bug in m3u8 parser, add a test for 'parse_m3u8.master_playlist' 2018-01-07 01:53:00 +01:00
dalgr
1379ac9c85 Continue with hls, 'EXT-X-MEDIA' 2018-01-07 01:53:00 +01:00
dalgr
ac6cca8919 Fix bug with key/decryptor and new m3u parser 2018-01-07 01:53:00 +01:00
dalgr
4207ccef71 continue improvements of m3u parser 
update with more tags
 2018-01-07 01:53:00 +01:00
dalgr
a875fcb5b6 start improvment of m3u parser 2018-01-07 01:53:00 +01:00
Johan Andersson
e2536eb133 urplay: in some cases they show schema. 2018-01-04 22:17:13 +01:00
Johan Andersson
3d0886a277 urskola: fix -A 2018-01-04 22:16:49 +01:00
Johan Andersson
5a4799f1a5 urplay: add scheme to urls 
fixes #742
 2018-01-04 22:09:17 +01:00
Johan Andersson
c03eefe6d0 sportlib: new site 2018-01-04 00:49:41 +01:00
Johan Andersson
2fa12b5fe1 hls: in some cases we want to use different cookies for the encryption. 2018-01-04 00:49:41 +01:00
Johan Andersson
8716c5e4b8 fetcher: in some cases we want to have different cookies for the key 2018-01-04 00:49:41 +01:00
Jan
ffe63aef19 Viaplay: Fix JSON episode data regexp for "all episodes" as well 2018-01-03 21:45:24 +01:00
Jan
8917d5bd8e Viaplay: Fix regexp for JSON episode data extraction 2018-01-03 21:45:24 +01:00
Robert Foss
c26bb3ccc5 Add proxy support 
This feature utilises the proxy support of the requests module, and
has been tested with SOCKS5 through a SSH tunnel, and has been
verified to be working.

Signed-off-by: Robert Foss <robert.foss@memcpy.io>
 2017-11-26 18:11:41 +01:00
Johan Andersson
788a381077 get_media: when printing version number using verbose. it should be debug. 2017-11-25 11:31:01 +01:00
Johan Andersson
fc4c659ae9 output: make bit more generic 
Remove the output "-". it have been a bit broken for a while.
 2017-11-24 23:11:48 +01:00
Johan Andersson
4dd9bd6cdf get_media: print version number every time we use verbose 
Instead of only printing the version number when we crash.
print it every time we use verbose.

thanks to @granbom for suggesting this idea.
 2017-11-24 21:49:37 +01:00
Johan Andersson
ebbe76ceb1 cmore: dont crash when the filename have åäö in it. 2017-11-13 18:36:06 +01:00
Johan Andersson
3983fcd1f9 cmore: detect the video id better 
fixes #733
 2017-11-13 18:32:16 +01:00
Johan Andersson
4cd40a2665 expressen: they started to use https for their stuff now 
fixes #735
 2017-11-11 13:02:25 +01:00
Jonatan Skogsfors
403f375150 Change priority for SR downloads. 
Download of an SR program with music is typically only available for a
certain period of time while the shortened program is always available.
With that in mind I can’t see how the elif case ever would have been
visited.
 2017-10-30 15:47:29 +01:00
Johan Andersson
2c2446b30b hls: sometimes they have the key as a filename without url 2017-10-22 20:59:17 +02:00
dalgr
892b738bcb Change to use Unicode strings in 'tv4play.py' 2017-10-19 20:10:19 +02:00
granbom
9f1c01a751 Fixing typo. Closes spaam/svtplay-dl#718 2017-10-17 10:41:38 +02:00