The branch, eden has been updated
via c23ade3f214c16c0204487c93d9915a658ff8082 (commit)
from f0880aef55cdfe68c8f10ff96bfc3e6132b542ea (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=c23ade3f214c16c0204487c93d9915a658ff8082
commit c23ade3f214c16c0204487c93d9915a658ff8082
Author: ronie <[email protected]>
Date: Tue Mar 27 21:57:36 2012 +0200
[script.rss.editor] -v2.0.2
fix encoding issues
diff --git a/script.rss.editor/addon.xml b/script.rss.editor/addon.xml
old mode 100755
new mode 100644
index 4d70c94..d84200c
--- a/script.rss.editor/addon.xml
+++ b/script.rss.editor/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.rss.editor"
name="RSS Editor"
- version="2.0.0"
+ version="2.0.2"
provider-name="rwparris2">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/script.rss.editor/changelog.txt b/script.rss.editor/changelog.txt
index 2f3b705..cad0ded 100644
--- a/script.rss.editor/changelog.txt
+++ b/script.rss.editor/changelog.txt
@@ -1,3 +1,8 @@
-2.0.0
+2.0.2
+- fix encoding issues when writing to log
+
+2.0.1
+- fix encoding issues when opening files
-- eden compatible version
\ No newline at end of file
+2.0.0
+- eden compatible version
diff --git a/script.rss.editor/default.py b/script.rss.editor/default.py
index de62087..c9070d3 100644
--- a/script.rss.editor/default.py
+++ b/script.rss.editor/default.py
@@ -1,19 +1,16 @@
-import sys
-import os
-import xbmc
-import xbmcaddon
+import sys, os
+import xbmc, xbmcaddon
# Script constants
-__scriptname__ = "RSS Editor"
-__author__ = "rwparris2"
-__url__ = "http://code.google.com/p/xbmc-addons/";
-__credits__ = "Team XBMC"
-__settings__ = xbmcaddon.Addon(id='script.rss.editor')
-__version__ = __settings__.getAddonInfo('version')
-__language__ = __settings__.getLocalizedString
-__cwd__ = __settings__.getAddonInfo('path')
+__addon__ = xbmcaddon.Addon()
+__version__ = __addon__.getAddonInfo('version')
+__language__ = __addon__.getLocalizedString
+__cwd__ = __addon__.getAddonInfo('path')
-print "[SCRIPT] '%s: version %s' initialized!" % (__scriptname__, __version__,
)
+def log(txt):
+ xbmc.log(msg=txt, level=xbmc.LOGDEBUG)
+
+log("[SCRIPT] '%s: version %s' initialized!" % (__addon__, __version__, ))
if (__name__ == "__main__"):
import resources.lib.rssEditor as rssEditor
diff --git a/script.rss.editor/resources/lib/rssEditor.py
b/script.rss.editor/resources/lib/rssEditor.py
index 8690fc2..627779b 100644
--- a/script.rss.editor/resources/lib/rssEditor.py
+++ b/script.rss.editor/resources/lib/rssEditor.py
@@ -1,6 +1,5 @@
-import xbmc
-import xbmcgui
import os, sys
+import xbmc, xbmcgui
from xmlParser import XMLParser
#enable localization
diff --git a/script.rss.editor/resources/lib/setEditor.py
b/script.rss.editor/resources/lib/setEditor.py
index 2249036..25afa1a 100644
--- a/script.rss.editor/resources/lib/setEditor.py
+++ b/script.rss.editor/resources/lib/setEditor.py
@@ -1,13 +1,11 @@
-import xbmc
-import xbmcgui
import os, sys
+import xbmc, xbmcgui
from xmlParser import XMLParser
#enable localization
getLS = sys.modules[ "__main__" ].__language__
__cwd__ = sys.modules[ "__main__" ].__cwd__
-
class GUI(xbmcgui.WindowXMLDialog):
def __init__(self, *args, **kwargs):
diff --git a/script.rss.editor/resources/lib/xmlParser.py
b/script.rss.editor/resources/lib/xmlParser.py
index 11150bf..891d530 100644
--- a/script.rss.editor/resources/lib/xmlParser.py
+++ b/script.rss.editor/resources/lib/xmlParser.py
@@ -1,13 +1,9 @@
-import os, sys
+import os, sys, unicodedata
from xml.dom.minidom import parse, Document, _write_data, Node, Element
-import xbmcaddon
-
-try:
- import xbmc
- import xbmcgui
-except:
- xbmc = None
+import xbmc, xbmcaddon, xbmcgui
+def log(txt):
+ xbmc.log(msg=txt, level=xbmc.LOGDEBUG)
def writexml(self, writer, indent="", addindent="", newl=""):
#credit:
http://ronrothman.com/public/leftbraned/xml-dom-minidom-toprettyxml-and-silly-whitespace/
@@ -43,7 +39,7 @@ class XMLParser:
def __init__(self):
if xbmc:
- self.RssFeedsPath =
xbmc.translatePath('special://userdata/RssFeeds.xml')
+ self.RssFeedsPath =
xbmc.translatePath('special://userdata/RssFeeds.xml').decode("utf-8")
else:
self.RssFeedsPath = r'C:\Documents and Settings\Xerox\Application
Data\XBMC\userdata\RssFeeds.xml'
sane = self.checkRssFeedPathSanity()
@@ -51,10 +47,10 @@ class XMLParser:
try:
self.feedsTree = parse(self.RssFeedsPath)
except:
- print '[script] RSS Editor --> Failed to parse ' +
self.RssFeedsPath
+ log('[script] RSS Editor --> Failed to parse ' +
unicodedata.normalize( 'NFKD', self.RssFeedsPath ).encode( 'ascii', 'ignore' ))
regen = xbmcgui.Dialog().yesno(getLS(40), getLS(51),
getLS(52), getLS(53))
if regen:
- print '[script] RSS Editor --> Attempting to Regenerate
RssFeeds.xml'
+ log('[script] RSS Editor --> Attempting to Regenerate
RssFeeds.xml')
xml = '<?xml version="1.0" encoding="UTF-8"
standalone="yes"?>\n<rssfeeds>\n\
<!-- RSS feeds. To have multiple feeds, just add a feed to
the set. You can also have multiple sets. !-->\n\
<!-- To use different sets in your skin, each must be
called from skin with a unique id. !-->\n\
@@ -64,14 +60,13 @@ class XMLParser:
f.close()
self.__init__()
else:
- print '[script] RSS Editor --> User opted to not
regenerate RssFeeds.xml. Script Exiting'
+ log('[script] RSS Editor --> User opted to not regenerate
RssFeeds.xml. Script Exiting')
self.feedsTree = False
if self.feedsTree:
self.feedsList = self.getCurrentRssFeeds()
else:
self.feedsList = False
- print '[SCRIPT] RSS Editor --> Could not open ' +
self.RssFeedsPath +'. Either the file does not exist, or its\
- size is zero.'
+ log('[SCRIPT] RSS Editor --> Could not open ' +
unicodedata.normalize( 'NFKD', self.RssFeedsPath ).encode( 'ascii', 'ignore' )
+'. Either the file does not exist, or its size is zero.')
def checkRssFeedPathSanity(self):
if os.path.isfile(self.RssFeedsPath):
@@ -125,7 +120,7 @@ class XMLParser:
return doc.toprettyxml(indent = ' ', encoding = 'UTF-8')
def writeXmlToFile(self):
- print '[SCRIPT] RSS Editor --> writing to %s' % (self.RssFeedsPath)
+ log('[SCRIPT] RSS Editor --> writing to %s' % (unicodedata.normalize(
'NFKD', self.RssFeedsPath ).encode( 'ascii', 'ignore' )))
xml = self.formXml()
#hack for standalone attribute, minidom doesn't support DOM3
xmlHeaderEnd = xml.find('?>')
@@ -134,14 +129,14 @@ class XMLParser:
RssFeedsFile = open(self.RssFeedsPath, 'w')
RssFeedsFile.write(xml)
RssFeedsFile.close()
- print '[SCRIPT] RSS Editor --> write success'
+ log('[SCRIPT] RSS Editor --> write success')
self.refreshFeed()
except IOError, error:
- print '[SCRIPT] RSS Editor --> write failed', error
+ log('[SCRIPT] RSS Editor --> write failed', error)
def refreshFeed(self):
"""Refresh XBMC's rss feed so changes can be seen immediately"""
if xbmc:
xbmc.executebuiltin('refreshrss()')
else:
- print 'kthx'
+ log('kthx')
-----------------------------------------------------------------------
Summary of changes:
script.rss.editor/addon.xml | 2 +-
script.rss.editor/changelog.txt | 9 ++++++-
script.rss.editor/default.py | 23 ++++++++-----------
script.rss.editor/resources/lib/rssEditor.py | 3 +-
script.rss.editor/resources/lib/setEditor.py | 4 +--
script.rss.editor/resources/lib/xmlParser.py | 31 +++++++++++---------------
6 files changed, 33 insertions(+), 39 deletions(-)
mode change 100755 => 100644 script.rss.editor/addon.xml
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
