1
0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-28 06:04:17 +01:00
Commit Graph

240 Commits

Author SHA1 Message Date
Johan Andersson
9a0eda8b90 spell fixes 2016-08-01 20:40:46 +02:00
Johan Andersson
f8f25cf2a4 Merge remote-tracking branch 'qnorsten/master' into qnorsten 2016-07-24 12:15:11 +02:00
Johan Andersson
75c94a6acd Merge pull request #414 from iwconfig/patch-1
Support for merging subtitles with corresponding ISO639-3 language code
2016-07-24 11:50:47 +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
8973f19bf7 New release 1.2 2016-06-03 00:12:08 +02:00
Johan Andersson
53d702708b get_one_media: include version crash 2016-06-01 22:11:01 +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
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