1
0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-30 23:24:16 +01:00
Commit Graph

1051 Commits

Author SHA1 Message Date
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
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
Olof Johansson
647fed8bda svtplay: Catch media without any videoReferences
This happens when they publish information about the TV episode before
publishing the video stream. Probably due to some bug in SVT Play. The
web player is also unable the play the video, reporting "Can't play
the program, try again later".
2015-10-25 15:50:52 +01:00
Johan Andersson
c453f7c48b filenamify: remove “ and ‘
fix #289
2015-10-25 01:29:04 +02:00
Johan Andersson
c69803681e output: we only want to look at the 2-3 last chars.
fix #284
2015-10-24 22:04:09 +02:00
Johan Andersson
bd565f77ae viaplay: better filenames
fix #286
2015-10-24 21:55:33 +02:00
Johan Andersson
43dd5f4b2d http.request: dont send headers twice 2015-10-24 21:18:23 +02:00
Johan Andersson
a998b4c8fa twitch: handle the error messages 2015-10-20 00:49:20 +02:00
Johan Andersson
4b0beee989 disney: get the text instead of content
this failed on python3
2015-10-20 00:49:20 +02:00
Johan Andersson
e188ca8f56 subtitle_smi: encode it as iso-8859-1
this fixes #282
2015-10-20 00:49:20 +02:00
Johan Andersson
580c2a8c9d Merge pull request #281 from olof/git_version_info
Add git version info to version string
2015-10-19 20:02:41 +02:00
Johan Andersson
96b2beb8ec generic: return sefl.url instead of url
This fixes #278
2015-10-19 17:26:38 +02:00
Johan Andersson
a798a2b8ba tv4play: forgot to set the show name in find_all_episodes
fixes #280
2015-10-19 10:37:15 +02:00
Johan Andersson
f3aba4e598 filenamify: replace with dot instead of dash 2015-10-19 10:37:15 +02:00
Olof Johansson
1a7a9f5662 Add git version info to version string
When building from git, it can be useful to know which version
a user has at commit level resolution. When building in a git
repository, use git describe to generate a version string. If
HEAD matches a tag, use that. Examples:

    $ ./svtplay-dl --version
    0.20.2015.10.08-3-gbd75a67

    $ git tag -a 0.20.2015.10.18
    $ make
    ...
    $ ./svtplay-dl --version
    0.20.2015.10.18

make release is also adjusted, so that it overrides the version
value when building, so that official releases still only has the
tag.
2015-10-18 19:50:53 +02:00
Johan Andersson
38f18d5eed subtitle_tt: remove namespace info 2015-10-10 16:31:42 +02:00
Johan Andersson
7322b2d2ca Prepare for release 0.20.2015.10.08 2015-10-08 23:25:24 +02:00
Johan Andersson
3f9703b6bd dr.dk: geoblock check 2015-10-08 09:54:07 +02:00
Johan Andersson
1c33787ad0 dr.dk: fix url parsing for some urls
fixes #277
2015-10-08 09:52:36 +02:00
Johan Andersson
917f276e41 tv4play: better names for automagicnames
this fixes #276
2015-10-07 19:52:37 +02:00
Johan Andersson
d4afbd778b tv4play: dont use directory twice in output filename
it happens when the output is an directory
2015-10-05 20:27:45 +02:00
Johan Andersson
e6baf3e4da tv4play: Support downloading all premium videos
this fixes #275
2015-10-05 19:43:57 +02:00
Johan Andersson
c7373854f9 HLS: handle 403 error when the playlist is geoblocked 2015-10-04 17:41:11 +02:00
Johan Andersson
2eef43843d HDS: handle 403 error when the playlist is geoblocked 2015-10-04 17:40:40 +02:00
Johan Andersson
b9bbedc2e7 hds: yield ServiceError when we see DRM 2015-10-04 17:39:43 +02:00
Johan Andersson
d53adcb2ad Support for dplay.se
fixes #274
2015-10-04 14:40:00 +02:00
Johan Andersson
fa05480327 reorder arguments for hlsparse and hdsparse 2015-10-04 14:37:16 +02:00
Johan Andersson
39f7d4ba2e hls: handle cookies 2015-10-04 14:36:21 +02:00
Johan Andersson
c6d9a5732d hls: handle cookies 2015-10-04 14:36:06 +02:00
Johan Andersson
0d5a05be64 hdsparse: work as the same way as hlsparse 2015-10-04 14:35:35 +02:00
Johan Andersson
b899072236 hds: we want to get the data inside of the parse function 2015-10-04 14:35:00 +02:00
Johan Andersson
9011705274 hls: have the same interface as hds 2015-10-04 14:33:54 +02:00
Johan Andersson
64b2ac0240 utils.request: send chrome user-agent instead of the default one 2015-10-04 14:33:08 +02:00
Mikael Wikstrom
992d18c46d fix crach on empty error array cause by no streams 2015-10-02 10:40:11 +02:00
Johan Andersson
28581838b0 svtplay: show the right url when it can’t find the json page. 2015-10-02 10:21:11 +02:00
Johan Andersson
ebb7049e19 twitch: handle directories when we output to an directory 2015-09-30 13:52:17 +02:00
Jellyfrog
0be6bddf8c Make oppetarkiv work with --all-episodes again
seems they changed some css-classes
2015-09-30 00:47:49 +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
79c7f82881 subtitle: only convert when its unicode 2015-09-20 16:03:07 +02:00
Johan Andersson
3afb8aa490 subtitle: workaround a bug in requests in ubuntu 14.04 LTS
2.2.1 cant convert string from bytes to text right.

