Saverr/svtplay-dl
1
0
Fork 0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-24 04:05:39 +01:00
Code Issues Projects Releases Wiki Activity

fix hls live download for tv4,sjuan,tv12

Browse Source
This commit is contained in:
dalgr 2018-01-15 22:16:07 +01:00
parent b8dfbd1e3a
commit f73f5d0b81
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/svtplay_dl/fetcher/hls.py
View File

@ -6,7 +6,7 @@ import os
import re
import copy
import time
import datetime
from datetime import datetime, timedelta
from svtplay_dl.output import progressbar, progress_stream, ETA, output
from svtplay_dl.log import log
@ -139,7 +139,7 @@ class HLS(VideoRetriever):
if not self.options.silent:
if self.options.live:
progressbar(size_media, index + 1, ''.join(['DU: ', str(datetime.timedelta(seconds=int(duration)))]))
progressbar(size_media, index + 1, ''.join(['DU: ', str(timedelta(seconds=int(duration)))]))
else:
eta.increment()
progressbar(size_media, index + 1, ''.join(['ETA: ', str(eta)]))
@ -175,6 +175,15 @@ class HLS(VideoRetriever):
time.sleep(1.0)
start_time = time.time()
if self.options.hls_time_stamp:
end_time_stamp = (datetime.now() - timedelta(hours=1, seconds=10)).replace(microsecond=0)
start_time_stamp = end_time_stamp - timedelta(minutes=1)
base_url = self.url.split(".m3u8")[0]
self.url = "{0}.m3u8?in={1}&out={2}?".format(base_url, start_time_stamp.isoformat(), end_time_stamp.isoformat())
new_m3u8 = M3U8(self.http.request("get", self.url, cookies=cookies).text)
for n_m3u in new_m3u8.media_segment:
if n_m3u not in m3u8.media_segment:

10
lib/svtplay_dl/service/tv4play.py
View File

@ -25,12 +25,14 @@ class Tv4play(Service, OpenGraphThumbMixin):
parse = urlparse(self.url)
if parse.path[:8] == "/kanaler":
channel = parse.path[9:]
start_time = "2018-01-14T23:00:00"#datetime.now() - timedelta(minutes=30)
end_time = "2018-01-14T23:30:00"#start_time + timedelta(minutes=1)
end_time_stamp = (datetime.now() - timedelta(hours=1, seconds=10)).replace(microsecond=0)
start_time_stamp = end_time_stamp - timedelta(minutes=1)
url = "https://bbr-l2v.akamaized.net/live/{0}/master.m3u8?in={1}&out={2}?".format(channel, start_time, end_time)
url = "https://bbr-l2v.akamaized.net/live/{0}/master.m3u8?in={1}&out={2}?".format(parse.path[9:], start_time_stamp.isoformat(), end_time_stamp.isoformat())
self.options.live = True
self.options.hls_time_stamp = True
streams = hlsparse(self.options, self.http.request("get", url), url)
if streams:
for n in list(streams.keys()):