Skip to content

Commit 3e0d99d

Browse files
edit4everedit4ever
committed
fix error with missing details and icon files and improve xdetails sorting
1 parent dce3907 commit 3e0d99d

File tree

10 files changed

+3006
-2992
lines changed

10 files changed

+3006
-2992
lines changed

‎.gitignore

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Test Cache files
2-
cache/
3-
4-
# Test xmltv files
5-
xmltv.xml
6-
7-
# Test log
1+
# Test Cache files
2+
cache/
3+
4+
# Test xmltv files
5+
xmltv.xml
6+
7+
# Test log
88
zap2xml.log

‎.zap2xmlrc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
user=somebody@domain.com
2-
pass=password
3-
#proxy=127.0.0.1:80
4-
stuff=stuff #ignored
1+
user=somebody@domain.com
2+
pass=password
3+
#proxy=127.0.0.1:80
4+
stuff=stuff #ignored

‎LICENSE.txt

Lines changed: 674 additions & 674 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
# script.module.zap2xml
2-
3-
Zap2xml is an epg grabber which creates an xmltv file from data scraped from Zap2it or TVguide listings.
4-
5-
This addon is designed for use as a replacement for the perl xmltv apps that are difficult to use on a LibreELEC/OpenELEC distro since perl is not available.
6-
7-
It has been tested using LibreELEC and OpenELEC running Tvheadend for the backend.
8-
9-
10-
### Installing the addon manually:
11-
12-
1. Download and move the script.module.zap2xml.zip to your LibreELEC/OpenELEC machine using whatever method you are the most comfortable with.
13-
2. Navigate to SYSTEM->Addons->Install from zip
14-
== use the file browser to navigate to the file and select it.
15-
3. Navigate to SYSTEM->Addons->My Addons->Program Addons->zap2xml
16-
4. Select Configure and set your username, password and options.
17-
5. Reboot
18-
6. Configure your tv backend to use tv_grab_zap2xml
19-
20-
Notes:
21-
This addon is derived from the work of [FastEddyCurrent] (https://github.com/FastEddyCurrent/zap2xml) who ported the original perl based http://zap2xml.awardspace.info/ to Python.
22-
1+
# script.module.zap2xml
2+
3+
Zap2xml is an epg grabber which creates an xmltv file from data scraped from Zap2it or TVguide listings.
4+
5+
This addon is designed for use as a replacement for the perl xmltv apps that are difficult to use on a LibreELEC/OpenELEC distro since perl is not available.
6+
7+
It has been tested using LibreELEC and OpenELEC running Tvheadend for the backend.
8+
9+
10+
### Installing the addon manually:
11+
12+
1. Download and move the script.module.zap2xml.zip to your LibreELEC/OpenELEC machine using whatever method you are the most comfortable with.
13+
2. Navigate to SYSTEM->Addons->Install from zip
14+
== use the file browser to navigate to the file and select it.
15+
3. Navigate to SYSTEM->Addons->My Addons->Program Addons->zap2xml
16+
4. Select Configure and set your username, password and options.
17+
5. Reboot
18+
6. Configure your tv backend to use tv_grab_zap2xml
19+
20+
Notes:
21+
This addon is derived from the work of [FastEddyCurrent] (https://github.com/FastEddyCurrent/zap2xml) who ported the original perl based http://zap2xml.awardspace.info/ to Python.
22+

‎addon.xml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<addon id="script.module.zap2xml"
3-
name="zap2xml"
4-
version="0.6.0"
5-
provider-name="edit4ever">
6-
<requires>
7-
<import addon="xbmc.python" version="2.1.0"/>
8-
<import addon="script.module.mechanize" version="0.2.6"/>
9-
<import addon="script.module.beautifulsoup" version="3.2.1"/>
10-
</requires>
11-
<extension point="xbmc.python.script" library="default.py">
12-
<provides></provides>
13-
</extension>
14-
<extension point="xbmc.addon.metadata">
15-
<summary>zap2xml xmltv grabber</summary>
16-
<description>zap2xml is an epg grabber which creates an xmltv file from data scraped from Zap2it (Screener) or TVguide listings. Create your account on either site, including setting up favorites for the channels you want to download. Then configure the zap2xml grabber in the tvheadend web interface. Consider adjusting your tvheadend cron settings so all users don't pull data at the same time.</description>
17-
<disclaimer>
18-
</disclaimer>
19-
<platform>all</platform>
20-
<license>GNU GENERAL PUBLIC LICENSE. Version 3, June 2007</license>
21-
</extension>
22-
</addon>
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<addon id="script.module.zap2xml"
3+
name="zap2xml"
4+
version="0.6.5"
5+
provider-name="edit4ever">
6+
<requires>
7+
<import addon="xbmc.python" version="2.1.0"/>
8+
<import addon="script.module.mechanize" version="0.2.6"/>
9+
<import addon="script.module.beautifulsoup" version="3.2.1"/>
10+
</requires>
11+
<extension point="xbmc.python.script" library="default.py">
12+
<provides></provides>
13+
</extension>
14+
<extension point="xbmc.addon.metadata">
15+
<summary>zap2xml xmltv grabber</summary>
16+
<description>zap2xml is an epg grabber which creates an xmltv file from data scraped from Zap2it (Screener) or TVguide listings. Create your account on either site, including setting up favorites for the channels you want to download. Then configure the zap2xml grabber in the tvheadend web interface. Consider adjusting your tvheadend cron settings so all users don't pull data at the same time.</description>
17+
<disclaimer>
18+
</disclaimer>
19+
<platform>all</platform>
20+
<license>GNU GENERAL PUBLIC LICENSE. Version 3, June 2007</license>
21+
</extension>
22+
</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.0\n"
54+
printf "0.6.5\n"
5555
;;
5656

5757
-c | --capabilities )

‎default.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
################################################################################
2-
# This file is part of OpenELEC - http://www.openelec.tv
3-
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
4-
#
5-
# This Program is free software; you can redistribute it and/or modify
6-
# it under the terms of the GNU General Public License as published by
7-
# the Free Software Foundation; either version 2, or (at your option)
8-
# any later version.
9-
#
10-
# This Program is distributed in the hope that it will be useful,
11-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
# GNU General Public License for more details.
14-
#
15-
# You should have received a copy of the GNU General Public License
16-
# along with OpenELEC.tv; see the file COPYING. If not, write to
17-
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
18-
# http://www.gnu.org/copyleft/gpl.html
19-
################################################################################
20-
import xbmcgui
21-
22-
dialog = xbmcgui.Dialog()
23-
dialog.ok('', 'This is addon runs from within Tvheadend')
1+
################################################################################
2+
# This file is part of OpenELEC - http://www.openelec.tv
3+
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
4+
#
5+
# This Program is free software; you can redistribute it and/or modify
6+
# it under the terms of the GNU General Public License as published by
7+
# the Free Software Foundation; either version 2, or (at your option)
8+
# any later version.
9+
#
10+
# This Program is distributed in the hope that it will be useful,
11+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
# GNU General Public License for more details.
14+
#
15+
# You should have received a copy of the GNU General Public License
16+
# along with OpenELEC.tv; see the file COPYING. If not, write to
17+
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
18+
# http://www.gnu.org/copyleft/gpl.html
19+
################################################################################
20+
import xbmcgui
21+
22+
dialog = xbmcgui.Dialog()
23+
dialog.ok('', 'This is addon runs from within Tvheadend')

‎resources/language/English/strings.xml

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
1-
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2-
<strings>
3-
<!--zap2xml-->
4-
<string id="32000">User Information</string>
5-
<string id="32030">EPG Source</string>
6-
<string id="32031">Zap2It</string>
7-
<string id="32032">TV Guide</string>
8-
<string id="32010">Username</string>
9-
<string id="32020">Password</string>
10-
<string id="32100">Options</string>
11-
<string id="32110">Number of Days to Cache</string>
12-
<string id="32120">Channel Name First (before channel number)</string>
13-
<string id="32130">Download Channel Icons</string>
14-
<string id="32140">Include All Channels (not just favorites)</string>
15-
<string id="32170">Append Extra Details to Program Description</string>
16-
<string id="32149">Each Item Below Will Add an Additional Download per Program</string>
17-
<string id="32150">Download Program Icons</string>
18-
<string id="32160">Download Extra Program Details</string>
19-
<string id="32169">Add Delay If Extra Downloads Cause Failure</string>
20-
<string id="32180">Delay Between http Requests</string>
21-
<string id="32200">Extra Details Order</string>
22-
<string id="32201">Extra Details Will Be Appended to Program Description in the Order Set Below</string>
23-
<string id="32202">Seperator</string>
24-
<string id="32210">1</string>
25-
<string id="32211">2</string>
26-
<string id="32212">3</string>
27-
<string id="32213">4</string>
28-
<string id="32214">5</string>
29-
<string id="32215">6</string>
30-
<string id="32216">7</string>
31-
<string id="32217">8</string>
32-
<string id="32218">9</string>
33-
<string id="32219">10</string>
34-
<string id="32220">11</string>
35-
<string id="32221">12</string>
36-
<string id="32222">13</string>
37-
<string id="32223">14</string>
38-
<string id="32224">15</string>
39-
<string id="32225">16</string>
40-
<string id="32226">17</string>
41-
<string id="32227">18</string>
42-
<string id="32228">19</string>
43-
<string id="32229">20</string>
44-
<string id="32300">None</string>
45-
<string id="32301">BULLET</string>
46-
<string id="32302">HYPHEN</string>
47-
<string id="32303">Plot Description</string>
48-
<string id="32304">New/Live Indicator</string>
49-
<string id="32305">HD Indicator</string>
50-
<string id="32306">CC Indicator</string>
51-
<string id="32307">Season/Episode Number</string>
52-
<string id="32308">TV Rating</string>
53-
<string id="32309">Original Air Date</string>
54-
<string id="32310">Program Title</string>
55-
<string id="32311">Episode Title</string>
56-
<string id="32312">Episode Title in Quotes</string>
57-
<string id="32313">Cast</string>
58-
<string id="32314">Movie Release Year</string>
59-
<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>
65-
</strings>
1+
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2+
<strings>
3+
<!--zap2xml-->
4+
<string id="32000">User Information</string>
5+
<string id="32030">EPG Source</string>
6+
<string id="32031">Zap2It</string>
7+
<string id="32032">TV Guide</string>
8+
<string id="32010">Username</string>
9+
<string id="32020">Password</string>
10+
<string id="32100">Options</string>
11+
<string id="32110">Number of Days to Cache</string>
12+
<string id="32120">Channel Name First (before channel number)</string>
13+
<string id="32130">Download Channel Icons</string>
14+
<string id="32140">Include All Channels (not just favorites)</string>
15+
<string id="32170">Append Extra Details to Program Description</string>
16+
<string id="32149">Each Item Below Will Add an Additional Download per Program</string>
17+
<string id="32150">Download Program Icons</string>
18+
<string id="32160">Download Extra Program Details</string>
19+
<string id="32169">Add Delay If Extra Downloads Cause Failure</string>
20+
<string id="32180">Delay Between http Requests</string>
21+
<string id="32200">Extra Details Order</string>
22+
<string id="32201">Extra Details Will Be Appended to Program Description in the Order Set Below</string>
23+
<string id="32202">Seperator</string>
24+
<string id="32210">1</string>
25+
<string id="32211">2</string>
26+
<string id="32212">3</string>
27+
<string id="32213">4</string>
28+
<string id="32214">5</string>
29+
<string id="32215">6</string>
30+
<string id="32216">7</string>
31+
<string id="32217">8</string>
32+
<string id="32218">9</string>
33+
<string id="32219">10</string>
34+
<string id="32220">11</string>
35+
<string id="32221">12</string>
36+
<string id="32222">13</string>
37+
<string id="32223">14</string>
38+
<string id="32224">15</string>
39+
<string id="32225">16</string>
40+
<string id="32226">17</string>
41+
<string id="32227">18</string>
42+
<string id="32228">19</string>
43+
<string id="32229">20</string>
44+
<string id="32300">None</string>
45+
<string id="32301">BULLET</string>
46+
<string id="32302">HYPHEN</string>
47+
<string id="32303">Plot Description</string>
48+
<string id="32304">New/Live Indicator</string>
49+
<string id="32305">HD Indicator</string>
50+
<string id="32306">CC Indicator</string>
51+
<string id="32307">Season/Episode Number</string>
52+
<string id="32308">TV Rating</string>
53+
<string id="32309">Original Air Date</string>
54+
<string id="32310">Program Title</string>
55+
<string id="32311">Episode Title</string>
56+
<string id="32312">Episode Title in Quotes</string>
57+
<string id="32313">Cast</string>
58+
<string id="32314">Movie Release Year</string>
59+
<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>
65+
</strings>

0 commit comments

Comments
 (0)