Skip to content

Commit

Permalink
add a few more xtradetails options and fix unicodes
Browse files Browse the repository at this point in the history
  • Loading branch information
@edit4ever
edit4ever committed Nov 4, 2016
1 parent b6808ba commit a296dc7
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 34 deletions.
4 changes: 3 additions & 1 deletion resources/language/English/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@
<string id="32306">CC Indicator</string>
<string id="32307">Season/Episode Number</string>
<string id="32308">TV Rating</string>
<string id="32309">Original Air Date or Movie Release Year</string>
<string id="32309">Original Air Date</string>
<string id="32310">Program Title</string>
<string id="32311">Episode Title</string>
<string id="32312">Episode Title in Quotes</string>
<string id="32313">Cast</string>
<string id="32314">Movie Release Year</string>
<string id="32320">LINE BREAK</string>
</strings>
40 changes: 20 additions & 20 deletions resources/settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,25 @@
</category>
<category label="32200">
<setting label="32201" type="lsep" />
<setting label="32210" type="enum" id="desc1" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32211" type="enum" id="desc2" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32212" type="enum" id="desc3" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32213" type="enum" id="desc4" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32214" type="enum" id="desc5" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32215" type="enum" id="desc6" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32216" type="enum" id="desc7" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32217" type="enum" id="desc8" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32218" type="enum" id="desc9" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32219" type="enum" id="desc10" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32220" type="enum" id="desc11" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32221" type="enum" id="desc12" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32222" type="enum" id="desc13" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32223" type="enum" id="desc14" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32224" type="enum" id="desc15" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32225" type="enum" id="desc16" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32226" type="enum" id="desc17" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32227" type="enum" id="desc18" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32228" type="enum" id="desc19" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32229" type="enum" id="desc20" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313"/>
<setting label="32210" type="enum" id="desc1" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32211" type="enum" id="desc2" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32212" type="enum" id="desc3" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32213" type="enum" id="desc4" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32214" type="enum" id="desc5" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32215" type="enum" id="desc6" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32216" type="enum" id="desc7" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32217" type="enum" id="desc8" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32218" type="enum" id="desc9" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32219" type="enum" id="desc10" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32220" type="enum" id="desc11" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32221" type="enum" id="desc12" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32222" type="enum" id="desc13" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32223" type="enum" id="desc14" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32224" type="enum" id="desc15" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32225" type="enum" id="desc16" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32226" type="enum" id="desc17" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32227" type="enum" id="desc18" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32228" type="enum" id="desc19" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
<setting label="32229" type="enum" id="desc20" lvalues="32300|32301|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314|32320"/>
</category>
</settings>
33 changes: 20 additions & 13 deletions zap2xml.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ def parseJSOND(fn):
if "credits" in p:
credits = p["credits"]
i = 1
if"credits" not in programs[cp]:
if "credits" not in programs[cp]:
programs[cp]["credits"] = {}
for g in credits:
programs[cp]["credits"][g] = i
Expand Down Expand Up @@ -1444,7 +1444,8 @@ def printProgrammes(fh):
def addXDetails(program, schedule):
#log.pout(program)
ratings = ""
date= ""
date = ""
myear = ""
new = ""
live = ""
hd = ""
Expand All @@ -1456,14 +1457,15 @@ def addXDetails(program, schedule):
prog = ""
plot= ""
descsort = ""
bullet = u"\u2022 "
hyphen = u"\u2013 "
bullet = u"\u2022"
hyphen = u"\u2013"
lbreak = "\n"
if "originalAirDate" in program and not new and not live:
origdate = enc(convDateLocal(program["originalAirDate"]))
finaldate = datetime.datetime.strptime(origdate, "%Y%m%d").strftime('%B %d, %Y')
date = "First aired: " + finaldate
if "movie_year" in program:
date = "Released: " + program["movie_year"]
myear = "Released: " + program["movie_year"]
if "rating" in program:
ratings = enc(program["rating"])
if "new" in schedule:
Expand All @@ -1479,7 +1481,7 @@ def addXDetails(program, schedule):
sf = "Season %0*d " % (max(2, len(str(ss))), int(ss))
e = program["episodeNum"]
ef = "Episode %0*d" % (max(2, len(str(e))), int(e))
season = sf + " - " + ef
season = sf + u"\u2010 " + ef
# if "credits" in programs[p]:
# sortThing1 = str(p)
# sortThing2 = "credits"
Expand All @@ -1497,11 +1499,13 @@ def addXDetails(program, schedule):
prog = enc(program['title'])
if 'episode' in program:
epis = enc(program['episode'])
episqts = '\"' + enc(program['episode']) + '\"'
episqts = "&quot;" + enc(program['episode']) + "&quot;"
if 'description' in program:
plot = enc(program['description'])
if "-V" in options:
descsort = options["-V"]
descsort = re.sub("z15y", lbreak, descsort)
descsort = re.sub("z14y", myear, descsort)
descsort = re.sub("z13y", cast + " ", descsort)
descsort = re.sub("z12y", episqts + " ", descsort)
descsort = re.sub("z11y", epis + " ", descsort)
Expand All @@ -1513,13 +1517,16 @@ def addXDetails(program, schedule):
descsort = re.sub("z5y", hd + " ", descsort)
descsort = re.sub("z4y", new + live + " ", descsort)
descsort = re.sub("z3y", plot + " ", descsort)
descsort = re.sub("z2y", hyphen, descsort)
descsort = re.sub("z1y", bullet, descsort)
descsort = re.sub("z2y", hyphen + " ", descsort)
descsort = re.sub("z1y", bullet + " ", descsort)
descsort = re.sub("z0y", "", descsort)
descsort = re.sub(hyphen + " +" + bullet, bullet, descsort) #removes back to back hyphen/bullet when other details are blank
descsort = re.sub(bullet + " +" + hyphen, hyphen, descsort) #removes back to back bullet/hyphen when other details are blank
descsort = re.sub(bullet + " +" + bullet, bullet, descsort) #removes duplicate bullets when other details are blank
descsort = re.sub(hyphen + " +" + hyphen, hyphen, descsort) #removes duplicate hyphens when other details are blank
descsort = re.sub(hyphen + " *" + bullet, bullet, descsort) #removes back to back hyphen/bullet when other details are blank
descsort = re.sub(bullet + " *" + hyphen, hyphen, descsort) #removes back to back bullet/hyphen when other details are blank
descsort = re.sub(bullet + " *" + bullet, bullet, descsort) #removes duplicate bullets when other details are blank
descsort = re.sub(hyphen + " *" + hyphen, hyphen, descsort) #removes duplicate hyphens when other details are blank
descsort = re.sub(bullet + " *" + bullet, bullet, descsort) #removes re.sub leftover duplicate bullets when other details are blank
descsort = re.sub(hyphen + " *" + hyphen, hyphen, descsort) #removes re.sub leftover duplicate hyphens when other details are blank
descsort = re.sub(" +", " ", descsort) #removes duplicate spaces when other details are blank
result = descsort
return result

Expand Down

0 comments on commit a296dc7

Please sign in to comment.