@@ -887,7 +887,7 @@ def parseJSOND(fn):
887887 if "credits" in p :
888888 credits = p ["credits" ]
889889 i = 1
890- if "credits" not in programs [cp ]:
890+ if "credits" not in programs [cp ]:
891891 programs [cp ]["credits" ] = {}
892892 for g in credits :
893893 programs [cp ]["credits" ][g ] = i
@@ -1444,7 +1444,8 @@ def printProgrammes(fh):
14441444def addXDetails (program , schedule ):
14451445 #log.pout(program)
14461446 ratings = ""
1447- date = ""
1447+ date = ""
1448+ myear = ""
14481449 new = ""
14491450 live = ""
14501451 hd = ""
@@ -1456,14 +1457,15 @@ def addXDetails(program, schedule):
14561457 prog = ""
14571458 plot = ""
14581459 descsort = ""
1459- bullet = u"\u2022 "
1460- hyphen = u"\u2013 "
1460+ bullet = u"\u2022 "
1461+ hyphen = u"\u2013 "
1462+ lbreak = "\n "
14611463 if "originalAirDate" in program and not new and not live :
14621464 origdate = enc (convDateLocal (program ["originalAirDate" ]))
14631465 finaldate = datetime .datetime .strptime (origdate , "%Y%m%d" ).strftime ('%B %d, %Y' )
14641466 date = "First aired: " + finaldate
14651467 if "movie_year" in program :
1466- date = "Released: " + program ["movie_year" ]
1468+ myear = "Released: " + program ["movie_year" ]
14671469 if "rating" in program :
14681470 ratings = enc (program ["rating" ])
14691471 if "new" in schedule :
@@ -1479,7 +1481,7 @@ def addXDetails(program, schedule):
14791481 sf = "Season %0*d " % (max (2 , len (str (ss ))), int (ss ))
14801482 e = program ["episodeNum" ]
14811483 ef = "Episode %0*d" % (max (2 , len (str (e ))), int (e ))
1482- season = sf + " - "+ ef
1484+ season = sf + u" \u2010 "+ ef
14831485# if "credits" in programs[p]:
14841486# sortThing1 = str(p)
14851487# sortThing2 = "credits"
@@ -1497,11 +1499,13 @@ def addXDetails(program, schedule):
14971499 prog = enc (program ['title' ])
14981500 if 'episode' in program :
14991501 epis = enc (program ['episode' ])
1500- episqts = ' \" ' + enc (program ['episode' ]) + ' \" '
1502+ episqts = """ + enc (program ['episode' ]) + """
15011503 if 'description' in program :
15021504 plot = enc (program ['description' ])
15031505 if "-V" in options :
15041506 descsort = options ["-V" ]
1507+ descsort = re .sub ("z15y" , lbreak , descsort )
1508+ descsort = re .sub ("z14y" , myear , descsort )
15051509 descsort = re .sub ("z13y" , cast + " " , descsort )
15061510 descsort = re .sub ("z12y" , episqts + " " , descsort )
15071511 descsort = re .sub ("z11y" , epis + " " , descsort )
@@ -1513,13 +1517,16 @@ def addXDetails(program, schedule):
15131517 descsort = re .sub ("z5y" , hd + " " , descsort )
15141518 descsort = re .sub ("z4y" , new + live + " " , descsort )
15151519 descsort = re .sub ("z3y" , plot + " " , descsort )
1516- descsort = re .sub ("z2y" , hyphen , descsort )
1517- descsort = re .sub ("z1y" , bullet , descsort )
1520+ descsort = re .sub ("z2y" , hyphen + " " , descsort )
1521+ descsort = re .sub ("z1y" , bullet + " " , descsort )
15181522 descsort = re .sub ("z0y" , "" , descsort )
1519- descsort = re .sub (hyphen + " +" + bullet , bullet , descsort ) #removes back to back hyphen/bullet when other details are blank
1520- descsort = re .sub (bullet + " +" + hyphen , hyphen , descsort ) #removes back to back bullet/hyphen when other details are blank
1521- descsort = re .sub (bullet + " +" + bullet , bullet , descsort ) #removes duplicate bullets when other details are blank
1522- descsort = re .sub (hyphen + " +" + hyphen , hyphen , descsort ) #removes duplicate hyphens when other details are blank
1523+ descsort = re .sub (hyphen + " *" + bullet , bullet , descsort ) #removes back to back hyphen/bullet when other details are blank
1524+ descsort = re .sub (bullet + " *" + hyphen , hyphen , descsort ) #removes back to back bullet/hyphen when other details are blank
1525+ descsort = re .sub (bullet + " *" + bullet , bullet , descsort ) #removes duplicate bullets when other details are blank
1526+ descsort = re .sub (hyphen + " *" + hyphen , hyphen , descsort ) #removes duplicate hyphens when other details are blank
1527+ descsort = re .sub (bullet + " *" + bullet , bullet , descsort ) #removes re.sub leftover duplicate bullets when other details are blank
1528+ descsort = re .sub (hyphen + " *" + hyphen , hyphen , descsort ) #removes re.sub leftover duplicate hyphens when other details are blank
1529+ descsort = re .sub (" +" , " " , descsort ) #removes duplicate spaces when other details are blank
15231530 result = descsort
15241531 return result
15251532
0 commit comments