The branch, dharma has been updated
via 8fd256e7e7eb4b100a79667383e4cd52b584f79a (commit)
via 74b2d115168583faa36bac9d31b2612abd37619e (commit)
from 86d7fc3abedb38ee32896964388734218cdc044f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=8fd256e7e7eb4b100a79667383e4cd52b584f79a
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=74b2d115168583faa36bac9d31b2612abd37619e
commit 74b2d115168583faa36bac9d31b2612abd37619e
Author: amet <[email protected]>
Date: Sun Apr 17 17:03:54 2011 +0400
[script.games.rom.collection.browser] -v 0.8.4
bugfix: Add Rom Collection does not increment ids greater than 10
diff --git a/script.games.rom.collection.browser/addon.xml
b/script.games.rom.collection.browser/addon.xml
index 8ad4b19..f93cd7c 100644
--- a/script.games.rom.collection.browser/addon.xml
+++ b/script.games.rom.collection.browser/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="script.games.rom.collection.browser"
- version="0.8.3"
+ version="0.8.4"
name="Rom Collection Browser"
provider-name="carabalb, jimyx17, malte">
<requires>
diff --git a/script.games.rom.collection.browser/changelog.txt
b/script.games.rom.collection.browser/changelog.txt
index 3cd489b..0d27f2b 100644
--- a/script.games.rom.collection.browser/changelog.txt
+++ b/script.games.rom.collection.browser/changelog.txt
@@ -1,3 +1,7 @@
+0.8.4 (04/2011)
+~~~~~~~~~~~~~
+General:
+ * bugfix: Add Rom Collection does not increment ids greater than 10
0.8.3 (04/2011)
~~~~~~~~~~~~~
diff --git a/script.games.rom.collection.browser/resources/lib/config.py
b/script.games.rom.collection.browser/resources/lib/config.py
index 8911ae0..3ad717f 100644
--- a/script.games.rom.collection.browser/resources/lib/config.py
+++ b/script.games.rom.collection.browser/resources/lib/config.py
@@ -239,6 +239,12 @@ class Config:
if(id == ''):
Logutil.log('Configuration error. RomCollection
%s must have an id' %romCollection.name, util.LOG_LEVEL_ERROR)
return None, 'Configuration error. See xbmc.log
for details'
+ try:
+ rc = romCollections[id]
+ Logutil.log('Error while adding RomCollection.
Make sure that the id is unique.', util.LOG_LEVEL_ERROR)
+ return None, 'Rom Collection ids are not unique'
+ except:
+ pass
romCollection.id = id
#romPath
@@ -367,11 +373,8 @@ class Config:
if(xboxCreateShortcutUseShortGamename != None):
romCollection.xboxCreateShortcutUseShortGamename =
xboxCreateShortcutUseShortGamename.text.upper() == 'TRUE'
- try:
- romCollections[id] = romCollection
- except:
- return None, 'Error while adding RomCollection.
Make sure that the id is unique'
-
+ romCollections[id] = romCollection
+
return romCollections, ''
diff --git a/script.games.rom.collection.browser/resources/lib/gui.py
b/script.games.rom.collection.browser/resources/lib/gui.py
index 2560ea3..4042cb0 100644
--- a/script.games.rom.collection.browser/resources/lib/gui.py
+++ b/script.games.rom.collection.browser/resources/lib/gui.py
@@ -798,14 +798,15 @@ class UIGameDB(xbmcgui.WindowXML):
consoleList = sorted(config.consoleDict.keys())
id = 1
+ rcIds = self.config.romCollections.keys()
+ rcIds.sort()
#read existing rom collection ids and names
- for rcId in self.config.romCollections.keys():
-
+ for rcId in rcIds:
#remove already configured consoles from the list
if(self.config.romCollections[rcId].name in
consoleList):
consoleList.remove(self.config.romCollections[rcId].name)
#find highest id
- if(rcId > id):
+ if(int(rcId) > int(id)):
id = rcId
id = int(id) +1
-----------------------------------------------------------------------
Summary of changes:
script.games.rom.collection.browser/addon.xml | 2 +-
script.games.rom.collection.browser/changelog.txt | 4 +
.../resources/lib/config.py | 13 +-
.../resources/lib/gui.py | 7 +-
.../LICENSE.txt | 0
script.tvtunes/addon.xml | 28 +++
script.tvtunes/changelog.txt | 74 ++++++++
script.tvtunes/default.py | 35 ++++
script.tvtunes/icon.png | Bin 0 -> 197298 bytes
.../resources/language/English/strings.xml | 23 +++
.../resources/language/French/strings.xml | 23 +++
script.tvtunes/resources/settings.xml | 8 +
script.tvtunes/resources/tvtunes_backend.py | 129 +++++++++++++
script.tvtunes/resources/tvtunes_scraper.py | 192 ++++++++++++++++++++
14 files changed, 529 insertions(+), 9 deletions(-)
copy {script.audio.grooveshark => script.tvtunes}/LICENSE.txt (100%)
create mode 100644 script.tvtunes/addon.xml
create mode 100644 script.tvtunes/changelog.txt
create mode 100644 script.tvtunes/default.py
create mode 100644 script.tvtunes/icon.png
create mode 100644 script.tvtunes/resources/language/English/strings.xml
create mode 100644 script.tvtunes/resources/language/French/strings.xml
create mode 100644 script.tvtunes/resources/settings.xml
create mode 100644 script.tvtunes/resources/tvtunes_backend.py
create mode 100644 script.tvtunes/resources/tvtunes_scraper.py
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
