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
1,501 Commits 15 Branches 130 Tags 5.7 MiB
6b2c860279
Commit Graph

1128 Commits

Author SHA1 Message Date
Olof Johansson
556d85e31f dash: complete the progress bar after file is downloaded 
The progress bar wasn't updated after the downloaded completed,
so the final progress bar would look something like this:

   [99/100][===============================.] ETA: 0:00:00

This can be interpreted as the file didn't download completely.

Reported-by: rooth
 2016-04-02 17:35:10 +02:00
Olof Johansson
fa66beff9b select_quality: Simplify and add comments 2016-03-31 20:33:44 +02:00
Olof Johansson
f59207302d prio_streams: Rename to protocol_prio 2016-03-31 20:33:44 +02:00
Olof Johansson
84ca17a14c select_quality: Replace sys.exits with UIExceptions 2016-03-31 20:19:44 +02:00
Olof Johansson
dad2790d9e select_quality: Filter out unwanted protocols before bitrate 
It was easily possible to end up in a state where the bitrate prioritization
wanted a bitrate only avaiable via protocols outside of our set of accepted
protocols, like trying to disable dash for svtplay. By doing the protocol
filtering first, we end up only considering "valid" bitrates.
 2016-03-31 20:19:44 +02:00
Olof Johansson
9d2054b4bc select_quality: handle when no requested proto is available 
Needs to widen the scope of the try: catch block in svtplay_dl/__init__.py
a little, since select_quality can now also fire away UIExceptions.
 2016-03-31 20:19:44 +02:00
Olof Johansson
51c71aa1cb error: New exception, NoRequestedProtocols 
This excpetion is thrown when the stream can't be accessed by any accepted
protocol (as decided by options.stream_prio).
 2016-03-31 20:19:44 +02:00
Olof Johansson
a6e05e4502 prio_streams: make protocol_prio param mandatory 
Move the responsibility for extracting it to select_quality (prio_streams'
caller). This makes the prio_streams function simpler.

And at the same time, move the default protocol_prio list to global scope. This
can for instance be used for improved error reporting.
 2016-03-31 20:19:44 +02:00
Olof Johansson
b6541100a3 select_quality: fix argument parsing 
Instead of parsing the argument to --stream-prio as a comma separated listed, it
was accidentally handled as a space separated list.
 2016-03-31 20:19:44 +02:00
Johan Andersson
c125540498 postprocess: this should be None and not False 2016-03-30 18:18:43 +02:00
Johan Andersson
f0c00090d9 New release 1.0 2016-03-28 21:32:26 +02:00
Johan Andersson
a343178d46 update pod file 2016-03-28 21:15:39 +02:00
Johan Andersson
e20f1212c0 update tests 2016-03-28 21:11:32 +02:00
Johan Andersson
c31cdfeeec postprocess: add copyts 2016-03-28 19:17:06 +02:00
Johan Andersson
1627abc956 tv4play: show an error message when the video is not there 2016-03-27 13:02:49 +02:00
Johan Andersson
f92e94a8d2 expressen: update way to download the videos 2016-03-27 12:49:27 +02:00
Johan Andersson
2941cb31eb include the dash.py file 2016-03-26 23:08:22 +01:00
Johan Andersson
e523141a04 support for dash streams 2016-03-26 21:38:31 +01:00
Johan Andersson
f7488af095 get_media: split all_episodes to its own function 2016-03-26 13:08:45 +01:00
Johan Andersson
504b3ccf22 makefile: include postprocess in the binary 
fixes #360
 2016-03-25 21:46:41 +01:00
Johan Andersson
78ceb3c669 dplay: check 401 if we are geoblocked 2016-03-23 00:22:37 +01:00
Johan Andersson
22614e1aa6 postprocess: dont hardcode avconv 2016-03-22 23:31:32 +01:00
Johan Andersson
4c8cb7c5d2 which: detect if you have the app in your cwd 2016-03-22 23:31:07 +01:00
Johan Andersson
60a54d7c0a postprocess: do check for ffmpeg and avconv 2016-03-22 23:00:50 +01:00
Johan Andersson
4218dd5a5b postprocess: basic remux files to .mp4 with ffmpeg/avconv 
fixes #121
fixes #36
 2016-03-22 22:36:39 +01:00
