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
2,351 Commits 15 Branches 130 Tags 5.7 MiB
1c47b0602c
Commit Graph

282 Commits

Author SHA1 Message Date
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
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
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
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
1a2b3001cc main: add dash in the help text for preferred 
fixes: #383
 2016-04-30 22:15:35 +02:00
Johan Andersson
03a6307f38 tv4play: fix unicode errors in showname 
fixes: #336
 2016-04-30 13:54:26 +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
428d4c5022 Some minor code improvments 2016-04-27 19:37:32 +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
254edb99b7 get_all_episodes: copy options to the next service 
this fixes: #373
 2016-04-26 23:18:45 +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
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
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
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
4218dd5a5b postprocess: basic remux files to .mp4 with ffmpeg/avconv 
fixes #121
fixes #36
 2016-03-22 22:36:39 +01:00
Johan Andersson
7f1e2d6fd7 New release 0.30.2016.02.08 2016-02-08 21:47:54 +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
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
9dcf203923 option to select which type of streams you prefer 
fixes #321
 2016-01-03 16:15:27 +01:00
Patrik Ragnarsson
11da233ddf Improve the error message given on crash 
Use stderr.
 2016-01-01 18:20:34 +01:00
Johan Andersson
eb7bd48d5a utils.http: support for custom headers 
fixes: #209
 2015-12-26 13:38:36 +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
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
db13aa6bb3 get_one_media: only print error messages when we dont have any videos 2015-11-15 18:20:16 +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
08752c3c85 Prepare for release 0.20.2015.10.25 2015-10-25 22:51:44 +01:00
Johan Andersson
f7442661f1 options: get_url need to be here 2015-10-25 18:16:30 +01:00
Johan Andersson
f549a567e4 Merge pull request #273 from leakim/master 
fix crach on empty error array cause by no streams
 2015-10-25 16:12:08 +01:00
Johan Andersson
7322b2d2ca Prepare for release 0.20.2015.10.08 2015-10-08 23:25:24 +02:00
Johan Andersson
d53adcb2ad Support for dplay.se 
fixes #274
 2015-10-04 14:40:00 +02:00
Mikael Wikstrom
992d18c46d fix crach on empty error array cause by no streams 2015-10-02 10:40:11 +02:00
Mikael Johansson
e7d5dc1f6f Added command line option to skip download if there's no subtitles available 2015-09-20 20:30:27 +02:00
Johan Andersson
dc2cc0294c pip8. expected 2 lines found 1 2015-09-15 20:10:32 +02:00
Johan Andersson
0b280457a2 Prepare for release 0.20.2015.09.13 2015-09-13 23:37:10 +02:00
Johan Andersson
82dabc602f support for solidtango 
fixes #268
 2015-09-10 23:40:48 +02:00
Johan Andersson
595f482a48 get_one_media: .message does not work with python3 2015-09-10 21:39:51 +02:00
Johan Andersson
411381a653 get_media: handle generic as a regular service. 2015-09-06 16:03:26 +02:00
Johan Andersson
56bef49edf Catch all the Exceptions when the script is crashing 2015-09-06 14:56:54 +02:00
Johan Andersson
acf526c54a Show only one error message instead of two 2015-09-06 14:19:10 +02:00
Johan Andersson
01a265427f get_media: add http:// if the user forgot to add it 2015-09-03 22:05:48 +02:00
Johan Andersson
c4cb752401 init: requests fixes 2015-08-31 22:26:19 +02:00
Johan Andersson
f30a782739 init: remove unused import 2015-08-31 22:26:04 +02:00
Johan Andersson
b47f3f8601 Prepare for release 0.10.2015.08.24 2015-08-24 23:06:41 +02:00
Olof Johansson
f7b26a5745 Rename Justin to Twitch 
Justin has been disbanded for a while.
 2015-08-24 18:42:58 +02:00
Johan Andersson
f3f748dde2 efn: adding support 
fixed #242
 2015-07-05 21:08:11 +02:00
