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

981 Commits

Author SHA1 Message Date
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
Johan Andersson
96d2bfd529 expressen: send the url to the playlist 2015-09-01 00:36:01 +02:00
Johan Andersson
21817c58f2 nrk: support for third kind of video 2015-09-01 00:23:19 +02:00
Johan Andersson
729374c94c nrk: support for p3.no 2015-09-01 00:22:51 +02:00
Johan Andersson
b55e5fbb27 picsearch: di.se switched provider 2015-08-31 23:46:17 +02:00
Johan Andersson
b1be0b5d0c picsearch: support for screen9 videos 2015-08-31 23:45:54 +02:00
Johan Andersson
4361254f0c vg: use text instead of bytes 2015-08-31 23:45:28 +02:00
Johan Andersson
6883f31550 subtitle: python3 fixes 2015-08-31 23:19:01 +02:00
Johan Andersson
08f47dcbd5 viaplay: should be text and not binary 2015-08-31 23:18:37 +02:00
Johan Andersson
665104bec8 urldata: should be text instead of binary 2015-08-31 23:18:18 +02:00
Johan Andersson
270506082d urplay: send the url to the playlist 2015-08-31 23:17:51 +02:00
Johan Andersson
b61b4cdac3 kanal5: open it as text not binary 2015-08-31 22:47:11 +02:00
Johan Andersson
724af70f49 subtitle: open as text and save it 2015-08-31 22:46:45 +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
285b01a3b7 mtvnn: import urlparse from the right module 2015-08-31 22:25:37 +02:00
Johan Andersson
6cd4e335de viaplay: remove debug print 2015-08-31 22:25:14 +02:00
Johan Andersson
082f167245 more requests fixes for get_urldata.
dont check the first byte
2015-08-31 22:04:59 +02:00
Johan Andersson
812097b95b tv4play: remove unused imports 2015-08-31 21:54:10 +02:00
Johan Andersson
dc76094369 hls: remove unused imports 2015-08-31 20:35:37 +02:00
Johan Andersson
06472b5012 utils: remove unused imports 2015-08-31 20:35:23 +02:00
Johan Andersson
ea70ec30bf urllib: remove unused imports 2015-08-31 20:35:05 +02:00
Johan Andersson
7922966aff sr: dont look for aria-label when getting the audio info
fixes #258
2015-08-31 20:18:18 +02:00
Johan Andersson
331de0a70f replace self.http.get with our own function with debug info 2015-08-31 19:45:15 +02:00
Johan Andersson
abf29827fb oppetarkiv: request fixes 2015-08-31 17:14:31 +02:00
Johan Andersson
63a59707fe tv4play: request fixes 2015-08-31 17:14:19 +02:00
Johan Andersson
57842a3895 viaplay: request fixes 2015-08-31 17:14:08 +02:00
Johan Andersson
c2ae9e99e7 aftonbladet: request fixes 2015-08-31 17:13:48 +02:00
Johan Andersson
1bd7410cc2 dbtv: send hls url to hlsparse 2015-08-31 16:53:23 +02:00
Johan Andersson
c691aa6ea1 disney: request fixes 2015-08-31 16:51:09 +02:00
Johan Andersson
9394f03251 http: remove unused imports 2015-08-30 14:42:29 +02:00
Johan Andersson
a0f0b192e2 http: use requests 2015-08-30 14:41:59 +02:00
Johan Andersson
fb7d4dd1b9 vimeo: we need the content to look at it 2015-08-30 14:41:19 +02:00
Johan Andersson
a1e987348d download_thumbernail: use request instead 2015-08-30 12:04:49 +02:00
Johan Andersson
7115c57e4c generic: request fixes 2015-08-30 12:04:16 +02:00
Johan Andersson
12e85b00ee picsearch: unused import 2015-08-30 12:03:56 +02:00
Johan Andersson
4daf49f84b twitch: more requests fixes 2015-08-30 11:57:45 +02:00
Johan Andersson
d51e513c17 More request fixes 2015-08-30 11:27:31 +02:00
Johan Andersson
1d51ad71f1 kanal5: requests fixes 2015-08-30 10:33:38 +02:00
Johan Andersson
daec9178d8 tv4play: requests fixes 2015-08-30 10:20:47 +02:00
Johan Andersson
f416a17572 ensure_unicode: remove extra space 2015-08-30 00:08:24 +02:00
Johan Andersson
84ee181f5b adding request support.
still need some more work
2015-08-30 00:06:20 +02:00
Johan Andersson
b47f3f8601 Prepare for release 0.10.2015.08.24 2015-08-24 23:06:41 +02:00
Johan Andersson
5a54105ccc output: use the right slash for the right platform
fixes #251
2015-08-24 23:02:28 +02:00
Johan Andersson
ea014f27d2 svtplay: seperate format and output json. 2015-08-24 23:02:28 +02:00
Olof Johansson
495dc1fcaa twitch: Don't include description in filename
This can easily lead to "IOError: [Errno 36] File name too long"
exceptions.
2015-08-24 18:44:46 +02:00
Olof Johansson
f7b26a5745 Rename Justin to Twitch
Justin has been disbanded for a while.
2015-08-24 18:42:58 +02:00
Olof Johansson
56274ec64e build: Avoid using non-portable install -D
The following error was reported when trying to build on OSX:

 install: illegal option -- D