fixes #259
2015-09-20 15:15:50 +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
351206cd79 picsearch_test: di use picsearch nowdays 2015-09-13 23:03:59 +02:00
Johan Andersson
755cfe3825 raw: send url to hlsparse 2015-09-13 22:09:23 +02:00
Johan Andersson
8596e3bfb9 bigbrother: send url to hlsparse 2015-09-13 22:09:07 +02:00
Johan Andersson
29d00920ad utils: show an error message if requests is not found 2015-09-13 22:05:17 +02:00
Johan Andersson
80a55e2615 utils: unused import 2015-09-13 22:04:47 +02:00
Johan Andersson
58ac72ea70 ruv: hlsparse need the url to the playlist 2015-09-10 23:41:50 +02:00
Johan Andersson
82dabc602f support for solidtango
fixes #268
2015-09-10 23:40:48 +02:00
Johan Andersson
07d061d397 viaplay: adding support for juciplay.se 2015-09-10 21:57:55 +02:00
Johan Andersson
595f482a48 get_one_media: .message does not work with python3 2015-09-10 21:39:51 +02:00
Johan Andersson
f7323a0072 viaplay: f4m can be in the middle of the filename 2015-09-10 21:38:29 +02:00
Johan Andersson
1057f800b0 request: only show what request we are getting. 2015-09-07 20:13:36 +02:00
Johan Andersson
467e49b3ad sr: this should be text 2015-09-07 19:03:31 +02:00
Johan Andersson
5fcf3f71fd vimeo: this should be text 2015-09-07 19:02:43 +02:00
Johan Andersson
990cf491d5 twitch: this should be text 2015-09-07 19:00:40 +02:00
Johan Andersson
1e6de72d64 Better excluding message
fixing #198
2015-09-06 23:04:48 +02:00
Johan Andersson
b02b293919 output: walkaround for titles with .XXX at the in the end. 2015-09-06 22:51:39 +02:00
Johan Andersson
028a6fe061 urplay: dont include dupes 2015-09-06 22:41:49 +02:00
Johan Andersson
00335a06b5 urplay: import log 2015-09-06 22:41:29 +02:00
Johan Andersson
e0618e9fb0 generic: handle it as a regular service 2015-09-06 16:03:57 +02:00
Johan Andersson
411381a653 get_media: handle generic as a regular service. 2015-09-06 16:03:26 +02:00
Johan Andersson
8507219bf0 aftonbladet: use text instead of content 2015-09-06 16:02:54 +02:00
Johan Andersson
56bef49edf Catch all the Exceptions when the script is crashing 2015-09-06 14:56:54 +02:00
Johan Andersson
8408375356 twitch: better error handling 2015-09-06 14:37:40 +02:00
Johan Andersson
acf526c54a Show only one error message instead of two 2015-09-06 14:19:10 +02:00
Johan Andersson
7c811e38f8 kanal5: dont add dupes in the all season list
fixes #263
2015-09-03 22:09:30 +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
45a5c0ee38 mtvnn: dont urlparse the path 2015-09-02 19:46:55 +02:00
Johan Andersson
bb47a5d1fa urplay: we need to send the url to hlsparse
fixes #260
2015-09-02 18:51:07 +02:00
Johan Andersson
086ae79482 svtplay: this need to be text 2015-09-01 23:53:13 +02:00
Johan Andersson
83fecfb6be tv4play: json need to be text 2015-09-01 23:52:16 +02:00
Johan Andersson
b3cd0ad586 viaplay: json need to be text 2015-09-01 23:52:00 +02:00
Johan Andersson
469e243361 kanal5: adding support for all episodes
this fixes #81
2015-09-01 23:44:57 +02:00
Johan Andersson
614c9b8ae5 subtitle_wsrt: decode html entities
fixes #255
2015-09-01 22:54:32 +02:00
Johan Andersson
028754606b qbrick: di dont use qbrick anymore 2015-09-01 00:37:32 +02:00
Johan Andersson
f01d97df9d dr: use text for json and send the url to the playlist 2015-09-01 00:37:06 +02:00
Johan Andersson
421057194e efn: send the url to the playlist 2015-09-01 00:36:27 +02:00