The branch, frodo has been updated
via a8fc3c42450f66dc2dd5c35f0579eb753b5c9de5 (commit)
via 7ae2ae04743c4934662f095f6dff46f493a6b660 (commit)
from fd1b6b4213871193f59f1ff5ed8a5d930da2413f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=a8fc3c42450f66dc2dd5c35f0579eb753b5c9de5
commit a8fc3c42450f66dc2dd5c35f0579eb753b5c9de5
Author: Martijn Kaijser <mcm.kaij...@gmail.com>
Date: Thu Aug 1 20:18:32 2013 +0200
[script.games.rom.collection.browser] 2.0.7
diff --git a/script.games.rom.collection.browser/addon.xml
b/script.games.rom.collection.browser/addon.xml
index 869f698..fb22af3 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="2.0.6"
+ version="2.0.7"
name="Rom Collection Browser"
provider-name="carabalb, jimyx17, malte, redkiller">
<requires>
@@ -9,7 +9,9 @@
<import addon="script.module.elementtree" version="1.2.7"/>
<import addon="service.rom.collection.browser" version="1.0.0"/>
</requires>
- <extension point="xbmc.python.script" library="default.py"/>
+ <extension point="xbmc.python.script" library="default.py">
+ <provides>game</provides>
+ </extension>
<extension point="xbmc.addon.metadata">
<summary lang="da">Importere, gennemse og starte spil i XBMC</summary>
<summary lang="de">Importiert, verwaltet und startet Spiele in
XBMC</summary>
diff --git a/script.games.rom.collection.browser/changelog.txt
b/script.games.rom.collection.browser/changelog.txt
index 3b58c63..f115332 100644
--- a/script.games.rom.collection.browser/changelog.txt
+++ b/script.games.rom.collection.browser/changelog.txt
@@ -1,3 +1,9 @@
+2.0.7 (06/2013)
+~~~~~~~~~~~~~
+Import Games:
+ * updated list of thegamesdb platforms
+ * bugfix: scraping games with (*) and [*] in name did not work in accurate
mode
+
2.0.6 (04/2013)
~~~~~~~~~~~~~
General:
diff --git a/script.games.rom.collection.browser/resources/lib/config.py
b/script.games.rom.collection.browser/resources/lib/config.py
index 5e426a6..62a1852 100644
--- a/script.games.rom.collection.browser/resources/lib/config.py
+++ b/script.games.rom.collection.browser/resources/lib/config.py
@@ -35,9 +35,9 @@ consoleDict = {
#name, mobygames-id, thegamesdb, archive vg
'Other' : ['0', '', ''],
'3DO' : ['35', '3DO', '3do'],
- 'Amiga' : ['19', '', 'amiga'],
+ 'Amiga' : ['19', 'Amiga', 'amiga'],
'Amiga CD32' : ['56', '', 'cd32'],
- 'Amstrad CPC' : ['60', '', 'cpc'],
+ 'Amstrad CPC' : ['60', 'Amstrad CPC', 'cpc'],
'Apple II' : ['31', '', 'appleii'],
'Atari 2600' : ['28', 'Atari 2600', 'atari2600'],
'Atari 5200' : ['33', 'Atari 5200', 'atari5200'],
@@ -50,7 +50,7 @@ consoleDict = {
'Channel F' : ['76', '', 'channelf'],
'ColecoVision' : ['29', 'Colecovision', 'colecovision'],
'Commodore 128' : ['61', '', ''],
- 'Commodore 64' : ['27', '', 'c64'],
+ 'Commodore 64' : ['27', 'Commodore 64', 'c64'],
'Commodore PET/CBM' : ['77', '', 'pet'],
'DoJa' : ['72', '', ''],
'DOS' : ['2', '', ''],
@@ -60,13 +60,13 @@ consoleDict = {
'ExEn' : ['70', '', ''],
'Game Boy' : ['10', 'Nintendo Gameboy', 'gameboy'],
'Game Boy Advance' : ['12', 'Nintendo Gameboy Advance',
'gba'],
- 'Game Boy Color' : ['11', '', 'gbc'],
+ 'Game Boy Color' : ['11', 'Nintendo Game Boy Color',
'gbc'],
'GameCube' : ['14', 'Nintendo GameCube', 'gamecube'],
'Game Gear' : ['25', 'Sega Game Gear', 'gamegear'],
'Genesis' : ['16', 'Sega Genesis', 'genesis'],
'Gizmondo' : ['55', '', 'gizmondo'],
'Intellivision' : ['30', 'Intellivision',
'intellivision'],
- 'Jaguar' : ['17', '', 'jaguar'],
+ 'Jaguar' : ['17', 'Atari Jaguar', 'jaguar'],
'Linux' : ['1', '', ''],
'Lynx' : ['18', '', 'lynx'],
'Macintosh' : ['74', 'Mac OS', ''],
@@ -105,7 +105,7 @@ consoleDict = {
'TurboGrafx CD' : ['45', '', ''],
'Vectrex' : ['37', '', 'vectrex'],
'VIC-20' : ['43', '', 'vic20'],
- 'Virtual Boy' : ['38', '', 'virtualboy'],
+ 'Virtual Boy' : ['38', 'Nintendo Virtual Boy',
'virtualboy'],
'V.Smile' : ['42', '', ''],
'Wii' : ['82', 'Nintendo Wii', ''],
'Windows' : ['3', 'PC', ''],
@@ -116,7 +116,7 @@ consoleDict = {
'Xbox 360' : ['69', 'Microsoft Xbox 360', ''],
'Zeebo' : ['88', '', ''],
'Zodiac' : ['68', '', 'zod'],
- 'ZX Spectr' : ['41', '', '']}
+ 'ZX Spectr' : ['41', 'Sinclair ZX Spectrum', '']}
missingFilterOptions = {util.localize(40057) : util.localize(40058),
util.localize(40059) :
util.localize(40060),
diff --git
a/script.games.rom.collection.browser/resources/lib/pyscraper/pyscraper.py
b/script.games.rom.collection.browser/resources/lib/pyscraper/pyscraper.py
index 5998aeb..b8e2326 100644
--- a/script.games.rom.collection.browser/resources/lib/pyscraper/pyscraper.py
+++ b/script.games.rom.collection.browser/resources/lib/pyscraper/pyscraper.py
@@ -40,13 +40,14 @@ class PyScraper:
scraperSource = nfoFile
- tempResults = self.parseDescriptionFile(scraper, scraperSource,
gamenameFromFile, foldername, filecrc)
+ tempResults = self.parseDescriptionFile(scraper, scraperSource,
gamenameFromFile, foldername, filecrc)
+ tempResults = self.getBestResults(tempResults,
gamenameFromFile, fuzzyFactor, updateOption, scraperSource, romCollection)
+
if(tempResults == None):
#try again without (*) and [*]
gamenameFromFile =
re.sub('\s\(.*\)|\s\[.*\]|\(.*\)|\[.*\]', '', gamenameFromFile)
tempResults = self.parseDescriptionFile(scraper,
scraperSource, gamenameFromFile, foldername, filecrc)
-
- tempResults = self.getBestResults(tempResults,
gamenameFromFile, fuzzyFactor, updateOption, scraperSource, romCollection)
+ tempResults = self.getBestResults(tempResults,
gamenameFromFile, fuzzyFactor, updateOption, scraperSource, romCollection)
if(tempResults == None):
if(scraper.returnUrl):
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=7ae2ae04743c4934662f095f6dff46f493a6b660
commit 7ae2ae04743c4934662f095f6dff46f493a6b660
Author: Martijn Kaijser <mcm.kaij...@gmail.com>
Date: Thu Aug 1 20:15:45 2013 +0200
[script.service.checkpreviousepisode] 0.3.0
diff --git a/script.service.checkpreviousepisode/addon.xml
b/script.service.checkpreviousepisode/addon.xml
index d4b028c..425a8dd 100644
--- a/script.service.checkpreviousepisode/addon.xml
+++ b/script.service.checkpreviousepisode/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.service.checkpreviousepisode" name="XBMC Check Previous
Episode" version="0.2.1" provider-name="Lucleonhart">
+<addon id="script.service.checkpreviousepisode" name="XBMC Check Previous
Episode" version="0.3.0" provider-name="Lucleonhart">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="xbmc.addon" version="12.0.0"/>
@@ -8,6 +8,7 @@
<extension point="xbmc.addon.metadata">
<summary>XBMC check previous episode state</summary>
<description lang="en">This scripts checks the previous episode from the
one you started to watch and warns you if it is missing from your library or
unwatched!</description>
+ <description lang="de">Dieses Script überprüft die vorige Episode der TV
Show die gerade gestartet werden soll und warnt falls diese noch nicht gesehen
wurde oder nicht vorhanden ist!</description>
<platform>all</platform>
<language></language>
diff --git a/script.service.checkpreviousepisode/changelog.txt
b/script.service.checkpreviousepisode/changelog.txt
index 4ae93cd..381ef23 100644
--- a/script.service.checkpreviousepisode/changelog.txt
+++ b/script.service.checkpreviousepisode/changelog.txt
@@ -1,3 +1,9 @@
+v0.3.0
+* Added option to show a "browse this show" dialog
+
+v0.2.1
+* Stupid bug fixed
+
v0.2.0
* Added transifex language support
diff --git a/script.service.checkpreviousepisode/default.py
b/script.service.checkpreviousepisode/default.py
index 922c532..2e8e1bf 100644
--- a/script.service.checkpreviousepisode/default.py
+++ b/script.service.checkpreviousepisode/default.py
@@ -18,6 +18,9 @@ g_jumpBackSecs = 0
def log(msg):
xbmc.log("### [%s] - %s" % (__scriptname__,msg,),level=xbmc.LOGDEBUG )
+def getSetting(setting):
+ return __addon__.getSetting(setting).strip()
+
#log( "[%s] - Version: %s Started" % (__scriptname__,__version__))
class MyPlayer( xbmc.Player ):
@@ -82,8 +85,16 @@ class MyPlayer( xbmc.Player ):
if(playon):
xbmc.Player().pause()
else:
+ if(getSetting("BrowseForShow").lower() ==
"true"):
+ browsenow =
xbmcgui.Dialog().yesno(__language__(32006), __language__(32007))
+ else:
+ browsenow = False
+
xbmc.Player().stop()
-
+ if browsenow:
+ command='{"jsonrpc": "2.0", "method":
"GUI.ActivateWindow", "params": { "window": "videos", "parameters": [
"videodb://2/2/%d/%d" ] }, "id": 1}' % (playingTvshowid, playingSeason)
+ result = xbmc.executeJSONRPC( command )
+ result = unicode(result, 'utf-8',
errors='ignore')
player_monitor = MyPlayer()
while not xbmc.abortRequested:
diff --git
a/script.service.checkpreviousepisode/resources/language/English/strings.po
b/script.service.checkpreviousepisode/resources/language/English/strings.po
index b9cc353..ea85053 100644
--- a/script.service.checkpreviousepisode/resources/language/English/strings.po
+++ b/script.service.checkpreviousepisode/resources/language/English/strings.po
@@ -35,3 +35,15 @@ msgstr ""
msgctxt "#32005"
msgid "You have not watched the previous episode!"
msgstr ""
+
+msgctxt "#32006"
+msgid "Browse show"
+msgstr ""
+
+msgctxt "#32007"
+msgid "Would you like to browse the episodes of this show?"
+msgstr ""
+
+msgctxt "#32008"
+msgid "Show Option to browse the show"
+msgstr ""
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
script.games.rom.collection.browser/addon.xml | 6 ++-
script.games.rom.collection.browser/changelog.txt | 6 ++
.../resources/lib/config.py | 14 +++---
.../resources/lib/pyscraper/pyscraper.py | 7 ++-
script.service.checkpreviousepisode/addon.xml | 3 +-
script.service.checkpreviousepisode/changelog.txt | 6 ++
script.service.checkpreviousepisode/default.py | 13 +++++-
.../resources/language/English/strings.po | 12 +++++
.../resources/language/German/strings.po | 49 ++++++++++++++++++++
.../resources/settings.xml | 4 ++
10 files changed, 106 insertions(+), 14 deletions(-)
create mode 100644
script.service.checkpreviousepisode/resources/language/German/strings.po
create mode 100644 script.service.checkpreviousepisode/resources/settings.xml
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
