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

1346 Commits

Author SHA1 Message Date
Jan
ffe63aef19 Viaplay: Fix JSON episode data regexp for "all episodes" as well 2018-01-03 21:45:24 +01:00
Jan
8917d5bd8e Viaplay: Fix regexp for JSON episode data extraction 2018-01-03 21:45:24 +01:00
Robert Foss
c26bb3ccc5 Add proxy support
This feature utilises the proxy support of the requests module, and
has been tested with SOCKS5 through a SSH tunnel, and has been
verified to be working.

Signed-off-by: Robert Foss <robert.foss@memcpy.io>
2017-11-26 18:11:41 +01:00
Johan Andersson
788a381077 get_media: when printing version number using verbose. it should be debug. 2017-11-25 11:31:01 +01:00
Johan Andersson
fc4c659ae9 output: make bit more generic
Remove the output "-". it have been a bit broken for a while.
2017-11-24 23:11:48 +01:00
Johan Andersson
4dd9bd6cdf get_media: print version number every time we use verbose
Instead of only printing the version number when we crash.
print it every time we use verbose.

thanks to @granbom for suggesting this idea.
2017-11-24 21:49:37 +01:00
Johan Andersson
ebbe76ceb1 cmore: dont crash when the filename have åäö in it. 2017-11-13 18:36:06 +01:00
Johan Andersson
3983fcd1f9 cmore: detect the video id better
fixes #733
2017-11-13 18:32:16 +01:00
Johan Andersson
4cd40a2665 expressen: they started to use https for their stuff now
fixes #735
2017-11-11 13:02:25 +01:00
Jonatan Skogsfors
403f375150 Change priority for SR downloads.
Download of an SR program with music is typically only available for a
certain period of time while the shortened program is always available.
With that in mind I can’t see how the elif case ever would have been
visited.
2017-10-30 15:47:29 +01:00
Johan Andersson
2c2446b30b hls: sometimes they have the key as a filename without url 2017-10-22 20:59:17 +02:00
dalgr
892b738bcb Change to use Unicode strings in 'tv4play.py' 2017-10-19 20:10:19 +02:00
granbom
9f1c01a751 Fixing typo. Closes spaam/svtplay-dl#718 2017-10-17 10:41:38 +02:00
granbom
bfd925538f String format issues. Closes spaam/svtplay-dl#719 2017-10-17 10:41:38 +02:00
Johan Andersson
ad94873402 dplay: fix keyerror after format string fixes
fix: #715
2017-10-12 22:30:57 +02:00
dalgr
328ad0cff9 Change 'subprocess.check_call' to 'subprocess.check_output' in ''utils.output' 2017-10-10 22:25:09 +02:00
Johan Andersson
59d2513dee fetcher: change str formating from '%s' to '.format' 2017-10-09 22:35:33 +02:00
Johan Andersson
804b869644 service: change str formating from '%s' to '.format' 2017-10-09 22:35:13 +02:00
Johan Andersson
2ee0dad363 viafree: fix sorting for --all-last
fixes #696
2017-10-09 21:11:52 +02:00
Daniel Lublin
3410b1b58a svtplay: the last n from the sorted episodes does it 2017-10-09 20:55:39 +02:00
dalgr
1aa84fc29c Add error msg for no videos found 2017-10-09 20:41:09 +02:00
dalgr
bc3141a8c7 Avoid 'EXT-X-BYTERANGE', fix for 'hls.py'
Fix support for vidme in 'dash.py'
2017-10-09 20:38:56 +02:00
dalgr
510e8424fc Adding suport for vid.me 2017-10-09 20:38:56 +02:00
dalgr
908b4ec313 more code cleanup
cleanup
2017-10-09 20:33:11 +02:00
dalgr
2adcdcd8ef simplify and cleanup code 2017-10-09 20:33:11 +02:00
dalgr
493b01a856 fix error msg formating 2017-10-09 20:33:11 +02:00
dalgr
3fc3fbc9ef change str formating from '%s' to '.format' 2017-10-09 20:33:11 +02:00
dalgr
bbc8e50352 retries with requests, for all 'self.http.request' 2017-10-09 20:32:16 +02:00
Johan Andersson
73306eef4d dashparse: dont try to parse 0 length mpd files.
Akamai sent a zero length playlist for svtplay
fixes #701
2017-10-04 23:26:47 +02:00
dalgr
988b557433 Get alt query before entering specific video format 2017-10-03 21:23:21 +02:00
dalgr
9284c4d76c Reformat '_get_video' in svtplay.py 2017-10-03 21:23:21 +02:00
dalgr
0ce284c106 replace str '%s' with str format 2017-10-03 21:23:21 +02:00
dalgr
27db933d6c Fix formating of (ServiceError, log.info, log.error) msg 2017-10-03 21:23:21 +02:00
Johan Andersson
baa150cb88 svtplay: handle json decode error on api request.
In some cases when people using dns service to get around geoblocking
the dns server redirect them to a page telling them their ip is not
authorised using the dns server. this might fix #648
2017-10-03 21:21:09 +02:00
dalgr
e8a9157f20 add check 'is not None' to avoid FutureWarning 2017-09-19 21:41:17 +02:00
Johan Andersson
928f25c4c3 New version 1.9.6 2017-09-19 00:47:03 +02:00
Johan Andersson
d2b84198a8 cmore: remove dash from the operator name 2017-09-19 00:43:30 +02:00
Johan Andersson
5a6dc77374 cmore: support for operator login 2017-09-19 00:30:11 +02:00
Johan Andersson
9bbda65d20 cmore: check for .se for names for now. 2017-09-18 22:24:27 +02:00
Johan Andersson
a1dbdc9e94 cmore: better error handling for wrong user / passwd 2017-09-18 22:16:54 +02:00
Johan Andersson
700f4e0032 svtplay: change -A to be a blacklist instead of a whitelist
sometimes slug was avsnitt, sasong* or year.
2017-09-18 20:21:17 +02:00
Johan Andersson
12c0847602 aftonbladet: fix so it works with tv.aftonbladet.se 2017-09-18 14:47:34 +02:00
Johan Andersson
44703b47e8 dashparse: we don't need to "/ 1000" one more time 2017-09-18 14:46:57 +02:00
Johan Andersson
6f2f3fbc94 New version 1.9.5 2017-09-17 22:28:08 +02:00
Johan Andersson
01f7ea54be svtplay: for some reason some slug in -A use year instead of sasong. 2017-09-17 21:03:54 +02:00
Johan Andersson
8e5c7ddd30 dash: fix a warning 2017-09-17 21:03:10 +02:00
Johan Andersson
bb291ec448 disney: new layout on the page.
fixes #613
2017-09-17 19:48:08 +02:00
Johan Andersson
f7e6d2e77c utils: remove the try except from request.
this might cause some other issue. we will see.
2017-09-17 19:43:14 +02:00
Johan Andersson
aae1c878bb subtitle: tv4 subs have a bom headers. 2017-09-17 11:21:04 +02:00
Johan Andersson
983d2f78e5 tv4play: use webvtt instead of smi files.
fixes #631
2017-09-17 11:20:31 +02:00
Johan Andersson
bbe146311d cmore: missing deps for filenamify 2017-09-17 11:01:58 +02:00
Johan Andersson
c429df295a cmore: add text about missing username and/or password. 2017-09-16 23:51:54 +02:00
Johan Andersson
d99dd21065 cmore: new service
fixed #567
2017-09-16 23:45:29 +02:00
Johan Andersson
d1b6ba2ee1 dash: rewrote the parsing of the .mpd files. 2017-09-16 21:38:14 +02:00
Johan Andersson
1fdd3255bc viafree: add support for viafree.fi
fixes #660
2017-09-16 18:32:29 +02:00
Johan Andersson
e3cf1562af mtvnn: support for HLS again. seen this on nickelodeon
fixes #672
2017-09-16 18:28:27 +02:00
Johan Andersson
f4611b5512 hlsparse: need to send cookies when we grab hlsfiles 2017-09-16 18:26:07 +02:00
Johan Andersson
0ddbc9752e urplay: support for -A on urskola.se
fixes #677
2017-09-16 17:36:37 +02:00
Johan Andersson
5057322c85 svtplay: fix find all episodes
fixes #676
2017-09-14 09:30:58 +02:00
Johan Andersson
c5e6be02e6 tv4play: fix auto naming for latest version of the site 2017-09-12 12:33:58 +02:00
Johan Andersson
44623376e6 tv4play: find id of the video
fixes #674
2017-09-12 12:33:58 +02:00
PO Lenhoff
695c6ffb17 added python3 compatibility for find_all_episodes 2017-09-08 20:27:39 +02:00
Johan Andersson
c1259f2c9a viafree: fix so we can download all episodes from viafree again
fixing #663
2017-09-08 18:59:18 +02:00
Johan Andersson
c38b4a35c1 aftonbladet: fix identention 2017-09-02 10:44:15 +02:00
Johan Andersson
40e4c63211 aftonbladet: support for the new page.
they changed it a bit so it uses some more js.

