The branch, frodo has been updated
via 6ebf94480c18e05cd9661114106963045f0404f5 (commit)
from b1ac1ad899b117e67239333da9376e78ffd1580d (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=6ebf94480c18e05cd9661114106963045f0404f5
commit 6ebf94480c18e05cd9661114106963045f0404f5
Author: olympia <[email protected]>
Date: Fri Nov 30 23:51:38 2012 +0100
[metadata.universal] updated to version 1.8.0
diff --git a/metadata.universal/addon.xml b/metadata.universal/addon.xml
index 92e4d94..4297bd5 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.7.0"
+ version="1.8.0"
provider-name="Olympia, Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.universal/changelog.txt b/metadata.universal/changelog.txt
index 1bb621e..b004c8a 100644
--- a/metadata.universal/changelog.txt
+++ b/metadata.universal/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.8.0[/B]
+- changed: switch to TMDb search engine
+
[B]1.7.0[/B]
- fixed: won't find anything after IMDb layout changes
diff --git a/metadata.universal/universal.xml b/metadata.universal/universal.xml
index 0563eb4..07ff8da 100644
--- a/metadata.universal/universal.xml
+++ b/metadata.universal/universal.xml
@@ -8,47 +8,47 @@
<expression
noclean="1">imdb....?/title/tt([0-9]*)</expression>
</RegExp>
</NfoUrl>
- <CreateSearchUrl dest="3" SearchStringEncoding="iso-8859-1">
- <RegExp input="$$1"
output="<url>http://akas.imdb.com/find?q=\1&s=tt</url>";
dest="3">
- <RegExp input="$$2" output="%20(\1)" dest="4">
+ <CreateSearchUrl dest="3">
+ <RegExp input="$$1"
output="<url>http://api.themoviedb.org/3/search/movie?api_key=57983e31fb435df4df77afb854740ea9&amp;query=\1&amp;year=$$4&amp;language=$INFO[language]</url>";
dest="3">
+ <RegExp input="$$2" output="\1" dest="4">
<expression clear="yes">(.+)</expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</CreateSearchUrl>
<GetSearchResults 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 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-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url></entity>";
dest="3">
+ <expression
repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":"([0-9]+)-.*?"title":"([^"]*)</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*\([^\(]*?([0-9]{4})[^\)]*\)(?!\s\(Video\sGame\))</expression>
+ <RegExp input="$$1"
output="<entity><title>\2</title><id>\1</id><year>\3</year><url
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url></entity>";
dest="3+">
+ <expression
repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":"([0-9]+)-</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*\([^\(]*?([0-9]{4})[^\)]*\)\s<br/>aka\s<i>"([^"]*)</expression>
+ <RegExp input="$$1"
output="<entity><title>\2</title><id>\1</id><url
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url></entity>";
dest="3+">
+ <expression
repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":null</expression>
</RegExp>
- <expression clear="yes" noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</GetSearchResults>
<GetDetails dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
- <RegExp input="$$2" output="<id>\1</id>"
dest="5">
- <expression/>
+ <RegExp input="$$1" output="\1" dest="2">
+ <expression clear="yes"
noclean="1">"id":[0-9]*,"imdb_id":"([^"]*)</expression>
</RegExp>
- <RegExp input="$$1" output="\2" dest="19">
- <expression fixchars="2"><meta
name="title" content="(IMDb -
)?(?:&#x22;)?([^"]*?)(?:&#x22;)? \([^\(]*?([0-9]{4})\)</expression>
+ <RegExp input="$$1" output="<id>\1</id>"
dest="5">
+ <expression clear="yes"
noclean="1">"id":[0-9]*,"imdb_id":"([^"]*)</expression>
</RegExp>
- <RegExp input="$$1" output="\2" dest="20">
- <expression><meta name="title"
content="([^"]*?) \([^\(]*?([0-9]{4})\)</expression>
+ <RegExp input="$$1" output="\1" dest="19">
+ <expression
fixchars="1">"original_title":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="20">
+ <expression
noclean="1">"release_date":"([0-9]+)-</expression>
</RegExp>
<RegExp input="$$19"
output="<originaltitle>\1</originaltitle>" dest="5+">
<expression/>
</RegExp>
- <RegExp input="$$1"
output="<year>\2</year>" dest="5+">
- <expression><meta name="title"
content="([^"]*?) \([^\(]*?([0-9]{4})\)</expression>
- </RegExp>
- <RegExp input="$$1"
output="<top250>\1</top250>" dest="5+">
- <expression>Top 250 #([0-9]*)</</expression>
+ <RegExp input="$$1"
output="<year>\1</year>" dest="5+">
+ <expression
noclean="1">"release_date":"([0-9]+)-</expression>
</RegExp>
<RegExp input="$INFO[titlesource]" output="<chain
function="GetIMDBAKATitlesById">$$2</chain>" dest="5+">
<expression>IMDb</expression>
@@ -66,7 +66,7 @@
<expression><h4[^>]*?>Taglines:</h4>\n?([^<]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<runtime>\1</runtime>" dest="5+">
- <expression
trim="1"><h4[^>]*?>Runtime:</h4>[^0-9]*([0-9]+)</expression>
+ <expression
noclean="1">"runtime":([0-9]+)</expression>
</RegExp>
<RegExp input="$INFO[mratingsource]" output="<chain
function="GetIMDBRatingById">$$2</chain>" dest="5+">
<expression>IMDb</expression>
@@ -93,10 +93,10 @@
<expression>trakt.tv</expression>
</RegExp>
<RegExp input="$$1"
output="<country>\1</country>" dest="5+">
- <expression
repeat="yes">"/country/[^>]+>([^<]+)</a></expression>
+ <expression trim="1"
fixchars="1">"name":"([^"]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<studio>\1</studio>" dest="5+">
-
<expression>"/company/[^>]+>([^<]+)</a></expression>
+ <expression trim="1"
fixchars="1">"name":"([^"]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<outline>\1</outline><plot>\1</plot>" dest="5+">
<expression fixchars="1"
trim="1"><p>\n?<p
itemprop="description">([^<]+)</p></expression>
@@ -176,7 +176,7 @@
<RegExp conditional="fanart" input="$$2"
output="<chain
function="GetTMDBFanartByIdChain">$$2</chain>" dest="5+">
<expression/>
</RegExp>
- <RegExp conditional="ytrailer" input="$$1"
output="<chain
function="GetYoutubeTrailer">$$6=$$9</chain>" dest="5+">
+ <RegExp conditional="ytrailer" input="$$1"
output="<chain
function="GetYoutubeTrailer">$$19=$$20</chain>" dest="5+">
<RegExp input="$$1" output="\2" dest="6">
<expression><meta
name="title" content="(IMDb -
)?(?:&#x22;)?([^"]*?)(?:&#x22;)? \([^\(]*?([0-9]{4})\)</expression>
</RegExp>
-----------------------------------------------------------------------
Summary of changes:
metadata.universal/addon.xml | 2 +-
metadata.universal/changelog.txt | 3 ++
metadata.universal/universal.xml | 54 +++++++++++++++++++-------------------
3 files changed, 31 insertions(+), 28 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Keep yourself connected to Go Parallel:
TUNE You got it built. Now make it sing. Tune shows you how.
http://goparallel.sourceforge.net
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