Johan Andersson
0006eeea58 Prepare for release 0.10.2015.05.24 2015-05-24 17:31:34 +02:00
Johan Andersson
0259643fbe __init__: unused import 2015-05-24 14:55:45 +02:00
Johan Andersson
4d634dc323 unused import 2015-04-30 11:42:21 +02:00
Johan Andersson
5c135d24a4 Move automagic filename thing to output.py 2015-04-30 11:02:18 +02:00
Johan Andersson
07038caa2a get_one_media: don’t try to decode utf8 on filenames on windows 
more fixes #233
 2015-04-30 10:51:43 +02:00
Johan Andersson
67ad23a8b3 get_one_media: handle international character in output 
this fixes #233
 2015-04-29 15:06:18 +02:00
Johan Andersson
29612f4f11 get_one_media: fixes issues with filenames with “, ‘ and \ in windows 
this fixes #230
 2015-04-27 22:25:56 +02:00
Johan Andersson
6f20126ff7 facebook: support for downloading public videos. 2015-03-31 20:49:08 +02:00
Johan Andersson
1d3f3ac96f Prepare for release 0.10.2015.03.25 2015-03-25 00:17:30 +01:00
Jimmy Axenhus
ae8e768b51 Add a new command line switch --get-url that prints the URL instead. 2015-03-24 21:10:01 +01:00
Olof Johansson
2265d544b9 Synchronize manual with --help text 2015-03-21 18:36:31 +01:00
Johan Andersson
bcccfd3e86 New version 0.10.2015.01.28 2015-01-28 22:34:42 +01:00
Johan Andersson
68854fc53a get_media: they to the same thing so better have fewer lines 2015-01-28 20:50:10 +01:00
Johan Andersson
cc72aa341a Handle raw .m3u8 and .f4m links better. 2015-01-28 19:00:31 +01:00
Johan Andersson
4ae9a99fdc get_media: service_handler need sites 2015-01-28 18:33:15 +01:00
Johan Andersson
f3c733bb56 Move sites variable to root dir to fix cyclic import. 2015-01-28 18:26:50 +01:00
Johan Andersson
fd4c5fb385 get_one_media: don’t try to run .find on undefined variable 2015-01-25 13:54:38 +01:00
Johan Andersson
6763f33f94 options: if fource-subtitle is set, set subtitle to true. 2015-01-18 16:39:55 +01:00
Johan Andersson
2451e3fc45 New version 0.10.2015.01.05 2015-01-05 22:41:50 +01:00
Johan Andersson
b09b4c17f5 main: --list-quality option 2015-01-05 22:40:40 +01:00
Johan Andersson
0b9eb59d36 main: better help message for -H 2015-01-05 22:00:18 +01:00
Johan Andersson
a84dd4077f pylint fixes 2015-01-05 21:52:34 +01:00
Johan Andersson
b2b94bb175 New version 0.10.2014.12.26 2014-12-26 00:41:22 +01:00
Johan Andersson
29e52a4f3c options: don’t start at zero. 
this fixes #195
 2014-12-26 00:40:14 +01:00
Johan Andersson
e2ba77309c New version 0.10.2014.12.25 2014-12-26 00:00:05 +01:00
Johan Andersson
e53a2741da get_media: do not try to parse episodes when we can’t find any. 
this fixes #194
 2014-12-25 23:55:53 +01:00
Johan Andersson
7671a26810 get_media: catch urlerror here? 2014-12-25 23:48:34 +01:00
Johan Andersson
f5eb3c8749 Support for exclude filenames with WORD in them. 
this fixes #190
 2014-12-22 17:41:40 +01:00
Johan Andersson
113fbbfd88 option to download last X episodes 2014-12-21 13:01:09 +01:00
Johan Andersson
67b3c8bb54 Rewrite http request handling. 2014-12-08 23:07:02 +01:00
Johan Andersson
e94975b256 subtitle: support for cookies 2014-11-25 19:03:24 +01:00
Johan Andersson
8ceb3ea56d More rewrite 2014-11-25 19:03:24 +01:00
Johan Andersson
dcc1367250 subtitle: refactor so we can reuse the try-except-thing 2014-11-25 19:03:23 +01:00
Johan Andersson
db5b7dd15e main: improve quality help text 2014-11-25 14:34:43 +01:00
Göran Gustafsson
b3811e7409 Menu fix 2014-11-23 10:31:33 +01:00
Johan Andersson
52c3ce8977 New version 0.9.2014.11.16 2014-11-16 22:11:18 +01:00
Johan Andersson
e03e9cfc36 New version 0.9.2014.10.23 2014-10-23 00:06:00 +02:00
Johan Andersson
72e8a9f484 New version 0.9.2014.10.13 2014-10-13 00:19:26 +02:00
Johan Andersson
dc46471108 get_one_media: Don’t try downloading files when we can’t find any. 2014-10-12 23:53:42 +02:00
Olof Johansson
b59f413a22 Fix syntax error caused be recent change to log fmt 2014-10-12 23:41:44 +02:00
Olof Johansson
e05a7cd211 Get rid of some unnecessary thumbnail related output 
Also, this change also makes svtplay-dl print an error if thumbnail was
requested but we write to stdout (--output -).
 2014-10-12 21:30:33 +02:00