fixes #664
2017-09-01 20:53:04 +02:00
Johan Andersson
2a70b72938 solittango: dont crash when the xml data is unicode on py2 2017-08-01 19:34:53 +02:00
Johan Andersson
45266f6a2a dplay: check per episode if its premium or not
fixes #650
2017-06-28 22:33:58 +02:00
Johan Andersson
e232001003 subtitle.wsrt: urplay only had minutes and seconds
fixes #639
2017-06-05 17:31:47 +02:00
Johan Andersson
390b25d2bf lemonwhale: try to find the ID of the video in a new way.
fixes #638
2017-06-05 13:15:42 +02:00
Johan Andersson
1ce926f083 aftonbladet: svd using the same provider as aftonbladet nowadays. 2017-06-05 13:14:22 +02:00
Johan Andersson
5f8d306a06 New version 1.9.4 2017-05-08 00:22:17 +02:00
Johan Andersson
a2f20a3a31 svt: move this out from svtplay file 2017-05-08 00:17:27 +02:00
iwconfig
6176eabe95 Minor option description clarification
Appended information to the description about --merge-subtitle invoking the --remux option automatically
2017-05-08 00:15:43 +02:00
Johan Andersson
5763bb78c8 nrk: use the right api url to get video info
fixes: #604
2017-05-07 15:19:52 +02:00
Johan Andersson
c03a808774 svtplay: they moved the place where related videos are. 2017-05-07 15:02:55 +02:00
Johan Andersson
23d7d1fd12 cosmetic fixes in svtplay 2017-05-07 14:47:15 +02:00
Johan Andersson
1a3c201113 viafree: don't crash when episode is a text
fixes: #626
2017-05-07 14:44:12 +02:00
qnorsten
ad6180e48d svtplay: videoTitlePage renamed to videoPage
svtplay changed their names again
fixes: https://github.com/spaam/svtplay-dl/issues/620
2017-05-03 16:04:24 +02:00
Johan Andersson
bccfc1fa3a tv4play: in some cases we dont have episode info 2017-05-01 22:04:57 +02:00
Johan Andersson
72eddeb470 öppetarkiv: fix naming of files.
fixes #574
fixes #593
fixes #596
2017-04-21 22:01:02 +02:00
qnorsten
50fa511a5f viafree: Make exclude work correctly for both -A and single episodes
Add exclude support when -A is used
Fix broken exclude support when downloading one episode 
fixes: https://github.com/spaam/svtplay-dl/issues/483 in combination with c762575038
2017-04-21 19:34:43 +02:00
qnorsten
c8525f3a22 TV4play: remove login functionality
Tv4play has changed their login forms  and as all premium content has moved to cmore.se login functionality is no longer needed and therefore removed.
2017-04-21 18:18:29 +02:00
qnorsten
49440b5f94 Merge remote-tracking branch 'origin/master' 2017-04-21 18:11:04 +02:00
qnorsten
699bcc5e9f main: svtplay: Also print url when listing episodes with -A 2017-04-21 18:10:48 +02:00
qnorsten
c762575038 viafree: Make all-last work as intended
--all-last now returns X newest episodes instead of oldest
2017-04-21 18:10:40 +02:00
qnorsten
9fe6b951cc svtplay: Check if Rss link is valid, and make tab work again
fixes: https://github.com/spaam/svtplay-dl/issues/584
Makes: https://github.com/spaam/svtplay-dl/issues/514 work again. 
Adds basic check if linked rss is valid (as svtplay started including rss links again) also bypasses rss if a tab is supplied or include-clips is set.
2017-04-12 21:23:56 +02:00
iwconfig
0b2b528a6d Prevent zero length field name in format
Added numbers to format() to prevent 'ValueError: zero length field name in format'
2017-03-26 14:48:15 +02:00
iwconfig
e5e7fd0293 Changed all '%s', to '{}'.format()
This also fixes a bug on line 105: format() got '%s' instead of '{}'.
2017-03-26 14:48:15 +02:00
iwconfig
5caf6d8354 Rather small spelling fix :)
This might be a picky one but hey
2017-03-26 14:47:44 +02:00
qnorsten
a9e1e92ba2 subtitle: use decode_html_entities function
use decode_html_entities to decode html entities
2017-03-23 11:43:15 +01:00
qnorsten
a310ceb2a1 Subtitles: Smi-subtitles updated regex to also remove <div tags> 2017-03-21 09:49:36 +01:00
qnorsten
f963b5f755 Subtitles: Smi subtitles, do not remove <i> and replace &nbsp; with space
fixes https://github.com/spaam/svtplay-dl/issues/581
2017-03-21 00:32:46 +01:00
Johan Andersson
4cd49f2a16 New version 1.9.3 2017-02-21 00:14:54 +01:00
Johan Andersson
e124ad8828 svtplay: fix accessservice crash
they changed how they tell if the video syntolkat
fixes: #566
2017-02-21 00:02:49 +01:00
Johan Andersson
8b14d490cb svtplay: change place of not 2017-02-21 00:02:49 +01:00
Mikael Larsson
c4b4ab5bef tv4play: Add season and episode info in the filename 2017-02-21 00:02:21 +01:00
Johan Andersson
c6df8f2b48 svtplay: get the live status from the api too.
sometimes the page say its live but the api say something else.
2017-02-19 11:37:22 +01:00
Johan Andersson
8b09165cd7 nhl: add support for the older platform 2017-02-18 23:51:58 +01:00
Johan Andersson
3e39a62737 hls: try to read the file playlist 2017-02-18 23:51:26 +01:00
Johan Andersson
c9903f63be nhl: support for vod videos. 2017-02-18 21:13:01 +01:00
Johan Andersson
dfaa1fac90 svtplay: show a better error message if we cant find video 2017-02-18 18:28:03 +01:00
Johan Andersson
456e008597 pylint fixes 2017-02-15 23:15:50 +01:00
Johan Andersson
c9020020e7 svtplay: fixes for exclude in genre and -A 2017-02-15 00:47:36 +01:00
Johan Andersson
7ab4c060ba svtplay: add support for exclude in -A 2017-02-15 00:40:25 +01:00
Johan Andersson
1d496af36a service.exclude2: exclude with filename as a argument 2017-02-15 00:38:52 +01:00
Johan Andersson
bb7ff7e698 New version 1.9.2 2017-02-12 21:19:14 +01:00
Johan Andersson
3d8a516d1c dash: don't crash if we get a total files.
fixes #559
2017-02-12 11:08:22 +01:00
Johan Andersson
da66ffcf2e format string fixes
fixes #558
2017-02-12 09:01:40 +01:00
Johan Andersson
d20fa3d959 parsem3u: don't crash if we cant unpack extinf
fixes: #557
2017-02-12 08:53:59 +01:00
qnorsten
9cfb4e5f1e Viafree: Added check to prevent crash while naming clips
Added check to only get parent season and episode number if derived_from_id actually is set. Prevent crashes on some clips.
2017-02-11 10:19:57 +01:00
qnorsten
1f49d84664 svtplay: Fix for -all-last, now starts from the last episode
Fixes: https://github.com/spaam/svtplay-dl/issues/454
2017-02-10 17:49:42 +01:00
qnorsten
b24c9d14c3 svtplay: Add support for tabs on genre pages
Adds support for tabs on genre page, only works for the items on tabs that do not link to just a show page.
2017-02-06 13:14:58 +01:00
qnorsten
1dbe315586 viafree: Download only specific season by using /sasongXX in url
Support to only download specific season by passing /sasongXX in url, when used with -A
Fixes: https://github.com/spaam/svtplay-dl/issues/439
2017-02-06 12:43:59 +01:00
qnorsten
be97c6266b viafree: forgot to remove tv3play from filename
viafree: forgot to remove tv3play from filename
2017-02-03 11:10:58 +01:00
qnorsten
a2bb75569a viafree: Change autonaming from tv3play to viafree
Change part autogenerated file names from tv3play to viafree
2017-02-03 10:37:47 +01:00
qnorsten
de0fa8a715 svtplay: Add syntolkat and teckentolkat to filename
svtplay: Readds syntolkat and teckentolkat to autogenerated filename. 
Solves https://github.com/spaam/svtplay-dl/issues/542
2017-02-03 09:32:27 +01:00
qnorsten
c781bd1bb8 svtplay: Add support for tabs and --include-clips
svtplay: Adds support for --include-clips as well as support to just download one tab of episodes by using ?tab="tab" in url. 
This should fix https://github.com/spaam/svtplay-dl/issues/549, https://github.com/spaam/svtplay-dl/issues/514 and https://github.com/spaam/svtplay-dl/issues/480
2017-02-02 15:57:52 +01:00
qnorsten
ac864643cd Viafree: Added support for --include-clips
Added support for --include-clips for viafree
2017-02-02 14:20:33 +01:00
qnorsten
d8a34c1fe9 main: Add include-clips command to include clips when combined with -A
Added --include-clips command to include clips when used togheter with -A
2017-02-02 14:17:18 +01:00
qnorsten
95c668cbe0 svtplay: do not try to use ProgramTitle in filename if it is None
fix crash for svtplay, that occurs when generating automatic filename and ProgramTitle is undefined.
2017-02-01 13:19:59 +01:00
Johan Andersson
a72282e44b viafree: don't try to access videos that don't exists
fixes: #547
2017-02-01 11:06:01 +01:00
Johan Andersson
7c7565ea5d svtplay: using -A will try to download same episode twice
fixes: #543
2017-01-31 23:42:04 +01:00
Johan Andersson
41b826cee0 dash: dont use the the same init file for every video.
fixes: #545
2017-01-31 23:40:40 +01:00
Johan Andersson
743c8d53fd options.flexibleq: this value should be 0 as default. 2017-01-28 12:10:50 +01:00
Johan Andersson
dc2dc7dc62 New version 1.9.1 2017-01-27 02:14:20 +01:00
Johan Andersson
be471e9aab svtplay: fix subtitles after the change on svtplay.se
fixes #535
2017-01-27 02:10:46 +01:00
Johan Andersson
76956610c8 picsearch: sometimes we don't get the video in player api
fixes: #527
2017-01-27 02:02:57 +01:00
Johan Andersson
3b8819a0eb solidtango: detect hls video in a new way 2017-01-27 01:19:47 +01:00
Johan Andersson
f1b8949ab2 dplay: fix a crash when show name have weird unicode character
fixes #529
2017-01-26 22:33:32 +01:00
Johan Andersson
dac1b66ce4 svtplay: fixing some crashes after latest update.
fixes #528
2017-01-26 21:54:58 +01:00
Johan Andersson
f38e8403a2 mutliargs: using -A creates bad output names.
using -A creates an directory with the first files name for the second argument which is wrong.

