Skip to content

Commit 97e7bee

Browse files
committed
Change xdetails spacing
solves strange spacing on new lines
1 parent 84cec23 commit 97e7bee

File tree

1 file changed

+20
-19
lines changed

1 file changed

+20
-19
lines changed

zap2xml.py

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1466,9 +1466,10 @@ def addXDetails(program, schedule):
14661466
prog = ""
14671467
plot= ""
14681468
descsort = ""
1469-
bullet = u"\u2022"
1470-
hyphen = u"\u2013"
1469+
bullet = u"\u2022 "
1470+
hyphen = u"\u2013 "
14711471
newLine = "\n"
1472+
space = " "
14721473

14731474
def getSortName(opt):
14741475
return {
@@ -1524,31 +1525,31 @@ def makeDescsortList(optList):
15241525
if "originalAirDate" in program and not new and not live:
15251526
origdate = enc(convDateLocal(program["originalAirDate"]))
15261527
finaldate = datetime.datetime.strptime(origdate, "%Y%m%d").strftime('%B %d, %Y')
1527-
date = "First aired: " + finaldate
1528+
date = "First aired: " + finaldate + space
15281529
if "movie_year" in program:
1529-
myear = "Released: " + program["movie_year"]
1530+
myear = "Released: " + program["movie_year"] + space
15301531
if "rating" in program:
1531-
ratings = enc(program["rating"])
1532+
ratings = enc(program["rating"]) + space
15321533
if "new" in schedule:
1533-
new = "NEW"
1534+
new = "NEW "
15341535
origdate = startTime
15351536
finaldate = datetime.datetime.strptime(origdate, "%Y%m%d%H%M%S").strftime('%B %d, %Y')
1536-
date = "First aired: " + finaldate
1537+
date = "First aired: " + finaldate + space
15371538
if "live" in schedule:
1538-
live = "LIVE"
1539+
live = "LIVE "
15391540
origdate = startTime
15401541
finaldate = datetime.datetime.strptime(origdate, "%Y%m%d%H%M%S").strftime('%B %d, %Y')
1541-
date = "First aired: " + finaldate
1542+
date = "First aired: " + finaldate + space
15421543
if "quality" in schedule:
1543-
hd = schedule['quality']
1544+
hd = schedule['quality'] + space
15441545
if "cc" in schedule:
1545-
cc = schedule['cc']
1546+
cc = schedule['cc'] + space
15461547
if "seasonNum" in program and "episodeNum" in program:
15471548
ss = program["seasonNum"]
15481549
sf = "Season " + str(int(ss))
15491550
e = program["episodeNum"]
15501551
ef = "Episode " + str(int(e))
1551-
season = sf + " - " + ef
1552+
season = sf + " - " + ef + space
15521553

15531554
if "credits" in program:
15541555
#sortThing1 = str(program)
@@ -1562,23 +1563,23 @@ def makeDescsortList(optList):
15621563
prev = g
15631564
else:
15641565
castlist = castlist + ", " + enc(g)
1565-
cast = cast + castlist
1566+
cast = cast + castlist + space
15661567

15671568
if 'title' in program:
1568-
prog = enc(program['title'])
1569+
prog = enc(program['title']) + space
15691570
if 'episode' in program:
1570-
epis = enc(program['episode'])
1571-
episqts = '\"' + enc(program['episode']) + '\"'
1571+
epis = enc(program['episode']) + space
1572+
episqts = '\"' + enc(program['episode']) + '\"' + space
15721573
if 'description' in program:
15731574
plot = program['description']
15741575
plot = unicode(BeautifulStoneSoup(plot, convertEntities=BeautifulStoneSoup.ALL_ENTITIES))
1575-
plot = enc(plot)
1576+
plot = enc(plot) + space
15761577
if "-V" in options:
15771578
optList = ast.literal_eval(options["-V"])
1578-
descsort = " ".join(makeDescsortList(optList))
1579+
descsort = "".join(makeDescsortList(optList))
15791580
else:
15801581
descDefault = [4,1,5,1,6,1,7,1,8,1,9,1,10]
1581-
descsort = " ".join(makeDescsortList(descDefault))
1582+
descsort = "".join(makeDescsortList(descDefault))
15821583

15831584
return descsort
15841585

0 commit comments

Comments
 (0)