The branch, eden has been updated
via 21e7cc718d4f75fdcfaada4afa69c75299ad5e10 (commit)
from 2026042e79ed5fe22ceb85b0952ec27145ddab3b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=21e7cc718d4f75fdcfaada4afa69c75299ad5e10
commit 21e7cc718d4f75fdcfaada4afa69c75299ad5e10
Author: olympia <[email protected]>
Date: Sat May 19 13:42:06 2012 +0200
[metadata.universal] updated to version 1.1.0
[metadata.common.trakt.tv] added initial version
diff --git a/metadata.universal/addon.xml b/metadata.universal/addon.xml
index 4ea42e5..65bcf8b 100644
--- a/metadata.universal/addon.xml
+++ b/metadata.universal/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.universal"
name="Universal Scraper"
- version="1.0.5"
+ version="1.1.0"
provider-name="Olympia, Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -13,6 +13,7 @@
<import addon="metadata.common.youtubetrailers" version="1.0.4"/>
<import addon="metadata.common.rt.com" version="1.3.0"/>
<import addon="metadata.common.ofdb.de" version="1.0.0"/>
+ <import addon="metadata.common.trakt.tv" version="1.0.0"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="en"
diff --git a/metadata.universal/changelog.txt b/metadata.universal/changelog.txt
index 2a38e3e..fabcb15 100644
--- a/metadata.universal/changelog.txt
+++ b/metadata.universal/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.1.0[/B]
+- added: support for trakt.tv
+
[B]1.0.5[/B]
- added: some improvement to match movies by their International Titles
diff --git a/metadata.universal/resources/language/English/strings.xml
b/metadata.universal/resources/language/English/strings.xml
index 696b836..63aa683 100644
--- a/metadata.universal/resources/language/English/strings.xml
+++ b/metadata.universal/resources/language/English/strings.xml
@@ -30,6 +30,9 @@
<string id="30034"> Preferred Thumb Language</string>
<string id="30035">Certification Prefix</string>
<string id="30036">Enable posters from IMDb</string>
+ <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="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 1e1bbfd..e6ee5a1 100644
--- a/metadata.universal/resources/settings.xml
+++ b/metadata.universal/resources/settings.xml
@@ -6,24 +6,26 @@
<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="da|fi|nl|de|it|es|fr|pl|hu|el|tr|ru|he|ja|pt|zh|cs|sl|hr|ko|en|sv|no"
id="tmdbtitlelanguage" default="en" visible="eq(-2,1)"/>
<setting type="lsep" label="30016"/>
- <setting label="30014" type="labelenum"
values="IMDb|themoviedb.org|Rotten Tomatoes|OFDb.de" id="plotsource"
default="IMDb"/>
+ <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="da|fi|nl|de|it|es|fr|pl|hu|el|tr|ru|he|ja|pt|zh|cs|sl|hr|ko|en|sv|no"
id="tmdbplotlanguage" default="en" visible="eq(-1,1)"/>
<setting label="30025" type="lsep"/>
<setting label="30015" type="labelenum"
values="IMDb|IMDbFull|themoviedb.org" id="creditssource" default="IMDb"/>
<setting label="30026" type="lsep"/>
- <setting label="30022" type="labelenum" values="IMDb|themoviedb.org"
id="genressource" default="IMDb"/>
+ <setting label="30022" type="labelenum"
values="IMDb|themoviedb.org|trakt.tv" id="genressource" default="IMDb"/>
<setting label="30029" type="lsep"/>
<setting label="30013" type="bool" id="tmdbset" default="true"/>
</category>
<category label="30011">
<setting type="lsep" label="Poster Sources"/>
+ <setting label="30037" type="bool" id="trakttvposter" default="false"/>
<setting label="30002" type="bool" id="tmdbthumbs" default="true"/>
<setting label="30034" type="labelenum"
values="da|fi|nl|de|it|es|fr|pl|hu|el|tr|ru|he|ja|pt|zh|cs|sl|hr|ko|en|sv|no"
id="tmdbthumblanguage" default="en" enable="!eq(-1,false)"/>
<setting label="30003" type="bool" id="impawards" default="false"/>
<setting label="30004" type="bool" id="movieposterdb" default="false"/>
<setting label="30036" type="bool" id="imdbthumbs" default="false"/>
<setting type="lsep" label="Fanart Sources"/>
+ <setting label="30038" type="bool" id="trakttvfanart" default="false"/>
<setting label="30001" type="bool" id="fanart" default="true"/>
</category>
@@ -31,12 +33,13 @@
<setting label="30028" type="lsep"/>
<setting label="30006" type="labelenum" values="No|480p|720p|1080p"
id="TrailerQ" default="No"/>
<setting label="30009" type="bool" id="tmdbtrailer" default="true"/>
+ <setting label="30039" type="bool" id="trakttvtrailer" default="false"/>
<setting label="30005" type="bool" id="ytrailer" default="false"/>
</category>
<category label="30100">
<setting type="lsep" label="30030"/>
- <setting label="30021" type="labelenum" values="IMDb|Rotten
Tomatoes|themoviedb.org" id="mratingsource" default="IMDb"/>
+ <setting label="30021" type="labelenum" values="IMDb|Rotten
Tomatoes|themoviedb.org|trakt.tv" id="mratingsource" default="IMDb"/>
<setting label="30120" type="bool" id="rtoutline" default="false"
visible="eq(-1,1)"/>
<setting label="30110" type="labelenum" values="TomatoMeter|Average
Rating" id="tomato" default="TomatoMeter" visible="eq(-2,1)"/>
<setting label="30115" type="labelenum" values="All Critics|Top Critics"
id="allcritics" default="All Critics" visible="eq(-3,1)"/>
diff --git a/metadata.universal/universal.xml b/metadata.universal/universal.xml
index b19069e..a728b28 100644
--- a/metadata.universal/universal.xml
+++ b/metadata.universal/universal.xml
@@ -80,12 +80,18 @@
<RegExp input="$INFO[mratingsource]" output="<chain
function="GetTMDBRatingByIdChain">$$2</chain>" dest="5+">
<expression>themoviedb.org</expression>
</RegExp>
+ <RegExp input="$INFO[mratingsource]" output="<chain
function="GetTRAKTTVRatingByIdChain">$$2</chain>" dest="5+">
+ <expression>trakt.tv</expression>
+ </RegExp>
<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+">
<expression>themoviedb.org</expression>
</RegExp>
+ <RegExp input="$INFO[genressource]" output="<chain
function="GetTRAKTTVGenresByIdChain">$$2</chain>" dest="5+">
+ <expression>trakt.tv</expression>
+ </RegExp>
<RegExp input="$$1"
output="<country>\1</country>" dest="5+">
<expression
repeat="yes">"/country/[^>]+>([^<]+)</a></expression>
</RegExp>
@@ -110,6 +116,9 @@
<RegExp input="$INFO[plotsource]" output="<chain
function="GetOFDbPlotByIMDBId">$$2</chain>" dest="5+">
<expression>OFDb.de</expression>
</RegExp>
+ <RegExp input="$INFO[plotsource]" output="<chain
function="GetTRAKTTVPlotByIdChain">$$2</chain>" dest="5+">
+ <expression>trakt.tv</expression>
+ </RegExp>
<RegExp input="$INFO[creditssource]" output="<chain
function="GetIMDBCastById">$$2</chain>" dest="5+">
<expression>IMDb</expression>
</RegExp>
@@ -140,6 +149,9 @@
<RegExp conditional="tmdbset" input="$$2"
output="<chain
function="GetTMDBSetByIdChain">$$2</chain>" dest="5+">
<expression />
</RegExp>
+ <RegExp conditional="trakttvposter" input="$$2"
output="<chain
function="GetTRAKTTVThumbsByIdChain">$$2</chain>" dest="5+">
+ <expression/>
+ </RegExp>
<RegExp conditional="tmdbthumbs" input="$$2"
output="<chain
function="GetTMDBLangThumbsByIdChain">$$2</chain>" dest="5+">
<expression/>
</RegExp>
@@ -149,6 +161,9 @@
<RegExp conditional="movieposterdb" input="$$2"
output="<chain
function="GetMoviePosterDBThumbs">$$2</chain>" dest="5+">
<expression/>
</RegExp>
+ <RegExp conditional="trakttvfanart" input="$$2"
output="<chain
function="GetTRAKTTVFanartByIdChain">$$2</chain>" dest="5+">
+ <expression/>
+ </RegExp>
<RegExp conditional="fanart" input="$$2"
output="<chain
function="GetTMDBFanartByIdChain">$$2</chain>" dest="5+">
<expression/>
</RegExp>
@@ -164,6 +179,9 @@
<RegExp conditional="tmdbtrailer" input="$$2"
output="<chain
function="GetTMDBTrailerByIdChain">$$2</chain>" dest="5+">
<expression/>
</RegExp>
+ <RegExp conditional="trakttvtrailer" input="$$2"
output="<chain
function="GetTRAKTTVTrailerByIdChain">$$2</chain>" dest="5+">
+ <expression/>
+ </RegExp>
<RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet480p">$$6</chain>" dest="5+">
<RegExp input="$$1" output="\1" dest="6">
<expression><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
-----------------------------------------------------------------------
Summary of changes:
metadata.common.trakt.tv/addon.xml | 41 +++++++
metadata.common.trakt.tv/trakttv.xml | 120 ++++++++++++++++++++
metadata.universal/addon.xml | 3 +-
metadata.universal/changelog.txt | 3 +
.../resources/language/English/strings.xml | 3 +
metadata.universal/resources/settings.xml | 9 +-
metadata.universal/universal.xml | 18 +++
7 files changed, 193 insertions(+), 4 deletions(-)
create mode 100644 metadata.common.trakt.tv/addon.xml
create mode 100644 metadata.common.trakt.tv/trakttv.xml
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