fixes #525
2017-01-22 10:49:43 +01:00
Johan Andersson
6dec190df0 New version 1.9 2017-01-21 15:00:19 +01:00
Johan Andersson
4de8f8b451 Merge pull request #512 from mutoso/master
Allow multiple URLs as arguments
2017-01-20 15:50:12 +01:00
Johan Andersson
ea3041cf08 postprocess: we need to open the file as enc=utf8 on windows py3
fixes #521
2017-01-15 12:29:40 +01:00
Alastair Feille
b1987aee88 Account for -o option when using multiple URLs 2017-01-03 21:20:50 -06:00
Johan Andersson
0f99956d62 postprocess: don’t crash on åäö in filename
fixes #517
2017-01-02 21:09:35 +01:00
Johan Andersson
fd64749c15 Merge remote-tracking branch 'qnorsten/master' 2017-01-02 18:35:27 +01:00
Johan Andersson
bc7ccc5918 svtplay: don’t crash if we cant find url for subtitle.
fixes #511
2017-01-02 18:32:33 +01:00
qnorsten
a82f1f9080 Output: do not add double extension when using --raw-subtitles
Should fix https://github.com/spaam/svtplay-dl/issues/509 
Prevents the subtitle file from getting the raw exstension also e.g subtitle.wsrt.srt
2016-12-21 00:06:51 +01:00
qnorsten
5dff059ff3 Viafree: Added SDH subfix to subtitle files when --all-subtitles are used
Added support to download both regular and Subtitles for hearing impared( with -SDH subfix), when using --all-subtitles
2016-12-17 11:09:07 +01:00
Alastair Feille
4cf6f210e0 Allow multiple URLs as arguments 2016-12-15 19:40:33 -06:00
Johan Andersson
544f131ae4 urplay: detect related videos for -A
this is good enough to find related videos.
it would be better to use bs4 with lxml..

fixes #470
2016-12-06 22:42:54 +01:00
Johan Andersson
ab3907a0ff output: dont overwrite end of the filename when its auto generated
fixes #469
2016-12-06 22:09:27 +01:00
Johan Andersson
de055b885b tv4play: don’t try to access vod when its live
fixes: #506
2016-12-05 22:09:20 +01:00
Johan Andersson
92323375fc naming: write leading zeros in episodes and seasons in a better way 2016-12-05 21:52:42 +01:00
Johan Andersson
33679e3058 viaplay: support for wsrt (vtt) subtitle
fixes: #501
2016-12-05 20:53:22 +01:00
Johan Andersson
18a9a1bcf5 subtitle: dont double encode utf8
fixes: #507
fixes: #501
2016-12-05 20:45:14 +01:00
Johan Andersson
3173beef4a viaplay: check if its vtt or sami 2016-12-05 19:57:57 +01:00
Johan Andersson
ec0f2a4feb subtitle: use HTTP from utils instead of requets. 2016-12-05 19:55:04 +01:00
Johan Andersson
80992f8664 postprocess: return und if we cant get the right language 2016-12-05 19:36:00 +01:00