The branch, frodo has been updated via cb4a4529de289ae8ada2125b572f554b748258b4 (commit) from 72a2c1482e30bcac5de934f5b96e738fc21a256c (commit)
- Log ----------------------------------------------------------------- http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=cb4a4529de289ae8ada2125b572f554b748258b4 commit cb4a4529de289ae8ada2125b572f554b748258b4 Author: olympia <olym...@xbmc.org> Date: Thu Feb 14 17:23:24 2013 +0100 [metadata.universal] updated to version 2.4.0 diff --git a/metadata.universal/addon.xml b/metadata.universal/addon.xml index c23076e..8b85af3 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 Movie Scraper" - version="2.3.1" + version="2.4.0" provider-name="Olympia, Team XBMC"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> diff --git a/metadata.universal/changelog.txt b/metadata.universal/changelog.txt index 82503e9..45f4b2f 100644 --- a/metadata.universal/changelog.txt +++ b/metadata.universal/changelog.txt @@ -1,3 +1,6 @@ +[B]2.4.0[/B] +- added: option to perform full search on IMDb + [B]2.3.1[/B] - fixed: properly implement option to insert IMDb Outline as plot diff --git a/metadata.universal/resources/language/English/strings.xml b/metadata.universal/resources/language/English/strings.xml index b83cea7..6f14d3c 100644 --- a/metadata.universal/resources/language/English/strings.xml +++ b/metadata.universal/resources/language/English/strings.xml @@ -57,6 +57,9 @@ <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="30305"> Include All Movie Categories</string> + <string id="30306">Warning:</string> + <string id="30307">Enabling All Movie Categories will greatly reduce the search accuracy !!!</string> <string id="30400">Plot</string> <string id="30401">Plot / Tagline / Outline</string> <string id="30500">Fanart</string> diff --git a/metadata.universal/resources/settings.xml b/metadata.universal/resources/settings.xml index 5633787..86f9c28 100644 --- a/metadata.universal/resources/settings.xml +++ b/metadata.universal/resources/settings.xml @@ -3,14 +3,14 @@ <category label="128"> <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="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 label="30008" type="select" 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="select" 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 label="30040" type="select" 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 label="30046" type="select" 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> @@ -18,10 +18,10 @@ <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|Rotten Tomatoes / Critics' Consensus|IMDb Outline" 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 label="30020" type="select" 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|None" 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 label="30043" type="select" 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="labelenum" values="IMDb|Rotten Tomatoes / Critics' Consensus|None" id="outlinesource" default="IMDb"/> <setting type="sep"/> @@ -43,7 +43,7 @@ <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 label="30034" type="select" 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"/> @@ -65,10 +65,10 @@ <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 label="30006" type="select" 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 label="30041" type="select" 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"/> @@ -87,8 +87,8 @@ <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|br|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 label="30033" type="select" 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="select" values="au|bg|br|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"/> @@ -100,8 +100,11 @@ <setting label="30301" type="bool" id="tmdbsearch" default="false" enable="!eq(2,true)"/> <setting type="sep"/> <setting label="30302" type="bool" id="imdbsearch" default="true" enable="!eq(-2,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 label="30304" type="select" 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 label="30305" type="bool" id="fullimdbsearch" default="false" visible="!eq(-2,false)"/> <setting type="sep"/> + <setting type="lsep" label="30306" visible="!eq(-2,false)"/> + <setting type="lsep" label="30307" visible="!eq(-3,false)"/> </category> </settings> diff --git a/metadata.universal/universal.xml b/metadata.universal/universal.xml index d3559f1..d059437 100644 --- a/metadata.universal/universal.xml +++ b/metadata.universal/universal.xml @@ -51,8 +51,11 @@ <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\)\s|\(TV Special\)\s|\(Video\)\s|\(Short\)\s)?<</expression> + <RegExp conditional="fullimdbsearch" 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\sMovie\)\s|\(TV\sSpecial\)\s|\(Video\)\s|\(Short\)\s|\(TV\sMini-Series\)\s|\(TV\sSeries\)\s|\(TV\sShort\)\s|\(Short\)\s|\(Short\)\s)?<</expression> + </RegExp> + <RegExp conditional="!fullimdbsearch" 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\sMovie\)\s|\(TV\sSpecial\)\s|\(Video\)\s)?<</expression> </RegExp> <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> ----------------------------------------------------------------------- Summary of changes: metadata.universal/addon.xml | 2 +- metadata.universal/changelog.txt | 3 ++ .../resources/language/English/strings.xml | 3 ++ metadata.universal/resources/settings.xml | 27 +++++++++++--------- metadata.universal/universal.xml | 7 +++- 5 files changed, 27 insertions(+), 15 deletions(-) hooks/post-receive -- Scrapers ------------------------------------------------------------------------------ Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb _______________________________________________ Xbmc-addons mailing list Xbmc-addons@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xbmc-addons