Skip to content

Hotfixes to issue #2 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tzwenn wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Hotfixes to issue #2 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
817db69
Hotfixes to issue #2
tzwenn May 1, 2024
008fd21
Fix another KeyError for A-Z
tzwenn May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/libzdf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def __init__(self):

def libZdfListMain(self):
l = []
l.append({'metadata':{'name':self.translation(32031)}, 'params':{'mode':'libZdfListPage','url':f'{self.baseApi}/content/documents/meist-gesehen-100.json?profile=default'}, 'type':'dir'})
#l.append({'metadata':{'name':self.translation(32031)}, 'params':{'mode':'libZdfListPage','url':f'{self.baseApi}/content/documents/meist-gesehen-100.json?profile=default'}, 'type':'dir'})
#l.append({'metadata':{'name':self.translation(32031)}, 'params':{'mode':'libZdfListPage','url':f'{self.baseApi}/content/documents/filter-meist-gesehen-100.json?profile=page-video_episode_vod&limit=50'}, 'type':'dir'})
l.append({'metadata':{'name':self.translation(32132)}, 'params':{'mode':'libZdfListShows'}, 'type':'dir'})
l.append({'metadata':{'name':self.translation(32133)}, 'params':{'mode':'libZdfListChannel'}, 'type':'dir'})
Expand Down Expand Up @@ -90,4 +90,3 @@ def libZdfListChannelDateVideos(self):
def libZdfListSearch(self,searchString):
self.params['url'] = f'{self.baseApi}/search/documents?q={searchString}'
return self.libZdfListPage()

16 changes: 10 additions & 6 deletions lib/libzdfjsonparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,17 +195,21 @@ def _grepItemDefault(self,target,forcedType=False):
self._grepActors(target)

if target['contentType'] == 'topic':
if target['hasVideo'] == False: return False
if not target.get('hasVideo', False): return False

self.d['params']['url'] = self.baseApi + target['self']+'&limit=100'
self.d['params']['mode'] = 'libZdfListPage'
self.d['type'] = 'dir'

elif target['contentType'] in ['brand','category','topic']:
if not 'hasVideo' in target: return False
if target['hasVideo'] == False: return False
if not target.get('hasVideo', False): return False

self.d['params']['url'] = self.baseApi + target['http://zdf.de/rels/search/page-video-counter-with-video']['self'].replace('&limit=0','&limit=100')
try:
t = target["http://zdf.de/rels/search/page-video-counter-with-video"]["self"]
except KeyError:
return False

self.d['params']['url'] = self.baseApi + t.replace('&limit=0','&limit=100')
self.d['params']['mode'] = 'libZdfListPage'
self.d['type'] = 'dir'

Expand All @@ -220,7 +224,7 @@ def _grepItemDefault(self,target,forcedType=False):
except: self.d = False

elif target['contentType'] == 'episode':# or target['contentType'] == 'clip':
if not target['hasVideo']:
if not target.get('hasVideo', False):
pass
#return False
#if target['mainVideoContent']['http://zdf.de/rels/target']['showCaption']:
Expand Down Expand Up @@ -259,7 +263,7 @@ def _grepItemDefault(self,target,forcedType=False):

def _grepArt(self,target,isVideo=False):
art = {}
if not isVideo:
if not isVideo and 'teaserImageRef' in target:
if 'layouts' in target['teaserImageRef']:
if '384xauto' in target['teaserImageRef']['layouts']:
self.d['metadata']['art']['thumb'] = target['teaserImageRef']['layouts']['384xauto']
Expand Down