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,577 Commits 15 Branches 130 Tags 5.7 MiB
6dec190df0
Commit Graph

1115 Commits

Author SHA1 Message Date
iwconfig
91cc1a18a2 Fixed minor bug with manual mappings options for ffmpeg 
also a tiny cleanup
 2016-07-11 23:05:03 +00:00
Johan Andersson
dfcae7456e svtplay: in some cases there is no season slug for videos 2016-07-11 10:44:33 +02:00
iwconfig
c5eea95c3f Now --remux is on by default with --merge-subtitle. 
Also fixed small bug when using --all-subtitles with only one available
subtitle.
 2016-06-30 23:57:27 +00:00
iwconfig
3c1d45a37c Fixed issue with --force-subtitle. 
--force-subtitle and -S did not respect each other but now it is
working as it should. If --force-subtitle is used with -S it downloads
only the subtitles, and if --force-subtitle is used alone it overwrites
the existing subtitles and continues with the audio/video stream.
 2016-06-30 23:57:27 +00:00
iwconfig
4e63c15ef9 Added -M, --merge-subtitle to merge subtitle(s). 
The option gets the correct ISO639-3 language code using my own simple
language detection api, and merges with correct metadata using ffmpeg.
If ffmpeg is not installed an error message is raised since avconv
doesn't seem keep up with ffmpeg.

I also did a little cleanup in postprocess().
 2016-06-30 23:57:27 +00:00
Johan Andersson
0ae031b8ac tv3play: fix all downloads if it more than one seaon 
fixes: #389
 2016-06-30 01:20:39 +02:00
Johan Andersson
12f8a47415 svtplay: download all episodes with 'visa fler' 
fixes: #407
 2016-06-30 01:20:31 +02:00
Johan Andersson
421f53f099 dplay: support for other languages in subtitles 
fixes: #410
 2016-06-30 01:20:12 +02:00
Rabin Vincent
ddeec9e90b dr: support --all-episodes 2016-06-30 00:08:42 +02:00
Svein Hansen
c2d8d64e99 Changes to nrk web pages: 
Simpler html-parsing
Fixed subtitle support
 2016-06-09 22:21:11 +02:00
Johan Andersson
8973f19bf7 New release 1.2 2016-06-03 00:12:08 +02:00
Johan Andersson
d8b2b8efa6 timestr: leading zero in single digit 2016-06-03 00:09:11 +02:00
Johan Andersson
f0fe1638eb output: print which filename exists while printing the error message 
fixes: #391
 2016-06-02 23:56:41 +02:00
iwconfig
4f6c4821d7 remux only if file is not mp4 2016-06-02 01:47:25 +02:00
Johan Andersson
cf7380211f mtvnn: add support for nickelodeon.dk 
fixes #394
 2016-06-02 00:54:35 +02:00
Johan Andersson
10a259982e smi: it should be three decimals and not two 
this fixes #398
 2016-06-01 22:54:11 +02:00
Johan Andersson
c0b4d278b4 sami: dont crash on & 
this fixes #396
 2016-06-01 22:43:39 +02:00
Johan Andersson
b298e823eb nrk: add some error checks if geoblocked 2016-06-01 22:15:45 +02:00
Johan Andersson
53d702708b get_one_media: include version crash 2016-06-01 22:11:01 +02:00
Johan Andersson
704fc6dee8 disney: move down the exclude so it catch the new name 2016-06-01 22:11:01 +02:00
Svein Hansen
56a404686a tv.nrk.no website html change. Error when finding the video id. 2016-05-26 23:09:47 +02:00
Johan Andersson
fa730a5564 remove options in argument for exclude 2016-05-14 22:54:30 +02:00
Johan Andersson
c324374ba7 service: exclude should use options in the class 2016-05-14 22:41:33 +02:00
Johan Andersson
af66859dd5 get_one_media: move force_subtitle to main function 
with this it will work for every site with subtitles
 2016-05-14 22:38:23 +02:00
Johan Andersson
23814a9bf5 select_quality: fix crash while using range 
fixes: #392
 2016-05-14 11:17:34 +02:00