Olof Johansson
f739faca40 Get rid of some indentation by inverting conditionals 2014-10-12 21:29:04 +02:00
Olof Johansson
fb0168033d Log what protocol/bitrate we selected 2014-10-12 21:27:33 +02:00
Olof Johansson
1796a14007 logging: print log level name first on line when verbose 2014-10-12 21:27:28 +02:00
Johan Andersson
2a472cbf67 main: change help message for resume 2014-10-06 23:04:14 +02:00
Johan Andersson
619435eff1 get_media: create dir when it does not exists. 
if we output to a nonexistent directory, create it.
this fixes #131
 2014-09-21 20:30:28 +02:00
Johan Andersson
ef4c79256d New version 0.9.2014.08.28 
Way to long since last release..
 2014-08-28 19:47:39 +02:00
Johan Andersson
7f7d79a3db output: Don’t download the file if we already have it for some other fetcher 2014-08-27 22:40:31 +02:00
Johan Andersson
79b9c15977 init: removing unused imports. 2014-08-19 15:21:27 +02:00
Johan Andersson
4209f14e26 Fixing some more warnings. 2014-08-12 00:15:46 +02:00
Johan Andersson
ec3e8fb131 Fixing some landscape.io warnings 2014-08-12 00:08:51 +02:00
Johan Andersson
ebe21c49c5 get_one_media: override filename if it is set automagic 2014-08-11 21:24:35 +02:00
Johan Andersson
c19ba14e4c options: sync options from options parser 2014-08-11 21:00:19 +02:00
Olof Johansson
6719cd0e15 svtplay_dl: remove unnecessary pass statement 
(Reported by pylint)
 2014-07-22 09:36:33 +02:00
Johan Andersson
52a18ee7ca main: better help text to -H and -P 2014-07-13 16:06:35 +02:00
Johan Andersson
a52fbe6985 select_quality: move preferred option to get_one_media 2014-07-13 16:03:03 +02:00
Johan Andersson
0caf19b309 main: better help text for live flag. 2014-06-24 22:56:12 +02:00
Johan Andersson
402fca5bfc get_one_media: display error message when we can’t find any videos. 2014-06-23 21:24:34 +02:00
Johan Andersson
b4638d0bb7 get_one_media: show an error message when we cant find any streams 2014-06-18 21:10:05 +02:00
Johan Andersson
3f4bdd58d8 service: copy options to fetcher 2014-06-07 20:48:54 +02:00
Johan Andersson
e87c236c51 option to choose which download method is preferred. 2014-06-02 21:27:51 +02:00
Johan Andersson
3398c8f14c get_one_media: force stop when --force-subtitle is used 2014-06-02 21:27:50 +02:00
Johan Andersson
a857f1d906 get_one_media: select quality 2014-06-02 21:27:50 +02:00
Johan Andersson
895623f601 __init__: support for yield 2014-06-02 21:27:49 +02:00
Olof Johansson
24750ed1d6 Print newline after Ctrl+C 
Fixes #93.
 2014-05-02 12:07:37 +02:00
Johan Andersson
fb82005658 New version 0.9.2014.04.27 2014-04-27 09:06:47 +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
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
5e1e6dbbc9 subtitle: a way to download only subtitle. 2014-03-21 21:01:00 +01:00
Olof Johansson
f5aceffad7 svtplay_dl: silence pylint warning when using % with log 2014-03-19 23:03:31 +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
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
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
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
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
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
7e591c2733 get_media: dont add options.output to tmp variable 2014-01-16 20:57:30 +01:00