We now instead create the directories in a first, and copy in a second
step.
2015-07-26 12:48:23 +02:00
Johan Andersson
7ea335ec10 service.exclude: don’t crash when using åäö
fixes #245
2015-07-13 19:26:51 +02:00
Johan Andersson
1beebb7bea mtvnn: they changed how the id is present in the text.
fixes #243
2015-07-05 21:51:58 +02:00
Johan Andersson
f3f748dde2 efn: adding support
fixed #242
2015-07-05 21:08:11 +02:00
Johan Andersson
5b015b95c1 oppetarkiv: they changed the links for the videos.
this fixes #238
2015-06-28 16:45:43 +02:00
Johan Andersson
86d17b5d20 Merge pull request #239 from olof/topic/reproducibility
Two reproducible build issues
2015-06-14 20:25:39 +02:00
Johan Andersson
63eee40e49 subtitle_wrst: check against int instead of str
this fixes #240
2015-06-07 20:10:36 +02:00
Olof Johansson
352fd90e51 build: Truncate timestamps in zip archive
Even though zip's -X flag suggests that it removes timestamps, that's not
quite true. There's still modification times per file, and that introduces
non-determinism that are hard to notice, since the mtimes are unlikely to
change without changes to the files. Only when doing a new clone/unpacking
a tar ball under some circumstances or similar action that resets/discards
the mtimes, we would notice.

So, the -X is not enough, and from what I can tell, there's no way of
telling zip to not include timestamps (or truncate them). With this
change, we stage all files in a temporary .build directory, and set the
mtime manually to the beginning of time (as is the case for zip files:
1980-01-01T00:00). These timestamps should not be important to anyone,
since they are all presented to the user as a blob.

The rationale for this change is that this makes it possible to build
svtplay-dl reproducibly. And it also removes the pesky svtplay-dl diffs
just from regenerating the executable.
2015-05-30 13:58:30 +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
0ee4ef7ce9 justin: unused variable 2015-05-24 14:51:37 +02:00
Johan Andersson
89cf3cad76 tv4play: they changed the order on name and type key.
this fixes #237
2015-05-24 14:27:07 +02:00
Johan Andersson
b0dbe63345 justin: better filenames 2015-05-24 13:59:11 +02:00
Johan Andersson
6f228284cf justin: refactor get function 2015-05-24 12:37:16 +02:00
Johan Andersson
e1100fa7d4 justin: support for the new vod system 2015-05-23 19:18:04 +02:00
Johan Andersson
617edb4d21 urplay: better path for rtmp streams 2015-05-06 10:42:03 +02:00
Johan Andersson
620cbf9b43 urplay: Check how many items we have in subtitles
This fixes #235
2015-05-06 10:33:24 +02:00
Johan Andersson
7950e06e0d smi: check if data is empty 2015-05-01 22:34:02 +02:00
Johan Andersson
4d634dc323 unused import 2015-04-30 11:42:21 +02:00
Johan Andersson
072e4d50c7 filename: it should be latin1 not lain1. 2015-04-30 11:03:52 +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
acb3349591 qbrick: unused import unquote_plus 2015-04-28 23:20:34 +02:00