Skip to content

Commit 5882e5d

Browse files
edit4everedit4ever
committed
Additional separators and icon bug fix
1 parent 9bbcbb4 commit 5882e5d

File tree

3 files changed

+51
-38
lines changed

3 files changed

+51
-38
lines changed

‎resources/language/English/strings.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,9 @@
5757
<string id="32313">Cast</string>
5858
<string id="32314">Movie Release Year</string>
5959
<string id="32320">LINE BREAK</string>
60+
<string id="32321">SPACE</string>
61+
<string id="32322">COLON</string>
62+
<string id="32323">VERTICAL BAR</string>
63+
<string id="32324">SLASH</string>
64+
<string id="32325">COMMA</string>
6065
</strings>

‎resources/settings.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,25 @@
2121
</category>
2222
<category label="32200">
2323
<setting label="32201" type="lsep" />
24-
<setting label="32210" type="enum" id="desc01" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
25-
<setting label="32211" type="enum" id="desc02" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
26-
<setting label="32212" type="enum" id="desc03" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
27-
<setting label="32213" type="enum" id="desc04" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
28-
<setting label="32214" type="enum" id="desc05" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
29-
<setting label="32215" type="enum" id="desc06" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
30-
<setting label="32216" type="enum" id="desc07" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
31-
<setting label="32217" type="enum" id="desc08" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
32-
<setting label="32218" type="enum" id="desc09" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
33-
<setting label="32219" type="enum" id="desc10" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
34-
<setting label="32220" type="enum" id="desc11" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
35-
<setting label="32221" type="enum" id="desc12" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
36-
<setting label="32222" type="enum" id="desc13" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
37-
<setting label="32223" type="enum" id="desc14" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
38-
<setting label="32224" type="enum" id="desc15" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
39-
<setting label="32225" type="enum" id="desc16" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
40-
<setting label="32226" type="enum" id="desc17" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
41-
<setting label="32227" type="enum" id="desc18" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
42-
<setting label="32228" type="enum" id="desc19" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
43-
<setting label="32229" type="enum" id="desc20" lvalues="32300|32301|32320|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
24+
<setting label="32210" type="enum" id="desc01" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
25+
<setting label="32211" type="enum" id="desc02" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
26+
<setting label="32212" type="enum" id="desc03" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
27+
<setting label="32213" type="enum" id="desc04" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
28+
<setting label="32214" type="enum" id="desc05" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
29+
<setting label="32215" type="enum" id="desc06" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
30+
<setting label="32216" type="enum" id="desc07" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
31+
<setting label="32217" type="enum" id="desc08" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
32+
<setting label="32218" type="enum" id="desc09" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
33+
<setting label="32219" type="enum" id="desc10" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
34+
<setting label="32220" type="enum" id="desc11" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
35+
<setting label="32221" type="enum" id="desc12" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
36+
<setting label="32222" type="enum" id="desc13" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
37+
<setting label="32223" type="enum" id="desc14" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
38+
<setting label="32224" type="enum" id="desc15" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
39+
<setting label="32225" type="enum" id="desc16" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
40+
<setting label="32226" type="enum" id="desc17" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
41+
<setting label="32227" type="enum" id="desc18" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
42+
<setting label="32228" type="enum" id="desc19" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
43+
<setting label="32229" type="enum" id="desc20" lvalues="32300|32301|32320|32321|32322|32323|32324|32325|32302|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
4444
</category>
4545
</settings>

‎zap2xml.py

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ def on_td (self, tag, attrs):
351351
data = getURL(urlRoot + "gridDetailService?rtype=pgmimg&pgmId=" + cp)
352352
if data: #sometimes we fail to get the url try to keep going
353353
wbf(fn, data)
354-
log.pout("[I] Parsing: " + cp,'info')
354+
log.pout("[I] Parsing: " + str(cp),'info')
355355
parseJSONI(fn)
356356
elif re.search('zc-st',my_dict[cls]):
357357
inStationTd = 1
@@ -1360,9 +1360,7 @@ def printProgrammes(fh):
13601360

13611361
if "description" in programs[p] and programs[p]["description"] is not None:
13621362
xdets = ""
1363-
tmp = programs[p]["description"]
1364-
tmp = unicode(BeautifulStoneSoup(tmp, convertEntities=BeautifulStoneSoup.ALL_ENTITIES))
1365-
tmp = enc(tmp)
1363+
tmp = enc(programs[p]["description"])
13661364
if "-X" in options:
13671365
xdets = addXDetails(programs[p], schedule[station][s])
13681366
fh.write("\t\t<desc lang=\"" + lang + "\">" + xdets + "</desc>\n")
@@ -1478,24 +1476,34 @@ def addXDetails(program, schedule):
14781476
hyphen = u"\u2013 "
14791477
newLine = "\n"
14801478
space = " "
1479+
colon = u"\u003A "
1480+
vbar = u"\u007C "
1481+
slash = u"\u2215 "
1482+
comma = u"\u002C "
14811483

14821484
def getSortName(opt):
14831485
return {
14841486
1: bullet,
14851487
2: newLine,
14861488
3: hyphen,
1487-
4: plot,
1488-
5: new,
1489-
6: hd,
1490-
7: cc,
1491-
8: season,
1492-
9: ratings,
1493-
10: date,
1494-
11: prog,
1495-
12: epis,
1496-
13: episqts,
1497-
14: cast,
1498-
15: myear,
1489+
4: space,
1490+
5: colon,
1491+
6: vbar,
1492+
7: slash,
1493+
8: comma,
1494+
9: plot,
1495+
10: new,
1496+
11: hd,
1497+
12: cc,
1498+
13: season,
1499+
14: ratings,
1500+
15: date,
1501+
16: prog,
1502+
17: epis,
1503+
18: episqts,
1504+
19: cast,
1505+
20: myear,
1506+
14991507
}.get(opt, None)
15001508

15011509
def cleanSortList(optList):
@@ -1507,7 +1515,7 @@ def cleanSortList(optList):
15071515
cleanList.append(int(opt))
15081516

15091517
for item in reversed(cleanList):
1510-
if cleanList[-1] <= 3:
1518+
if cleanList[-1] <= 8:
15111519
del cleanList[-1]
15121520

15131521
#print cleanList
@@ -1520,7 +1528,7 @@ def makeDescsortList(optList):
15201528
for opt in cleanedList:
15211529
thisOption = getSortName(int(opt))
15221530
#print "opt: "+str(opt)+" this: "+str(thisOption)+" last: "+str(lastOption)
1523-
if int(opt) <= 3 and lastOption <= 3:
1531+
if int(opt) <= 8 and lastOption <= 8:
15241532
lastOption = int(opt)
15251533
elif thisOption and lastOption:
15261534
sortOrderList.append(thisOption)

0 commit comments

Comments
 (0)