Johan Andersson
2d43702828 fetcher: set a variable if the stream is finished. 2016-03-22 22:28:41 +01:00
Johan Andersson
bb861a4062 utils: implement a function to find program in path 2016-03-22 22:28:07 +01:00
Johan Andersson
cad24eebd4 svtplay: it should be parse.path to detect klipp 2016-03-22 22:26:15 +01:00
Johan Andersson
b9c8851ab1 svtplay: more ways to detect embedded videos or clips 2016-03-20 23:21:21 +01:00
Johan Andersson
ab2741f6bf solidtango: more ways to detect solidtango 2016-03-20 21:04:09 +01:00
Johan Andersson
ab3646e4e2 tv4play: dont encode the showname 2016-03-20 19:15:51 +01:00
Johan Andersson
67fa41fcc5 tv4play: they change the name from user_name to username 2016-03-20 18:40:24 +01:00
Johan Andersson
260bd6c5c6 tv4play: wrong user/passwd crashes the script. 
exception handling cant handle unicode on py2
 2016-03-20 18:35:53 +01:00
Johan Andersson
a32074dbbe urplay: support for urskola 
fixes: #358
 2016-03-20 18:21:07 +01:00
Johan Andersson
ca6bb5c9c0 picsearch: more ways to detect the service 2016-03-20 18:20:19 +01:00
Johan Andersson
aba4d892f8 progressbar: this should be bit smaller because of fetcher.http 
using bytes instead of low number takes more room
 2016-03-20 00:32:01 +01:00
Johan Andersson
ccc502f4a1 fetcher_http: update to use progressbar instead of progress 2016-03-20 00:30:43 +01:00
Johan Andersson
05a20520b0 svtplay: fix embedded videos on svt.se 2016-03-17 16:57:58 +01:00
Johan Andersson
8da9cab05b filenamify: dont remove the char before and after - 2016-03-17 16:57:12 +01:00
Johan Andersson
05b245dfaa filenamify: replace .-. with only - 2016-03-16 22:51:19 +01:00
Johan Andersson
d3b0e106c3 generic: download embedded picsearch videos 
fixes: #356
 2016-03-16 22:50:43 +01:00
Johan Andersson
af70db9431 generic: download embedded lemonwhale videos 
fixes: #355
 2016-03-16 22:47:03 +01:00
Johan Andersson
ef22f9885e generic: service need one more argument 2016-03-16 19:36:40 +01:00
Johan Andersson
2bb8f82287 lemonwhale: add support for vk.se 2016-03-16 18:58:17 +01:00
Johan Andersson
6d57453278 hls._get_full_url: dont append query string to the url 2016-03-16 18:56:52 +01:00
Johan Andersson
65dc028a9e svtplay: öppetarkiv cant find program name sometimes 
fixes: #348
 2016-03-15 21:19:04 +01:00
Johan Andersson
b31d52390e nrk: support for tv.nrksuper.no 
fixes: #346
 2016-03-15 21:19:04 +01:00
Olof Johansson
e781a1e89b prio_streams: add unit tests 2016-03-13 16:56:51 +01:00
Olof Johansson
4740a42050 prio_streams: remove selected from parameters 
Moving the responsibility for filtering out "unwanted" bitrates,
as opposed to just present a prioritized list, makes writing
unit tests easier.
 2016-03-13 16:56:51 +01:00
Olof Johansson
fe23b971a5 prio_streams: remove options from parameters 
Instead, pass the protocol prio list; this was the only reason
we used to pass options. Removing options makes it easier to
unit test.
 2016-03-13 16:56:51 +01:00
Olof Johansson
af298e86d9 prio_streams: fix issues with prioritization 
Previously, prio_streams didn't correctly account for the protocol,
and we ended up with HDS videos by default, instead of HLS as exected,
because HDS sorts before HLS alphabetically.

Fixes #349
 2016-03-13 16:56:51 +01:00
Olof Johansson
fac120c692 make: pylint --report=no should be --reports=no 
According to pylint's changelog, --reports has been the officially
documented flag since its introduction, but until recently, --report
also seems to have worked. This has now changed.
 2016-03-08 20:32:29 +01:00
Johan Andersson
f047331b8c pylint fixes 2016-02-29 23:19:01 +01:00
Johan Andersson
eb5e2fe5d4 dplay: new way to detect video id 
fixes: #347
 2016-02-29 23:18:27 +01:00
Johan Andersson
8a4469c810 Anomalous backslash in string fixes 2016-02-22 20:43:57 +01:00
Johan Andersson
55d811286d solidtango: support for embedded and videos on solidtango.com 
fixes: #343
 2016-02-19 21:29:49 +01:00
