The branch, dharma-pre has been updated
via 2daae95c9918a9547258d8b00104cc38fd1a6815 (commit)
from c4b278096f50569283d74d8108b17e27fb8d2c71 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=2daae95c9918a9547258d8b00104cc38fd1a6815
commit 2daae95c9918a9547258d8b00104cc38fd1a6815
Author: spiff <[email protected]>
Date: Fri Oct 29 11:33:29 2010 +0200
[plugin.games.xbmame] updated to version 1.0.1
diff --git a/plugin.games.xbmame/addon.xml b/plugin.games.xbmame/addon.xml
index 1530d95..52981c8 100644
--- a/plugin.games.xbmame/addon.xml
+++ b/plugin.games.xbmame/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.games.xbmame" name="XBMC MAME Frontend" version="1.0.0"
provider-name="Akira76">
+<addon id="plugin.games.xbmame" name="XBMC MAME Frontend" version="1.0.1"
provider-name="Akira76">
<requires>
<import addon="xbmc.python" version="1.0"/>
<import addon="script.module.pysqlite" version="2.5.6"/>
@@ -17,6 +17,8 @@
- Supports romset filtering on certain criteria.
- Supports Video and Dipswitch settings from XBMC.
- Includes a basic name search engine.
+
+ Please send comments and feature requests to [email protected]
</description>
</extension>
</addon>
diff --git a/plugin.games.xbmame/resources/lib/XBMame.py
b/plugin.games.xbmame/resources/lib/XBMame.py
index 781eb9a..56db918 100644
--- a/plugin.games.xbmame/resources/lib/XBMame.py
+++ b/plugin.games.xbmame/resources/lib/XBMame.py
@@ -300,7 +300,7 @@ class XBMame:
except KeyError:
switch.value = switch.values_by_value["No"]
else:
- switch.value=switch.values_by_value[XMLHelper().value]
+
switch.value=switch.values_by_value[XMLHelper().getAttribute(setting,
"setting", "value")]
switch.writeDB()
game.writeDB()
self._db.commit()
@@ -404,6 +404,9 @@ class XBMame:
xml = re.sub("\r|\t|\n|<rom.*?/>", "", xml)
progress.update(75, __language__(30604), __language__(30605),
__language__(30606))
if not progress.iscanceled():
+ files = {}
+ tmpfiles = os.listdir(self._MAME_ROM_PATH)
+ for file in tmpfiles:files[file.replace(".zip",
"").replace(".rar", "").replace(".7z","")] = 1
items = re.findall("(<game.*?>.*?</game>)", xml, re.M)
progress.close()
progress.create(__language__(30607))
@@ -413,11 +416,15 @@ class XBMame:
if progress.iscanceled(): break
index += 1
game = GameItem(self._db, xml=item)
+ try:
+ if files[str(game.romset)]:game.have = 1
+ except KeyError:
+ game.have = 0
game.writeDB()
progress.update(int((float(index)/float(count)) * 100),
__language__(30608), __language__(30609) % game.gamename, __language__(30610) %
(index, count))
self._db.commit()
progress.close()
- self._haveList()
+# self._haveList()
self._thumbNails()
def _haveList(self):
diff --git a/plugin.games.xbmame/resources/lib/obj/GameItem.py
b/plugin.games.xbmame/resources/lib/obj/GameItem.py
index 09e8c87..120b987 100644
--- a/plugin.games.xbmame/resources/lib/obj/GameItem.py
+++ b/plugin.games.xbmame/resources/lib/obj/GameItem.py
@@ -108,7 +108,7 @@ class GameItem(object):
def writeDB(self):
if not self.id:
romset_id = self._db.execute("INSERT INTO Games VALUES(null, ?, ?,
?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
- (self.romset, self.cloneof, self.romof, self.driver,
self.gamename, self.gamecomment, self.manufacturer, self.year, self.isbios,
self.hasdisk, self.isworking, self.emul, self.color, self.graphic, self.sound,
self.hasdips, 0, 0, 1, 1, 1, 0, 0, 0))
+ (self.romset, self.cloneof, self.romof, self.driver,
self.gamename, self.gamecomment, self.manufacturer, self.year, self.isbios,
self.hasdisk, self.isworking, self.emul, self.color, self.graphic, self.sound,
self.hasdips, 0, 0, 1, 1, 1, 0, self.have, 0))
for dipswitch in self.dipswitches:
dipswitch.writeDB(romset_id)
else:
-----------------------------------------------------------------------
Summary of changes:
plugin.games.xbmame/addon.xml | 4 +++-
plugin.games.xbmame/changelog.txt | 6 ++++++
plugin.games.xbmame/resources/lib/XBMame.py | 11 +++++++++--
plugin.games.xbmame/resources/lib/obj/GameItem.py | 2 +-
4 files changed, 19 insertions(+), 4 deletions(-)
create mode 100644 plugin.games.xbmame/changelog.txt
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons