The branch, eden has been updated
via 52b99b3efb655a9ef1000f4a7262c379f34501ea (commit)
from 57cefd4bce06c419060308424cac88aba27298c0 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=52b99b3efb655a9ef1000f4a7262c379f34501ea
commit 52b99b3efb655a9ef1000f4a7262c379f34501ea
Author: beenje <bee...@xbmc.org>
Date: Tue Aug 7 22:14:39 2012 +0200
[plugin.video.eyetv.parser] updated to version 2.1.2
diff --git a/plugin.video.eyetv.parser/addon.xml
b/plugin.video.eyetv.parser/addon.xml
index 7368512..dced9eb 100644
--- a/plugin.video.eyetv.parser/addon.xml
+++ b/plugin.video.eyetv.parser/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.eyetv.parser"
name="EyeTV parser"
- version="2.1.1"
+ version="2.1.2"
provider-name="beenje">
<requires>
<import addon="xbmc.python" version="2.0"/>
@@ -17,5 +17,6 @@
<description lang="en">EyeTV parser is a video addon that let you watch
live TV and browse all the recordings from your EyeTV Library. Recordings are
listed with their description and icon (if any).</description>
<disclaimer lang="en">EyeTV is a registered trademark of Elgato Systems
GmbH</disclaimer>
<platform>all</platform>
+ <language></language>
</extension>
</addon>
diff --git a/plugin.video.eyetv.parser/changelog.txt
b/plugin.video.eyetv.parser/changelog.txt
index bfe5ab4..6d5f977 100644
--- a/plugin.video.eyetv.parser/changelog.txt
+++ b/plugin.video.eyetv.parser/changelog.txt
@@ -1,3 +1,10 @@
+[B]Version 2.1.2[/B]
+
+- Changed server setting type from ipaddress to text
+- Added language tag
+- Added cleaning of xml file (to remove illegal characters)
+- Remove "writeable" option on archive path
+
[B]Version 2.1.1[/B]
- Added birate setting for live TV
diff --git a/plugin.video.eyetv.parser/resources/lib/eyetv_live.py
b/plugin.video.eyetv.parser/resources/lib/eyetv_live.py
index f119f48..a64fe44 100644
--- a/plugin.video.eyetv.parser/resources/lib/eyetv_live.py
+++ b/plugin.video.eyetv.parser/resources/lib/eyetv_live.py
@@ -81,6 +81,8 @@ class EyetvLive:
data = gzipper.read()
else:
data = f.read()
+ xbmc.log(full_url, xbmc.LOGDEBUG)
+ xbmc.log(str(data), xbmc.LOGDEBUG)
if f.headers.get('Content-Type') == 'application/json':
return json.loads(data)
else:
diff --git a/plugin.video.eyetv.parser/resources/lib/eyetv_parser.py
b/plugin.video.eyetv.parser/resources/lib/eyetv_parser.py
index 2331907..284c926 100644
--- a/plugin.video.eyetv.parser/resources/lib/eyetv_parser.py
+++ b/plugin.video.eyetv.parser/resources/lib/eyetv_parser.py
@@ -39,6 +39,15 @@ SORTKEYS = ('Date Recorded', 'Date Recorded', 'Display
Title')
# 2 : title
+def clean_xml(filename):
+ """Remove illegal characters from XML file"""
+ illegal_re = re.compile('\x00')
+ xml = open(filename).read()
+ clean = illegal_re.sub('', xml)
+ f = open(filename, 'wt')
+ f.write(clean)
+ f.close()
+
class Plist:
"""Simple class to read Apple's plist format
@@ -85,6 +94,7 @@ class Eyetv:
archiveXml = os.path.join(self.archivePath, u'EyeTV Archive.xml')
localXml = xbmc.translatePath('special://temp/EyeTVArchive.xml')
copyfile(archiveXml, localXml)
+ clean_xml(localXml)
plist = Plist().load(localXml)
# Remove temporary file
os.remove(localXml)
diff --git a/plugin.video.eyetv.parser/resources/settings.xml
b/plugin.video.eyetv.parser/resources/settings.xml
index a5bf5ca..f4e93f5 100644
--- a/plugin.video.eyetv.parser/resources/settings.xml
+++ b/plugin.video.eyetv.parser/resources/settings.xml
@@ -2,13 +2,13 @@
<settings>
<!--Live TV-->
<category label="30020">
- <setting id="server" type="ipaddress" default="127.0.0.1"
label="30002" />
+ <setting id="server" type="text" default="localhost" label="30002" />
<setting id="bitrate" type="enum"
lvalues="30015|30016|30017|30018|30019" default="4" label="30014" />
<setting id="passwdEnabled" type="bool" default="false" label="30003"
/>
<setting id="password" type="text" option="hidden" default=""
enable="eq(-1,true)" label="30004" />
</category>
<category label="30021">
- <setting id="archivePath" type="folder" source="auto" default=""
option="writeable" label="30001" />
+ <setting id="archivePath" type="folder" source="auto" default=""
label="30001" />
<setting id="sortMethod" type="enum" label="30010" default="0"
lvalues="30011|30012|30013" />
</category>
</settings>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.eyetv.parser/addon.xml | 3 ++-
plugin.video.eyetv.parser/changelog.txt | 7 +++++++
.../resources/lib/eyetv_live.py | 2 ++
.../resources/lib/eyetv_parser.py | 10 ++++++++++
plugin.video.eyetv.parser/resources/settings.xml | 4 ++--
5 files changed, 23 insertions(+), 3 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
