Nemcio/DemonEditor
1
0
Fork 0
mirror of https://github.com/DYefremov/DemonEditor.git synced 2026-03-06 20:41:41 +01:00
Code Issues Packages Projects Releases Activity

xmltv reading correction

Browse Source
This commit is contained in:
DYefremov
2022-08-25 21:31:16 +03:00
parent 15b8483107
commit 4f26855ec3
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/tools/epg.py
View File

@@ -228,7 +228,7 @@ class XmlTvReader(Reader):
TIME_FORMAT_STR = "%Y%m%d%H%M%S %z"
Service = namedtuple("Service", ["id", "name", "logo", "events"])
Service = namedtuple("Service", ["id", "names", "logo", "events"])
Event = namedtuple("EpgEvent", ["start", "duration", "title", "desc"])
def __init__(self, path, url):
@@ -297,14 +297,15 @@ class XmlTvReader(Reader):
utc = dt.timestamp()
offset = datetime.now() - dt
for srv in filter(lambda s: s.name in names, self._ids.values()):
for srv in filter(lambda s: any(name in names for name in s.names), self._ids.values()):
ev = list(filter(lambda s: s.start < utc, srv.events))
if ev:
ev = ev[-1]
start = datetime.fromtimestamp(ev.start) + offset
end_time = datetime.fromtimestamp(ev.duration) + offset
tm = f"{start.strftime('%H:%M')} - {end_time.strftime('%H:%M')}"
events[srv.name] = EpgEvent(srv.name, ev.title, tm, ev.desc, ev)
for n in srv.names:
events[n] = EpgEvent(n, ev.title, tm, ev.desc, ev)
return events
@@ -324,13 +325,9 @@ class XmlTvReader(Reader):
event, element = node
if element.tag == self.CH_TAG:
ch_id = element.get("id", None)
name, logo = None, None
for c in element:
if c.tag == self.DSP_NAME_TAG:
name = c.text
elif c.tag == self.ICON_TAG:
logo = c.get("src", None)
self._ids[ch_id] = self.Service(ch_id, name, logo, [])
logo = None # Currently not in use.
# Since a service can have several names, we will store a set of names in the "names" field!
self._ids[ch_id] = self.Service(ch_id, {c.text for c in element if c.tag == self.DSP_NAME_TAG}, logo, [])
elif element.tag == self.PR_TAG:
channel = self._ids.get(element.get(self.CH_TAG, None), None)
if channel: