elie/xbmcbackup
1
0
Fork 0
mirror of https://github.com/robweber/xbmcbackup.git synced 2025-04-20 17:16:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into gotham-dev

Browse Source 
Conflicts:
	addon.xml
	changelog.txt
	resources/lib/utils.py
This commit is contained in:
Rob Weber 2014-01-23 12:53:30 -06:00
commit 775a5aeda2
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changelog.txt
View File

@ -2,12 +2,16 @@ Version 0.5.1
updated for new Gotham xbmc python updates updated for new Gotham xbmc python updates
added version info to logs
Version 0.5.0 Version 0.5.0
New Version for Gotham New Version for Gotham
Version 0.4.5
added version info to logs
added try/catch for unicode errors
Version 0.4.4 Version 0.4.4
modified the check for invalid file types modified the check for invalid file types

11
resources/lib/utils.py
View File

@ -15,7 +15,7 @@ def openSettings():
__Addon.openSettings() __Addon.openSettings()
def log(message,loglevel=xbmc.LOGNOTICE): def log(message,loglevel=xbmc.LOGNOTICE):
xbmc.log(encode(__addon_id__ + "-" + __Addon.getAddonInfo('version') + ": " + message),level=loglevel) xbmc.log(encode(__addon_id__ + "-" + __Addon.getAddonInfo('version') + ": " + message),level=loglevel)
def showNotification(message): def showNotification(message):
xbmcgui.Dialog().notification(encode(getString(30010)),encode(message),time=4000,icon=xbmc.translatePath(__Addon.getAddonInfo('path') + "/icon.png")) xbmcgui.Dialog().notification(encode(getString(30010)),encode(message),time=4000,icon=xbmc.translatePath(__Addon.getAddonInfo('path') + "/icon.png"))
@ -30,4 +30,11 @@ def getString(string_id):
return __Addon.getLocalizedString(string_id) return __Addon.getLocalizedString(string_id)
def encode(string): def encode(string):
return string.encode('UTF-8','replace') result = ''
try:
result = string.encode('UTF-8','replace')
except UnicodeDecodeError:
result = 'Unicode Error'
return result