Skip to content

Commit a3466b8

Browse files
edit4everedit4ever
committed
Merge branch 'xdetails'
2 parents 79529ef + e19a013 commit a3466b8

File tree

5 files changed

+53
-29
lines changed

5 files changed

+53
-29
lines changed

‎addon.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<addon id="script.module.zap2xml"
33
name="zap2xml"
4-
version="0.6.6"
4+
version="0.7.2"
55
provider-name="edit4ever">
66
<requires>
77
<import addon="xbmc.python" version="2.1.0"/>
@@ -18,5 +18,16 @@
1818
</disclaimer>
1919
<platform>all</platform>
2020
<license>GNU GENERAL PUBLIC LICENSE. Version 3, June 2007</license>
21+
<news>
22+
v.7.2
23+
- fix for channels with non-standard numbers
24+
25+
v.7.1
26+
- fix incorrect xtra details
27+
28+
v0.7.0
29+
- fix login error with zap2it
30+
- added function to delete cache to solve issue with updating "favorite" channels
31+
</news>
2132
</extension>
2233
</addon>

‎bin/tv_grab_zap2xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ do case "$1" in
5151
;;
5252

5353
-v | --version )
54-
printf "0.6.6\n"
54+
printf "0.7.x\n"
5555
;;
5656

5757
-c | --capabilities )

‎default.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,20 @@
1717
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
1818
# http://www.gnu.org/copyleft/gpl.html
1919
################################################################################
20-
import xbmcgui
20+
import xbmc,xbmcaddon,xbmcgui
21+
import os
2122

2223
dialog = xbmcgui.Dialog()
23-
if dialog.yesno('This is addon runs from within Tvheadend', 'Add your zap2it/screener/tvguide login info in the addon configuration. Reboot and setup the grabber in tvheadend before enabling the other options.'):
24-
xbmc.executebuiltin(Addon.OpenSettings())
24+
if dialog.yesno('This is addon runs from within Tvheadend', 'Add your zap2it/screener/tvguide login info in the addon configuration. Then reboot and setup the grabber channels in tvheadend before enabling the other options.', 'Would you like to open the addon settings?'):
25+
xbmcaddon.Addon().openSettings()
26+
if dialog.yesno('Clear the listings cache', 'Would you like to clear the listings cache?', 'This might be needed to download updated "favorite" channels.'):
27+
scandirs = xbmc.translatePath(
28+
'special://home/addons/script.module.zap2xml/cache'
29+
)
30+
path = scandirs
31+
exts = ('html.gz')
32+
if os.path.exists(scandirs):
33+
for root, dirs, files in os.walk(path):
34+
for currentFile in files:
35+
if any(currentFile.lower().endswith(exts) for ext in exts):
36+
os.remove(os.path.join(root, currentFile))

‎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|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"/>
24+
<setting label="32210" type="enum" id="desc01" default="10" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
25+
<setting label="32211" type="enum" id="desc02" default="18" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
26+
<setting label="32212" type="enum" id="desc03" default="6" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
27+
<setting label="32213" type="enum" id="desc04" default="13" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
28+
<setting label="32214" type="enum" id="desc05" default="6" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
29+
<setting label="32215" type="enum" id="desc06" default="15" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
30+
<setting label="32216" type="enum" id="desc07" default="2" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
31+
<setting label="32217" type="enum" id="desc08" default="9" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
32+
<setting label="32218" type="enum" id="desc09" default="2" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
33+
<setting label="32219" type="enum" id="desc10" default="14" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
34+
<setting label="32220" type="enum" id="desc11" default="6" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
35+
<setting label="32221" type="enum" id="desc12" default="11" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
36+
<setting label="32222" type="enum" id="desc13" default="6" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
37+
<setting label="32223" type="enum" id="desc14" default="12" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
38+
<setting label="32224" type="enum" id="desc15" default="6" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
39+
<setting label="32225" type="enum" id="desc16" default="20" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
40+
<setting label="32226" type="enum" id="desc17" default="6" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
41+
<setting label="32227" type="enum" id="desc18" default="19" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
42+
<setting label="32228" type="enum" id="desc19" default="0" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
43+
<setting label="32229" type="enum" id="desc20" default="0" lvalues="32300|32301|32320|32302|32321|32322|32323|32324|32325|32303|32304|32305|32306|32307|32308|32309|32310|32311|32312|32313|32314"/>
4444
</category>
4545
</settings>

‎zap2xml.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def pout (self, pstr, log_type='none',printOut = True, func = False):
150150
br = None #browser global
151151
gridHours = 0
152152
loggedinMatchZ = 0
153-
loggedinStr = '.*Logout of your Screener account.*'
153+
loggedinStr = '.*Logout of your Zap2it account.*'
154154
programs = {}
155155
cp = None
156156
stations = {}
@@ -1223,9 +1223,11 @@ def incXML (st, en, fh):
12231223
# these cmp func need to be key objs too lazy right now
12241224
def sortChan(a,b):
12251225
global stations
1226-
1226+
p = re.compile("\d+\.\d+")
12271227
if "order" in stations[a] and "order" in stations[b]:
1228-
tmp = float(stations[a]["order"]) - float(stations[b]["order"])
1228+
ma = p.search(stations[a]["order"])
1229+
mb = p.search(stations[b]["order"])
1230+
tmp = float(ma.group()) - float(mb.group())
12291231
if tmp < 0.00:
12301232
return -1
12311233
if tmp == 0.00:
@@ -1240,7 +1242,6 @@ def sortChan(a,b):
12401242
if stations[a]["name"] > stations[b]["name"]:
12411243
return 1
12421244

1243-
12441245
def hex2dec_e(matchObj):
12451246
return "%s%d%s" % ('&#',ord(matchObj.group(1)),';')
12461247

0 commit comments

Comments
 (0)