The branch, frodo has been updated
via 768ca0542b23c8a2655408d0d5fd123b1c796a8f (commit)
from 9ab8736b169c360227dff4383e804773ab1b4b9d (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=768ca0542b23c8a2655408d0d5fd123b1c796a8f
commit 768ca0542b23c8a2655408d0d5fd123b1c796a8f
Author: olympia <[email protected]>
Date: Fri Dec 21 12:07:31 2012 +0100
[metadata.universal] updated to version 2.1.0
diff --git a/metadata.universal/addon.xml b/metadata.universal/addon.xml
index 1ef4cb8..20d6ede 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="2.0.0"
+ version="2.1.0"
provider-name="Olympia, Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.themoviedb.org" version="2.4.0"/>
+ <import addon="metadata.common.themoviedb.org" version="2.9.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 40996f4..b694c69 100644
--- a/metadata.universal/changelog.txt
+++ b/metadata.universal/changelog.txt
@@ -1,3 +1,10 @@
+[B]2.1.0[/B]
+- changed: set en-us as default when searching on IMDb
+- added: option to set a secondary search language for IMDb search
+- added: ption to set language when scraping Collection Name
+- changed: revamp settings layout
+- fixed: won't scrape full cast
+
[B]2.0.0[/B]
- added: Option to Use IMDb Search Engine
diff --git a/metadata.universal/resources/language/English/strings.xml
b/metadata.universal/resources/language/English/strings.xml
index ccd9e47..5d347d7 100644
--- a/metadata.universal/resources/language/English/strings.xml
+++ b/metadata.universal/resources/language/English/strings.xml
@@ -8,9 +8,9 @@
<string id="30006">Enable trailers from HD-Trailers.net</string>
<string id="30008"> Preferred Title Language from</string>
<string id="30009">Enable trailers from themoviedb.org</string>
- <string id="30011">Artwork</string>
+ <string id="30011">Poster</string>
<string id="30012">Trailers</string>
- <string id="30013">Get Set (Collection) Titles from themoviedb.org</string>
+ <string id="30013">Get Set (Collection) Name 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>
@@ -39,21 +39,29 @@
<string id="30042">Get Tagline From</string>
<string id="30043"> Preferred Tagline Language</string>
<string id="30044">Get IMDb TOP250 Ranking</string>
- <string id="30045">Get Outline From IMDb</string>
+ <string id="30045">Get Outline From</string>
+ <string id="30046"> Preferred Set (Collection) Name Language</string>
+ <string id="30047">Poster Sources</string>
<string id="30100">Rating</string>
<string id="30021">Get Ratings from</string>
<string id="30110"> Rating Generated Using</string>
<string id="30115"> Use the Score Aggregated from</string>
- <string id="30120"> Use Critics' Consensus as Movie Outline</string>
<string id="30200">Credits</string>
<string id="30201">Get Studio from</string>
<string id="30202">Get Country from</string>
<string id="30300">Search</string>
- <string id="30301">IMDb</string>
- <string id="30302">themoviedb.org</string>
+ <string id="30301">themoviedb.org</string>
+ <string id="30302">IMDb</string>
<string id="30303">Search Engine to Use</string>
+ <string id="30304"> Secondary Search Language (In Addition to
en-us)</string>
+
+ <string id="30400">Plot</string>
+ <string id="30401">Plot / Tagline / Outline</string>
+
+ <string id="30500">Fanart</string>
+ <string id="30501">Fanart Sources</string>
</strings>
diff --git a/metadata.universal/resources/settings.xml
b/metadata.universal/resources/settings.xml
index e5808df..16e7405 100644
--- a/metadata.universal/resources/settings.xml
+++ b/metadata.universal/resources/settings.xml
@@ -6,18 +6,25 @@
<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="bg|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="sep"/>
+ <setting label="30022" type="labelenum"
values="IMDb|themoviedb.org|trakt.tv" id="genressource" default="IMDb"/>
+ <setting label="30040" type="labelenum"
values="bg|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"/>
+ <setting label="30046" type="labelenum"
values="bg|cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbsetlanguage" default="en" enable="!eq(-1,false)"/>
+ <setting type="sep"/>
+ </category>
+
+ <category label="30400">
+ <setting type="lsep" label="30401"/>
+ <setting type="sep"/>
<setting label="30014" type="labelenum"
values="IMDb|themoviedb.org|Rotten Tomatoes|trakt.tv|OFDb.de|port.hu"
id="plotsource" default="IMDb"/>
<setting label="30020" type="labelenum"
values="bg|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 type="sep"/>
<setting label="30042" type="labelenum" values="IMDb|themoviedb.org"
id="taglinesource" default="IMDb"/>
<setting label="30043" type="labelenum"
values="bg|cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbtaglinelanguage" default="en" visible="eq(-1,1)"/>
<setting type="sep"/>
- <setting label="30045" type="bool" id="imdboutline" default="true"/>
- <setting type="sep"/>
- <setting label="30022" type="labelenum"
values="IMDb|themoviedb.org|trakt.tv" id="genressource" default="IMDb"/>
- <setting label="30040" type="labelenum"
values="bg|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 label="30045" type="labelenum" values="IMDb|Rotten Tomatoes /
Critics' Consensus|None" id="outlinesource" default="IMDb"/>
<setting type="sep"/>
- <setting label="30013" type="bool" id="tmdbset" default="true"/>
</category>
<category label="30200">
@@ -27,48 +34,74 @@
<setting label="30201" type="labelenum" values="IMDb|themoviedb.org"
id="studiosource" default="IMDb"/>
<setting type="sep"/>
<setting label="30202" type="labelenum" values="IMDb|themoviedb.org"
id="countrysource" default="IMDb"/>
+ <setting type="sep"/>
</category>
<category label="30011">
- <setting type="lsep" label="Poster Sources"/>
+ <setting type="lsep" label="30047"/>
+ <setting type="sep"/>
<setting label="30037" type="bool" id="trakttvposter" default="false"/>
+ <setting type="sep"/>
<setting label="30002" type="bool" id="tmdbthumbs" default="true"/>
<setting label="30034" type="labelenum"
values="bg|cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbthumblanguage" default="en" enable="!eq(-1,false)"/>
+ <setting type="sep"/>
<setting label="30003" type="bool" id="impawards" default="false"/>
+ <setting type="sep"/>
<setting label="30004" type="bool" id="movieposterdb" default="false"/>
+ <setting type="sep"/>
<setting label="30036" type="bool" id="imdbthumbs" default="false"/>
- <setting type="lsep" label="Fanart Sources"/>
+ <setting type="sep"/>
+ </category>
+
+ <category label="30500">
+ <setting type="lsep" label="30501"/>
+ <setting type="sep"/>
<setting label="30038" type="bool" id="trakttvfanart" default="false"/>
+ <setting type="sep"/>
<setting label="30001" type="bool" id="fanart" default="true"/>
+ <setting type="sep"/>
</category>
<category label="30012">
<setting label="30028" type="lsep"/>
+ <setting type="sep"/>
<setting label="30006" type="labelenum" values="No|480p|720p|1080p"
id="TrailerQ" default="No"/>
+ <setting type="sep"/>
<setting label="30009" type="bool" id="tmdbtrailer" default="true"/>
<setting label="30041" type="labelenum"
values="bg|cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbtrailerlanguage" default="en" enable="!eq(-1,false)"/>
+ <setting type="sep"/>
<setting label="30039" type="bool" id="trakttvtrailer" default="false"/>
+ <setting type="sep"/>
<setting label="30005" type="bool" id="ytrailer" default="false"/>
+ <setting type="sep"/>
</category>
<category label="30100">
<setting type="lsep" label="30030"/>
+ <setting type="sep"/>
<setting label="30021" type="labelenum" values="IMDb|Rotten
Tomatoes|MetaCritic|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)"/>
+ <setting type="sep"/>
<setting label="30044" type="bool" id="imdbtop250" default="true"/>
+ <setting type="sep"/>
<setting type="lsep" label="30031"/>
<setting label="30032" type="labelenum" values="IMDb|themoviedb.org"
id="certificationssource" default="IMDb"/>
<setting label="30033" type="labelenum"
values="Argentina|Australia|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|UK|Uruguay|USA|Venezuela"
id="imdbcertcountry" default="USA" visible="eq(-1,0)"/>
<setting label="30033" type="labelenum"
values="au|bg|cs|da|de|el|es|fi|fr|gb|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|us|zh"
id="tmdbcertcountry" default="us" visible="eq(-2,1)"/>/>
+ <setting type="sep"/>
<setting label="30035" type="text" id="certprefix" default="Rated "/>
+ <setting type="sep"/>
</category>
<category label="30300">
<setting type="lsep" label="30303"/>
- <setting label="30301" type="bool" id="imdbsearch" default="true"
enable="!eq(1,true)"/>
- <setting label="30302" type="bool" id="tmdbsearch" default="false"
enable="!eq(-1,true)"/>
+ <setting type="sep"/>
+ <setting label="30301" type="bool" id="tmdbsearch" default="false"
enable="!eq(1,true)"/>
+ <setting type="sep"/>
+ <setting label="30302" type="bool" id="imdbsearch" default="true"
enable="!eq(-1,true)"/>
+ <setting label="30304" type="labelenum"
values="bg-bg|cs-cz|el-gr|es-ar|da-dk|de-at|de-de|fi-fi|fr-fr|hr-hr|he-il|hu-hu|it-it|ja-jp|nb-no|nl-nl|pl-pl|pt-pt|ro-ro|ru-ru|se-se|sl-si|sr-rs|th-th|tr-tr|None"
id="imdbsearchlanguage" default="None" visible="!eq(-1,false)"/>
+ <setting type="sep"/>
</category>
</settings>
diff --git a/metadata.universal/universal.xml b/metadata.universal/universal.xml
index d9b279a..7939514 100644
--- a/metadata.universal/universal.xml
+++ b/metadata.universal/universal.xml
@@ -8,29 +8,32 @@
<expression
noclean="1">imdb....?/title/tt([0-9]*)</expression>
</RegExp>
</NfoUrl>
- <CreateSearchUrl dest="3">
+ <CreateSearchUrl dest="3" clearbuffers="no"
SearchStringEncoding="iso-8859-1">
<RegExp conditional="tmdbsearch" input="$$1"
output="<url>http://api.themoviedb.org/3/search/movie?api_key=57983e31fb435df4df77afb854740ea9&amp;query=\1&amp;year=$$4</url>";
dest="3">
<RegExp input="$$2" output="\1" dest="4">
<expression clear="yes">(.+)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
- <RegExp conditional="imdbsearch" input="$$1"
output="<url>http://akas.imdb.com/find?q=\1&s=tt</url>";
dest="3">
+ <RegExp conditional="imdbsearch" input="$$1"
output="<url>http://akas.imdb.com/find?q=\1&s=tt|accept-language=en-us</url>"
dest="3">
<RegExp input="$$2" output="%20(\1)" dest="4">
<expression clear="yes">(.+)</expression>
</RegExp>
+ <RegExp input="$$1" output="\1" dest="9">
+ <expression clear="yes" noclean="1"/>
+ </RegExp>
<expression noclean="1"/>
</RegExp>
</CreateSearchUrl>
<GetSearchResults dest="8">
- <RegExp conditional="tmdbsearch" input="$$3"
output="<results>\1</results>" dest="8">
- <RegExp input="$$1"
output="<entity><title>\4</title><id>\1</id><year>\3</year><url
cache="tmdb-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9</url></entity>";
dest="3">
+ <RegExp conditional="tmdbsearch" input="$$5"
output="<results>\1</results>" dest="8">
+ <RegExp input="$$1"
output="<entity><title>\4</title><id>\1</id><year>\3</year><url
cache="tmdb-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9</url></entity>";
dest="5">
<expression
repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":"([0-9]+)-.*?"title":"([^"]*)</expression>
</RegExp>
- <RegExp input="$$1"
output="<entity><title>\2</title><id>\1</id><year>\3</year><url
cache="tmdb-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9</url></entity>";
dest="3+">
+ <RegExp input="$$1"
output="<entity><title>\2</title><id>\1</id><year>\3</year><url
cache="tmdb-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9</url></entity>";
dest="5+">
<expression
repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":"([0-9]+)-</expression>
</RegExp>
- <RegExp input="$$1"
output="<entity><title>\2</title><id>\1</id><url
cache="tmdb-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9</url></entity>";
dest="3+">
+ <RegExp input="$$1"
output="<entity><title>\2</title><id>\1</id><url
cache="tmdb-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9</url></entity>";
dest="5+">
<expression
repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":null</expression>
</RegExp>
<expression noclean="1" />
@@ -54,9 +57,23 @@
<RegExp input="$$4"
output="<entity><title>\4</title><year>\3</year><url
cache="\1-main.html">http://akas.imdb.com/title/\1/</url><id>\1</id></entity>";
dest="5+">
<expression repeat="yes"
noclean="1,2"><td\sclass="result_text">\s<a\shref="/title/([t0-9]*)/[^>]*>(?:&#x22;)?([^<]*?)(?:&#x22;)?</a>\s*(?:\([IV]+\)
)?\([^\(]*?([0-9]{4})[^\)]*\)\s<br/>aka\s<i>"([^"]*)</expression>
</RegExp>
+ <RegExp input="$INFO[imdbsearchlanguage]"
output="<url
function="GetAKASearchResults">http://akas.imdb.com/find?q=$$9&s=tt|accept-language=$INFO[imdbsearchlanguage]</url>"
dest="5+">
+
<expression>^(?:bg-bg|cs-cz|el-gr|es-ar|da-dk|de-at|de-de|fi-fi|fr-fr|hr-hr|he-il|hu-hu|it-it|ja-jp|nb-no|nl-nl|pl-pl|pt-pt|ro-ro|ru-ru|se-se|sl-si|sr-rs|th-th|tr-tr)$</expression>
+ </RegExp>
<expression clear="yes" noclean="1"/>
</RegExp>
</GetSearchResults>
+ <GetAKASearchResults dest="8">
+ <RegExp input="$$5" output="<?xml version="1.0"
encoding="iso-8859-1"
standalone="yes"?><results>\1</results>" dest="8">
+ <RegExp input="$$1" output="\1" dest="4">
+ <expression noclean="1"><table
class="findList"(.*?)</div</expression>
+ </RegExp>
+ <RegExp input="$$4"
output="<entity><title>\2</title><year>\3</year><url
cache="\1-main.html">http://akas.imdb.com/title/\1/</url><id>\1</id></entity>";
dest="5">
+ <expression repeat="yes"
noclean="1,2"><td\sclass="result_text">\s<a\shref="/title/([t0-9]*)/[^>]*>(?:&#x22;)?([^<]*?)(?:&#x22;)?</a>\s*(?:\([IV]+\)
)?\([^\(]*?([0-9]{4})[^\)]*\)\s(?:\(TV Movie\) )?<</expression>
+ </RegExp>
+ <expression clear="yes" noclean="1"/>
+ </RegExp>
+ </GetAKASearchResults>
<GetDetails dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
<RegExp conditional="imdbsearch" input="$$1"
output="<originaltitle>\2</originaltitle>" dest="19">
@@ -146,11 +163,11 @@
<RegExp input="$INFO[countrysource]" output="<chain
function="GetTMDBCountryByIdChain">$$2</chain>" dest="5+">
<expression>themoviedb.org</expression>
</RegExp>
- <RegExp conditional="imdboutline" input="$$2"
output="<chain function="GetIMDBOutlineById">$$2</chain>"
dest="5+">
- <expression/>
+ <RegExp input="$INFO[outlinesource]" output="<chain
function="GetIMDBOutlineById">$$2</chain>" dest="5+">
+ <expression>IMDb</expression>
</RegExp>
- <RegExp conditional="rtoutline" input="$$2"
output="<chain function="GetRTOutlineById">$$2</chain>"
dest="5+">
- <expression/>
+ <RegExp input="$INFO[outlinesource]" output="<chain
function="GetRTOutlineById">$$2</chain>" dest="5+">
+ <expression>Rotten Tomatoes / Critics'
Consensus</expression>
</RegExp>
<RegExp input="$INFO[plotsource]" output="<chain
function="GetIMDBPlotById">$$2</chain>" dest="5+">
<expression>IMDb</expression>
@@ -177,7 +194,7 @@
<expression>port.hu</expression>
</RegExp>
<RegExp input="$INFO[creditssource]" output="<chain
function="GetIMDBCastById">$$2</chain>" dest="5+">
- <expression>IMDb</expression>
+ <expression>^IMDb$</expression>
</RegExp>
<RegExp input="$INFO[creditssource]" output="<chain
function="GetIMDBFullCastById">$$2</chain>" dest="5+">
<expression>IMDbFull</expression>
@@ -186,7 +203,7 @@
<expression>themoviedb.org</expression>
</RegExp>
<RegExp input="$INFO[creditssource]" output="<chain
function="GetIMDBDirectorsById">$$2</chain>" dest="5+">
- <expression>IMDb</expression>
+ <expression>^IMDb$</expression>
</RegExp>
<RegExp input="$INFO[creditssource]" output="<chain
function="GetIMDBFullDirectorsById">$$2</chain>" dest="5+">
<expression>IMDbFull</expression>
@@ -195,7 +212,7 @@
<expression>themoviedb.org</expression>
</RegExp>
<RegExp input="$INFO[creditssource]" output="<chain
function="GetIMDBWritersById">$$2</chain>" dest="5+">
- <expression>IMDb</expression>
+ <expression>^IMDb$</expression>
</RegExp>
<RegExp input="$INFO[creditssource]" output="<chain
function="GetIMDBFullWritersById">$$2</chain>" dest="5+">
<expression>IMDbFull</expression>
@@ -203,7 +220,7 @@
<RegExp input="$INFO[creditssource]" output="<chain
function="GetTMDBWitersByIdChain">$$2</chain>" dest="5+">
<expression>themoviedb.org</expression>
</RegExp>
- <RegExp conditional="tmdbset" input="$$2"
output="<chain
function="GetTMDBSetByIdChain">$$2</chain>" dest="5+">
+ <RegExp conditional="tmdbset" input="$$2"
output="<chain
function="GetTMDBLangSetByIdChain">$$2</chain>" dest="5+">
<expression />
</RegExp>
<RegExp conditional="trakttvposter" input="$$2"
output="<chain
function="GetTRAKTTVThumbsByIdChain">$$2</chain>" dest="5+">
-----------------------------------------------------------------------
Summary of changes:
metadata.universal/addon.xml | 4 +-
metadata.universal/changelog.txt | 7 +++
.../resources/language/English/strings.xml | 20 +++++--
metadata.universal/resources/settings.xml | 53 ++++++++++++++++----
metadata.universal/universal.xml | 45 +++++++++++-----
5 files changed, 97 insertions(+), 32 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