Johan Andersson
7f1e2d6fd7 New release 0.30.2016.02.08 2016-02-08 21:47:54 +01:00
Johan Andersson
cd75cd5b63 subtitle.tt: dont crash on negative milliseconds. 2016-02-08 21:28:39 +01:00
Johan Andersson
013b6d1d82 dplay: support for all_last episodes 
fixes: #329
 2016-02-07 22:16:45 +01:00
Johan Andersson
293b6ae7e5 dplay: better show a error message instead of crashing 2016-02-07 20:44:03 +01:00
Johan Andersson
8db85270c8 dplay: better support for .dk, .no sites 
fixes #339
 2016-02-07 20:43:51 +01:00
Johan Andersson
e1459fab2f svtplay: need to encode the string before hashing it 
fixes #344
 2016-02-07 20:10:36 +01:00
Johan Andersson
901ae80c88 unused import 2016-02-07 10:44:49 +01:00
Johan Andersson
595d5a97ac efn: unused variable 2016-02-07 10:44:38 +01:00
Johan Andersson
70254e3429 unused imports 2016-02-07 10:41:43 +01:00
Johan Andersson
4b6393c060 dplay: change to “is” instead of == 2016-02-07 10:32:47 +01:00
Johan Andersson
0f340b194e hds: remove some left over debug code.. 2016-02-07 10:31:28 +01:00
Johan Andersson
4e88894f0c remove some empty lines. 2016-02-07 10:28:07 +01:00
Johan Andersson
4e88d27cbc hls, hds: dont try to parse bad data 
fixes: #342
 2016-02-07 10:27:01 +01:00
Johan Andersson
1fa3204374 viaplay: we should get the subtitle after we set name 
fixes #341
 2016-02-07 10:25:49 +01:00
Johan Andersson
3f04ae2a56 swap place on py2 and py3 checks 2016-01-27 19:49:38 +01:00
Johan Andersson
219a134069 tv4play: dont quote unicode strings 
fixes #336
 2016-01-27 19:28:37 +01:00
Olof Johansson
5c76619e5e Reraise exception proplery to UI with --verbose 
When doing raise without arguments in an exception handler, the
exception is reraised with the original exception details.
Currently, the exceptions raised are all attributed the line
changed in this commit.
 2016-01-26 00:20:17 +01:00
Johan Andersson
99a0a1169a hdsparse: we should use bootstrapinfoid instead of 0 2016-01-17 00:36:15 +01:00
Johan Andersson
83e63d3e7a New release 0.30.2016.01.10 2016-01-10 21:39:18 +01:00
Johan Andersson
f965b4a00b hls argument never worked. 2016-01-10 21:18:55 +01:00
Johan Andersson
7f2325cc10 main: show which order we preferred download method 2016-01-10 21:17:34 +01:00
Johan Andersson
9274870f81 svtplay: unused import 2016-01-10 20:58:30 +01:00
Johan Andersson
caf936947f svtplay: update the data from the new vid 2016-01-10 20:43:10 +01:00
Johan Andersson
5d61cb9371 svtplay: use the data we already have 2016-01-10 20:42:23 +01:00
Johan Andersson
00114f6750 svtplay: another videoid from the url 2016-01-10 20:36:13 +01:00
Johan Andersson
e895e02d70 svtplay: move find video id into its own function 2016-01-10 20:36:13 +01:00
Johan Andersson
f4b32cb1df Merge pull request #326 from olof/filenamify_improvements 
filenamify: disallow shell metachars + improvements
 2016-01-10 20:36:07 +01:00
