The branch, eden has been updated
via 8b20e73fad7fbcd6a524fbe87f269d75db539597 (commit)
from 2da255ea2d757aa6adc2aea6414a264b27419f38 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=8b20e73fad7fbcd6a524fbe87f269d75db539597
commit 8b20e73fad7fbcd6a524fbe87f269d75db539597
Author: olympia <[email protected]>
Date: Tue Jul 31 22:12:59 2012 +0200
[metadata.universal] updated to version 1.3.0
diff --git a/metadata.common.themoviedb.org/addon.xml
b/metadata.common.themoviedb.org/addon.xml
index 4fd4f33..b52822d 100644
--- a/metadata.common.themoviedb.org/addon.xml
+++ b/metadata.common.themoviedb.org/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.themoviedb.org"
name="The MovieDB common scraper functions"
- version="2.2.0"
+ version="2.3.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.themoviedb.org/tmdb.xml
b/metadata.common.themoviedb.org/tmdb.xml
index 9300a7c..97e702e 100644
--- a/metadata.common.themoviedb.org/tmdb.xml
+++ b/metadata.common.themoviedb.org/tmdb.xml
@@ -183,6 +183,14 @@
<expression noclean="1" />
</RegExp>
</GetTMDBGenresByIdChain>
+ <GetTMDBLangGenresByIdChain dest="4">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="4">
+ <RegExp input="$$1" output="<url
function="ParseTMDBGenres"
cache="tmdb-$INFO[tmdbgenreslanguage]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbgenreslanguage]</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBLangGenresByIdChain>
<ParseTMDBGenres dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="7">
diff --git a/metadata.universal/addon.xml b/metadata.universal/addon.xml
index 8586c85..3fe5fa5 100644
--- a/metadata.universal/addon.xml
+++ b/metadata.universal/addon.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.universal"
name="Universal Scraper"
- version="1.2.0"
+ version="1.3.0"
provider-name="Olympia, Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.themoviedb.org" version="2.1.4"/>
+ <import addon="metadata.common.themoviedb.org" version="2.3.0"/>
<import addon="metadata.common.movieposterdb.com" version="1.0.5"/>
<import addon="metadata.common.imdb.com" version="2.2.3"/>
<import addon="metadata.common.impa.com" version="1.0.3"/>
diff --git a/metadata.universal/changelog.txt b/metadata.universal/changelog.txt
index 9b23487..a2d9bdd 100644
--- a/metadata.universal/changelog.txt
+++ b/metadata.universal/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.3.0[/B]
+- added: option to select genre language when screping from TMDb
+
[B]1.2.0[/B]
- added: option to scrape rating from MetaCritic (via IMDb)
diff --git a/metadata.universal/resources/language/English/strings.xml
b/metadata.universal/resources/language/English/strings.xml
index 63aa683..400fc60 100644
--- a/metadata.universal/resources/language/English/strings.xml
+++ b/metadata.universal/resources/language/English/strings.xml
@@ -10,7 +10,7 @@
<string id="30009">Enable trailers from themoviedb.org</string>
<string id="30011">Artwork</string>
<string id="30012">Trailers</string>
- <string id="30013">Get Set Titles from themoviedb.org</string>
+ <string id="30013">Get Set (Collection) Titles from themoviedb.org</string>
<string id="30014">Get Plot from</string>
<string id="30015">Get Cast / Directors / Writers From</string>
<string id="30016">Plot Sources</string>
@@ -33,6 +33,7 @@
<string id="30037">Enable posters from trakt.tv</string>
<string id="30038">Enable fanart from trakt.tv</string>
<string id="30039">Enable trailers from trakt.tv</string>
+ <string id="30040"> Genre Language</string>
<string id="30100">Rating</string>
<string id="30021">Get Ratings from</string>
diff --git a/metadata.universal/resources/settings.xml
b/metadata.universal/resources/settings.xml
index f12ef26..80e1fc0 100644
--- a/metadata.universal/resources/settings.xml
+++ b/metadata.universal/resources/settings.xml
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
<category label="128">
- <setting label="30024" type="lsep"/>
+ <setting type="sep"/>
<setting label="30023" type="labelenum" values="IMDb|themoviedb.org"
id="titlesource" default="IMDb"/>
<setting label="30008" type="labelenum" values="Keep Original|USA /
International|Argentina|Austria|Belgium|Brazil|Bulgaria|Canada|China|Colombia|Chile|Croatia|Czech
Republic|Denmark|Finland|France|Germany|Greece|Hong
Kong|Hungary|Iceland|India|Israel|Italy|Japan|Mexico|Netherlands|Norway|Pakistan|Poland|Portugal|Romania|Russia|Serbia|Singapore|Slovenia|Spain|Sweden|Switzerland|Thailand|Turkey|Uruguay|Venezuela"
id="imdbakatitles" default="Keep Original" visible="eq(-1,0)"/>
<setting label="30027" type="labelenum"
values="cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbtitlelanguage" default="en" visible="eq(-2,1)"/>
- <setting type="lsep" label="30016"/>
+ <setting type="sep"/>
<setting label="30014" type="labelenum"
values="IMDb|themoviedb.org|Rotten Tomatoes|trakt.tv|OFDb.de" id="plotsource"
default="IMDb"/>
<setting label="30020" type="labelenum"
values="cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbplotlanguage" default="en" visible="eq(-1,1)"/>
- <setting label="30025" type="lsep"/>
+ <setting type="sep"/>
<setting label="30015" type="labelenum"
values="IMDb|IMDbFull|themoviedb.org" id="creditssource" default="IMDb"/>
- <setting label="30026" type="lsep"/>
+ <setting type="sep"/>
<setting label="30022" type="labelenum"
values="IMDb|themoviedb.org|trakt.tv" id="genressource" default="IMDb"/>
- <setting label="30029" type="lsep"/>
+ <setting label="30040" type="labelenum"
values="cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbgenreslanguage" default="en" visible="eq(-1,1)"/>
+ <setting type="sep"/>
<setting label="30013" type="bool" id="tmdbset" default="true"/>
</category>
diff --git a/metadata.universal/universal.xml b/metadata.universal/universal.xml
index 9b1e62c..9dc8b02 100644
--- a/metadata.universal/universal.xml
+++ b/metadata.universal/universal.xml
@@ -89,7 +89,7 @@
<RegExp input="$INFO[genressource]" output="<chain
function="GetIMDBGenresById">$$2</chain>" dest="5+">
<expression>IMDb</expression>
</RegExp>
- <RegExp input="$INFO[genressource]" output="<chain
function="GetTMDBGenresByIdChain">$$2</chain>" dest="5+">
+ <RegExp input="$INFO[genressource]" output="<chain
function="GetTMDBLangGenresByIdChain">$$2</chain>" dest="5+">
<expression>themoviedb.org</expression>
</RegExp>
<RegExp input="$INFO[genressource]" output="<chain
function="GetTRAKTTVGenresByIdChain">$$2</chain>" dest="5+">
-----------------------------------------------------------------------
Summary of changes:
metadata.common.themoviedb.org/addon.xml | 2 +-
metadata.common.themoviedb.org/tmdb.xml | 8 ++++++++
metadata.universal/addon.xml | 4 ++--
metadata.universal/changelog.txt | 3 +++
.../resources/language/English/strings.xml | 3 ++-
metadata.universal/resources/settings.xml | 11 ++++++-----
metadata.universal/universal.xml | 2 +-
7 files changed, 23 insertions(+), 10 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