qnorsten
24a1789949 subtitles: --convert-subtitle-colors command added to convert color information in wsrt subtitle files to <font color=""> tags. 2016-05-09 15:10:58 +02:00
qnorsten
4b9cd2a954 Merge branch 'master' of https://github.com/spaam/svtplay-dl.git 
# By Johan Andersson (7) and qnorsten (1)
# Via Johan Andersson
* 'master' of https://github.com/spaam/svtplay-dl.git:
  New release 1.1
  Update makefile version number
  makefile: fix a sed error
  diff_man: detect extented regex for sed
  Add new agruments to pod file
  main: move all-subtitles to the rest of subtitles agruments
  Add a silent-semi argument
  get_one_media: added missing checks if subtitles exists before trying to print url using -g
 2016-05-05 17:08:45 +02:00
Johan Andersson
c6abc2e6d9 New release 1.1 2016-05-05 14:02:03 +02:00
Johan Andersson
468f36c62c main: move all-subtitles to the rest of subtitles agruments 2016-05-05 12:34:05 +02:00
Johan Andersson
7a29dcb65a Add a silent-semi argument 
It that will only print error, warning and
when the file is downloaded.
 2016-05-05 11:34:10 +02:00
qnorsten
7d575ee382 get_one_media: added missing checks if subtitles exists before trying to print url using -g 2016-05-05 10:38:43 +02:00
qnorsten
f807f48b7a get_one_media: added missing checks if subtitles exists before trying to print url using -g 2016-05-05 09:46:12 +02:00
qnorsten
5871f81695 output: removed unnecessary print 2016-05-05 01:26:38 +02:00
qnorsten
507bb3cf31 output: wrst now detected as extension. srt file no longer named .wrst.srt when saving raw subtitle from SVT-play. 2016-05-04 09:44:56 +02:00
qnorsten
a774a8052b Merge branch 'master' of https://github.com/spaam/svtplay-dl.git into rawsubs 
# By Johan Andersson (7) and qnorsten (4)
# Via Johan Andersson (2) and qnorsten (1)
* 'master' of https://github.com/spaam/svtplay-dl.git:
  urplay: dont crash when there is no label
  twitch: Fix so we can get live url again
  fetcher: dont print newline when its silent
  main: add dash in the help text for preferred
  tv4play: free videos with premuim showed up as None
  tv4play: fix unicode errors in showname
  Fixed missing space error
  Some minor code improvments
  postprocess: ext includes dot before fileextention
  Updated gitignore
  Added support for subfix in filename of subtitles, when several languages are available Added command to download all available subtitles for a video (--all-subtitles) Added support to print all the subtitle urls when the get url parameter is used Fixed so subtitle url and stream url get printed if -S and -g but not --force-subtitles parameter is used Added support for downloading all subtitles and auto subfix them with language name for Urplay and Urskola (even when just one subtitle is downloaded)
 2016-05-03 22:43:57 +02:00
Johan Andersson
f49354387a urplay: dont crash when there is no label 2016-05-03 20:35:16 +02:00
Johan Andersson
435e58436e Merge pull request #379 from qnorsten/master 
Added support for download of all available subtitles on a video
 2016-05-03 20:18:32 +02:00
Johan Andersson
45be38c39d twitch: Fix so we can get live url again 
fixes: #385
 2016-05-02 22:26:30 +02:00
Johan Andersson
3ea58c0461 fetcher: dont print newline when its silent 2016-05-01 13:12:19 +02:00
Johan Andersson
1a2b3001cc main: add dash in the help text for preferred 
fixes: #383
 2016-04-30 22:15:35 +02:00
Johan Andersson
5cf6e0fe45 tv4play: free videos with premuim showed up as None 2016-04-30 14:10:43 +02:00
Johan Andersson
03a6307f38 tv4play: fix unicode errors in showname 
fixes: #336
 2016-04-30 13:54:26 +02:00
