filmroellchen/intro-outro-generator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

squash multiple whitespace chars into one

Browse source
This commit is contained in:
MaZderMind 2015-11-08 23:33:19 +01:00
parent 390fd41566
commit 38d3c80483
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
renderlib.py
View file

@ -2,6 +2,7 @@
import os import os
import sys import sys
import re
import glob import glob
import math import math
import shutil import shutil
@ -175,13 +176,28 @@ def events(scheduleUrl, titlemap={}):
personnames = [] personnames = []
if event.find('persons') is not None: if event.find('persons') is not None:
for person in event.find('persons').iter('person'): for person in event.find('persons').iter('person'):
personnames.append(person.text) personname = re.sub( '\s+', ' ', person.text ).strip()
personnames.append(personname)
id = int(event.get('id'))
if id in titlemap:
title = titlemap[id]
elif event.find('title') is not None and event.find('title').text is not None:
title = re.sub( '\s+', ' ', event.find('title').text ).strip()
else:
title = ''
if event.find('subtitle') is not None and event.find('subtitle').text is not None:
subtitle = re.sub( '\s+', ' ', event.find('subtitle').text ).strip()
else:
subtitle = ''
# yield a tupel with the event-id, event-title and person-names # yield a tupel with the event-id, event-title and person-names
yield { yield {
'id': int(event.get('id')), 'id': id,
'title': titlemap[id] if id in titlemap else (event.find('title').text.strip() if event.find('title') is not None and event.find('title').text is not None else ''), 'title': title,
'subtitle': event.find('subtitle').text.strip() if event.find('subtitle') is not None and event.find('subtitle').text is not None else '', 'subtitle': subtitle,
'persons': personnames, 'persons': personnames,
'personnames': ', '.join(personnames), 'personnames': ', '.join(personnames),
'room': room.attrib['name'], 'room': room.attrib['name'],