fHDHR/fHDHR_NextPVR
1
0
Fork 0
mirror of https://github.com/fHDHR/fHDHR_NextPVR.git synced 2025-12-06 16:16:58 -05:00
Code Issues Releases Wiki Activity

Merge pull request #36 from deathbybandaid/dev

Browse Source 
Dev
This commit is contained in:
Deathbybandaid 2020-10-14 20:16:22 -04:00 committed by GitHub
commit f5eb933107
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fHDHR/epghandler/epgtypes/zap2it.py
View File

@ -34,7 +34,7 @@ class ZapEPG():
programguide = {} programguide = {}
# Start time parameter is now rounded down to nearest `zap_timespan`, in s. # Start time parameter is now rounded down to nearest `zap_timespan`, in s.
zap_time = time.mktime(time.localtime()) zap_time = datetime.datetime.utcnow().timestamp()
zap_time_window = int(self.config.dict["zap2it"]["timespan"]) * 3600 zap_time_window = int(self.config.dict["zap2it"]["timespan"]) * 3600
zap_time = int(zap_time - (zap_time % zap_time_window)) zap_time = int(zap_time - (zap_time % zap_time_window))

5
fHDHR/fHDHRweb/fHDHRdevice/images.py
View File

@ -28,13 +28,12 @@ class imageHandler():
return image, imagetype return image, imagetype
def get_epg_image(self, request_args): def get_epg_image(self, request_args):
imageUri = self.epghandling.get_thumbnail(request_args["type"], request_args["id"]) imageUri = self.epghandling.get_thumbnail(request_args["type"], str(request_args["id"]))
if not imageUri: if not imageUri:
return self.generate_image(request_args["type"], request_args["id"]) return self.generate_image(request_args["type"], str(request_args["id"]))
req = requests.get(imageUri) req = requests.get(imageUri)
return req.content return req.content
# return self.generate_image(request_args["type"], request_args["id"])
def getSize(self, txt, font): def getSize(self, txt, font):
testImg = PIL.Image.new('RGB', (1, 1)) testImg = PIL.Image.new('RGB', (1, 1))