Olof Johansson
7803472713 utils: specify utf-8 encoding in editor modelines 2016-01-10 15:03:45 +01:00
Olof Johansson
f4005505d9 filenamify: Simplify and add unittests 2016-01-10 15:03:45 +01:00
Olof Johansson
9689dc78b0 filenamify: Make title regexp stricter 
The - character is a range operator when used in character classes
(e.g. [0-9]). In our case, we want it to match a literal - (which it
coindicentally does, since it's within the range [ -.]. But we don't
want it to match other characters within this range.
 2016-01-10 14:33:22 +01:00
Johan Andersson
1ddaad7beb öppetarkiv: all episodes need option 2016-01-07 17:18:38 +01:00
Johan Andersson
9dcf203923 option to select which type of streams you prefer 
fixes #321
 2016-01-03 16:15:27 +01:00
Johan Andersson
1481e7effd tv4play: fix so we can download normal shows again 
fixes #320
 2016-01-03 15:10:24 +01:00
Johan Andersson
fc58956e9a fetcher: better output when printing the class 2016-01-03 02:43:23 +01:00
Johan Andersson
c5460b999d svtplay: dont include other in the filename 
Sometimes other is the same as name.
fixes #319
 2016-01-03 02:43:23 +01:00
Johan Andersson
e0ad3b9967 svtplay: öppetarkiv still use the old names for format 2016-01-03 02:43:23 +01:00
Patrik Ragnarsson
11da233ddf Improve the error message given on crash 
Use stderr.
 2016-01-01 18:20:34 +01:00
Johan Andersson
2901305818 mtvnn: fix support for downloading every episode 
fixes: #316
 2016-01-01 14:09:44 +01:00
Johan Andersson
4e24870519 disney: support for disney junior 
fixes #317
 2016-01-01 13:18:08 +01:00
Johan Andersson
4237021bc7 svtplay: it should be websrt and not wsrt 2015-12-28 11:41:39 +01:00
Johan Andersson
0a20279a94 svtplay: we should check if the user is using svtplay.se 2015-12-28 11:41:15 +01:00
Johan Andersson
cfea570432 svtplay: use sha256 of the version string as id 2015-12-27 20:55:10 +01:00
Johan Andersson
66898565b3 svtplay: support for the next version of the page. 
video id is left to fix... dunno how to do it in a good way
 2015-12-27 14:40:27 +01:00
Johan Andersson
eb7bd48d5a utils.http: support for custom headers 
fixes: #209
 2015-12-26 13:38:36 +01:00
Johan Andersson
ff0ce41b72 utils: update the user-agent 2015-12-26 13:35:55 +01:00
Johan Andersson
ef74148003 Option to not verify ssl certificate 2015-12-26 12:14:14 +01:00
Johan Andersson
dd67365150 kanal5 is gone. long live dplay 2015-12-26 11:55:11 +01:00
Johan Andersson
b5ea350c0f Move options to when we init the service class 2015-12-26 11:46:14 +01:00
Johan Andersson
7dea8c80ba tv4play: detect which program the video belongs too. 
fixes #313
 2015-12-15 00:43:44 +01:00
Johan Andersson
d0e6d8584c tv4play: find id for clips too 
fixes #313
 2015-12-15 00:30:40 +01:00
Johan Andersson
4240cc0e6f dplay: support for dplay.dk and it.dplay.com 2015-11-29 22:50:15 +01:00
Johan Andersson
5c1d32dca8 Prepare for release 0.20.2015.11.29 2015-11-29 17:36:03 +01:00
Johan Andersson
287f10d36e get_one_media: remove sys.exit 
Fixes #304
 2015-11-29 17:27:43 +01:00
Johan Andersson
e9ab24f687 facebook: update path for video 2015-11-29 16:46:24 +01:00
Johan Andersson
fb4de6fb3b mtvnn: support for comedycentral.se 
this fixes #306
 2015-11-29 16:46:24 +01:00
Johan Andersson
144b79e1b8 picsearch: detect live video 2015-11-29 16:46:24 +01:00
Johan Andersson
a6a3cfce18 dplay: dont crash when accessing a program page instead of video 2015-11-29 16:46:24 +01:00
Olof Johansson
a6d8e537d1 make: add missing echo, affects builds without git 
Command used to generate the VERSION string from git had a missing echo, so
would try to execute $(LATEST_RELEASE)-unknown instead of assigning it as a
value.
 2015-11-23 23:48:40 +01:00
Björn Dahlgren
4d972063d2 Fixed TV4Play geoblock error text 
Fixes: #308
 2015-11-23 18:54:07 +01:00
Olof Johansson
50eba055a5 sr: Find URLs with either playepisode= or playaudio= params 
Fixes #295
 2015-11-23 18:46:17 +01:00
Johan Andersson
f606775eb6 dr: dont crash when there is no subtitles. 2015-11-15 18:21:42 +04:00
Johan Andersson
c78960d2b8 hlsparse: this should be HLS and not HDS 2015-11-15 18:21:05 +04:00
Johan Andersson
db13aa6bb3 get_one_media: only print error messages when we dont have any videos 2015-11-15 18:20:16 +04:00
Johan Andersson
ba4b36e43e ruv: print the url instead of %s 2015-11-15 15:48:24 +04:00
Johan Andersson
a6e292cfee dbtv: the videoid is int in the json file 2015-11-15 15:48:24 +04:00
Johan Andersson
7d9f18de79 lemonwhale: they use json now and not xml anymore 2015-11-15 15:48:24 +04:00
Johan Andersson
4c6884e3b9 vimeo: they changed the format of the json file 2015-11-15 15:48:24 +04:00
Johan Andersson
03d05dddb3 bambuser: we should use text instead of content 2015-11-15 15:48:24 +04:00
Johan Andersson
5928df5f3c picsearch: better error message when the video is not available 2015-11-15 15:48:24 +04:00
Olof Johansson
0ead96f03e Log all errors, and exit with failure if no video found 
Fixes #301
 2015-11-04 21:11:16 +01:00
Johan Andersson
409310252d dplay: support for subtitles 2015-10-30 00:54:18 +01:00
Johan Andersson
e1cb21c20a subtitle: raw type 2015-10-30 00:51:35 +01:00
Johan Andersson
2998080bc0 dplay: support for all episodes 
fixes #296
 2015-10-30 00:29:48 +01:00
Johan Andersson
e0b1ba67ba dplay: use video_metadata_show instead 2015-10-29 22:44:13 +01:00
Johan Andersson
95cfe922bf dplay: support for premium content 2015-10-29 22:42:27 +01:00
Johan Andersson
31575abc51 hls: parsem3u dont crash when EXT-X- is one 2015-10-29 22:15:14 +01:00
Johan Andersson
68f300ec05 dplay: better names for output file 2015-10-29 19:32:38 +01:00
Johan Andersson
25f24a369e big brother: fail on premium instead of crash 2015-10-29 19:32:12 +01:00
Johan Andersson
8f33c450bc bigbrother: support for progressive download 2015-10-29 18:20:17 +01:00
Johan Andersson
cfbb068474 svtplay: simplify json url 2015-10-29 18:08:25 +01:00
Johan Andersson
08752c3c85 Prepare for release 0.20.2015.10.25 2015-10-25 22:51:44 +01:00
Johan Andersson
6a7cdc4b8f Merge pull request #292 from olof/fix_filenamify_docstring_dots_doctest 
Fix docstring after the filenamify changes (f3aba4e59)
 2015-10-25 20:43:48 +01:00
Johan Andersson
320cdda374 Merge pull request #293 from olof/allow_metachars_in_outputfile 
Don't workaround windows cmdline parsing brokeness
 2015-10-25 19:56:04 +01:00
Olof Johansson
270a64c6af Fix docstring after the filenamify changes (f3aba4e59) 
This caused the test suite to fail because of doctest.
 2015-10-25 19:49:03 +01:00
Olof Johansson
44293899fc Don't workaround windows cmdline parsing brokeness 
We should be able to assume that if we see literal " in the name of the
output file, the user really wants the quotes. Assuming otherwise opens a
can of worm. What else can't we trust in the environment?

On the Windows command line, \ has special meaning in strings, and it's not
the same as on normal platforms: it only has special meaning if it's
immediately followed by a " character, in which it case it will make the "
character be interepreted literally. That's what we've been seeing.

Incorrect command line on windows:

     python svtplay-dl -o "C:\foo\"

Correct command line on windows:

     python svtplay-dl -o "C:\foo\\"

This has been made harder to pinpoint because of the forgiving nature of
command line parsing on windows. For instance: The following command was
reported to work:

     python svtplay-dl http://example.com/ -o "C:\foo\"

But only if the -o flag was the last argument. (Unclear if the trailing "
was passed on to the program or not.)

Reference: https://msdn.microsoft.com/en-us/library/windows/desktop/17w5ykft(v=vs.85).aspx
 2015-10-25 19:41:39 +01:00
Johan Andersson
739565cd27 hls, hds, http: its should be “and” and not “or” 2015-10-25 19:24:14 +01:00
Johan Andersson
6b240e2f24 hds: support for silent 2015-10-25 18:23:39 +01:00
Johan Andersson
626bef92d5 hls: support for silent 2015-10-25 18:23:28 +01:00
Johan Andersson
78d962d05e http: support for silent 2015-10-25 18:23:16 +01:00
Johan Andersson
f7442661f1 options: get_url need to be here 2015-10-25 18:16:30 +01:00
Johan Andersson
8129a49348 subtitle: we need to tell the file is utf-8 on windows and py3 2015-10-25 17:19:16 +01:00
Johan Andersson
a98e6046be output: add kwargs as argument 2015-10-25 17:18:40 +01:00
Johan Andersson
9f602c1fb1 urplay: support for betaplay 2015-10-25 16:15:26 +01:00
Johan Andersson
e2a816127e urplay: rtmp is so 90s. removing it 2015-10-25 16:15:26 +01:00