qnorsten
b3f03c2a69 output: Raw subs now affected by --force-subtitles and not --force 2016-04-29 11:51:24 +02:00
qnorsten
f77b560ad8 output: Modifed whitelist from srt to all subs to fix error with raw subtitle file preventing download of videofile 2016-04-29 11:51:23 +02:00
qnorsten
258a969aa1 subtitle: removed parentesis in if check 2016-04-29 11:51:18 +02:00
qnorsten
d72ff200a6 subtitle: fix so right filename is saved when saving raw subs 2016-04-29 11:51:07 +02:00
qnorsten
e54eb77993 subtitle: fixed syntax error 2016-04-29 11:50:43 +02:00
qnorsten
e2093c9a4d subtile: minor code improvments 2016-04-29 11:50:17 +02:00
qnorsten
617f519977 subtitle: added command --raw-subtitles to download raw subtitle file also 2016-04-29 11:49:44 +02:00
qnorsten
162901b263 subtitle: added command --all-subtitle to download all available 
subtitles.
subtitle: Added support for subfix in subtile filename.
urplay: added support to download more than 1 subtitle
Added support to print all the subtitle urls when the get url parameter is used
Fixed so subtitle url and stream url get printed if -S and -g but not --force-subtitles parameter is used
Added support for downloading all subtitles and auto subfix them with language name for Urplay and Urskola (even when just one subtitle is downloaded)
 2016-04-29 11:41:34 +02:00
qnorsten
26a027517c Merge pull request #1 from spaam/master 
postprocess: ext includes dot before fileextention
 2016-04-28 23:14:08 +02:00
qnorsten
156d60f8de Fixed missing space error 2016-04-27 19:41:23 +02:00
qnorsten
428d4c5022 Some minor code improvments 2016-04-27 19:37:32 +02:00
Johan Andersson
003c494e0b postprocess: ext includes dot before fileextention 
this fixes: #380
 2016-04-27 18:53:47 +02:00
qnorsten
56e07188ee Added support for subfix in filename of subtitles, when several languages are available 
Added command to download all available subtitles for a video (--all-subtitles)
Added support to print all the subtitle urls when the get url parameter is used
Fixed so subtitle url and stream url get printed if -S and -g but not --force-subtitles parameter is used
Added support for downloading all subtitles and auto subfix them with language name for Urplay and Urskola (even when just one subtitle is downloaded)
 2016-04-27 10:37:47 +02:00
Johan Andersson
f159ebd9e3 get_one_media: dont download subtile with -g and -S 
fixes: #366
 2016-04-27 00:38:44 +02:00
Johan Andersson
d56a5f4deb get_one_media: print subtitle url 
with --force-subtile, -g and -S it will print the url for subtitle
fixes: #367
 2016-04-27 00:34:25 +02:00
Johan Andersson
0fe57c52a2 select_quality: support for range to -q 
this is similar to -Q  but instead its -q 2000,3000  . it will choose one in between
fixes: #372
 2016-04-26 23:48:12 +02:00
Johan Andersson
92b734daab urplay: fix scrape so it works again 
this fixes: #374
 2016-04-26 23:22:59 +02:00
Johan Andersson
254edb99b7 get_all_episodes: copy options to the next service 
this fixes: #373
 2016-04-26 23:18:45 +02:00
Johan Andersson
4d392d6664 subtitle: strip line endings 2016-04-20 18:42:46 +02:00
Johan Andersson
e5059afb7a tv4play: add client to post data 2016-04-19 21:58:11 +02:00
Johan Andersson
fcbcb25fce picsearch: new type of embedded video 2016-04-19 21:08:17 +02:00
Johan Andersson
6d79ce9c04 tv4play: new url for login 2016-04-19 21:06:51 +02:00
Olof Johansson
5393dc1929 Fix various pylint warnings 
None of these were any real problems, but easier to spot real issues if pylint
is a bit quieter. Apart from the pylint overrides being sprinkled over the code
base, this commit also fixes occurences of the following issues:

 - logging-not-lazy
 - logging-format-interpolation
 - unused-import
 - unused-variable
 2016-04-03 19:06:45 +02:00
Johan Andersson
f15df72ff2 Merge pull request #362 from olof/dash_complete_progressbar 
dash: complete the progress bar after file is downloaded
 2016-04-02 17:52:12 +02:00
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
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
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