The branch, eden has been updated
via 84c99ff295a0131599da3228608b13ce04657d18 (commit)
from 16cb71f9b07f3d37654d645dfbae30009d3b2b77 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=84c99ff295a0131599da3228608b13ce04657d18
commit 84c99ff295a0131599da3228608b13ce04657d18
Author: olympia <olym...@xbmc.org>
Date: Sat Dec 1 23:39:44 2012 +0100
synced with Frodo
diff --git a/metadata.common.imdb.com/addon.xml
b/metadata.common.imdb.com/addon.xml
index 703065c..af2ae90 100644
--- a/metadata.common.imdb.com/addon.xml
+++ b/metadata.common.imdb.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.imdb.com"
name="IMDB common scraper functions"
- version="2.5.0"
+ version="2.6.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.imdb.com/changelog.txt
b/metadata.common.imdb.com/changelog.txt
index e539161..ab77a31 100644
--- a/metadata.common.imdb.com/changelog.txt
+++ b/metadata.common.imdb.com/changelog.txt
@@ -1,3 +1,5 @@
+[B]2.6.0[/B]
+- updated: outfactored outline/studio/country/top250 to common library
[B]2.5.0[/B]
- updated: outfactored tagline scraping to common library
diff --git a/metadata.common.imdb.com/imdb.xml
b/metadata.common.imdb.com/imdb.xml
index 9302861..4fa1e23 100644
--- a/metadata.common.imdb.com/imdb.xml
+++ b/metadata.common.imdb.com/imdb.xml
@@ -27,6 +27,48 @@
</RegExp>
</ParseIMDBRating>
+ <GetIMDBTOP250ById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBTOP250">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBTOP250ById>
+ <ParseIMDBTOP250 dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<top250>\1</top250>" dest="2">
+
<expression>Top\s250\s#([0-9]*)</</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseIMDBTOP250>
+
+ <GetIMDBStudioById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBStudio">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBStudioById>
+ <ParseIMDBStudio dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<studio>\1</studio>" dest="2">
+
<expression>"/company/[^>]+>([^<]+)</a></expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseIMDBStudio>
+
+ <GetIMDBCountryById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBCountry">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBCountryById>
+ <ParseIMDBCountry dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<country>\1</country>" dest="2">
+ <expression
repeat="yes">"/country/[^>]+>([^<]+)</a></expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseIMDBCountry>
+
<GetMetaCriticRatingById dest="5">
<RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseMetaCriticRating">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
<expression noclean="1" />
@@ -69,6 +111,20 @@
</RegExp>
</ParseIMDBTagline>
+ <GetIMDBOutlineById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBOutline">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBOutlineById>
+ <ParseIMDBOutline dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<outline>\1</outline>" dest="2">
+ <expression fixchars="1"
trim="1"><p>\n?<p
itemprop="description">([^<]+)</p></expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseIMDBOutline>
+
<GetIMDBCastById dest="5">
<RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBCast">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
<expression noclean="1" />
diff --git a/metadata.common.themoviedb.org/addon.xml
b/metadata.common.themoviedb.org/addon.xml
index 0a7fb44..4b1bd9f 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.7.0"
+ version="2.8.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 8648af6..0d030e3 100644
--- a/metadata.common.themoviedb.org/tmdb.xml
+++ b/metadata.common.themoviedb.org/tmdb.xml
@@ -268,6 +268,46 @@
</RegExp>
</ParseTMDBRating>
+ <GetTMDBStudioByIdChain dest="4">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="4">
+ <RegExp input="$$1" output="<url
function="ParseTMDBStudio"
cache="tmdb-en-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBStudioByIdChain>
+ <ParseTMDBStudio dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression clear="yes"
noclean="1">"production_companies":\[([^\]]*)</expression>
+ </RegExp>
+ <RegExp input="$$7"
output="<studio>\1</studio>" dest="2">
+ <expression trim="1"
fixchars="1">"name":"([^"]*)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseTMDBStudio>
+
+ <GetTMDBCountryByIdChain dest="4">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="4">
+ <RegExp input="$$1" output="<url
function="ParseTMDBCountry"
cache="tmdb-en-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBCountryByIdChain>
+ <ParseTMDBCountry dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression clear="yes"
noclean="1">"production_countries":\[([^\]]*)</expression>
+ </RegExp>
+ <RegExp input="$$7"
output="<country>\1</country>" dest="2">
+ <expression trim="1"
fixchars="1">"name":"([^"]*)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseTMDBCountry>
+
<GetTMDBTrailerByIdChain dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
<RegExp input="$$1" output="<url
function="ParseTMDBTrailer"
cache="tmdb-trailer-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1/trailers?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>";
dest="5">
@@ -396,7 +436,7 @@
<RegExp input="$$1" output="\1" dest="7">
<expression clear="yes"
noclean="1">"posters":\[\{([^\]]*)</expression>
</RegExp>
- <RegExp input="$$7" output="<thumb
aspect="poster"preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>";
dest="9">
+ <RegExp input="$$7" output="<thumb
aspect="poster"
preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>";
dest="9">
<expression repeat="yes"
noclean="1">"file_path":"([^"]*)</expression>
</RegExp>
<RegExp input="$$9" output="$$12" dest="2+">
@@ -422,7 +462,7 @@
<RegExp input="$$1" output="\1" dest="7">
<expression clear="yes"
noclean="1">"posters":\[\{([^\]]*)</expression>
</RegExp>
- <RegExp input="$$7" output="<thumb
aspect="poster"preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>";
dest="9">
+ <RegExp input="$$7" output="<thumb
aspect="poster"
preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>";
dest="9">
<expression repeat="yes"
noclean="1">"file_path":"([^"]*)</expression>
</RegExp>
<RegExp input="$$9" output="$$12" dest="2+">
@@ -448,7 +488,7 @@
<RegExp input="$$1" output="\1" dest="7">
<expression clear="yes"
noclean="1">"posters":\[\{([^\]]*)</expression>
</RegExp>
- <RegExp input="$$7" output="<thumb
aspect="poster"preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>";
dest="9">
+ <RegExp input="$$7" output="<thumb
aspect="poster"
preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>";
dest="9">
<expression repeat="yes"
noclean="1">"file_path":"([^"]*)</expression>
</RegExp>
<RegExp input="$$9" output="<url
function="ParseTMDBAllThumbs"
cache="tmdb-images-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9</url>";
dest="2">
@@ -465,7 +505,7 @@
<RegExp input="$$1" output="\1" dest="7">
<expression clear="yes"
noclean="1">"posters":\[\{([^\]]*)</expression>
</RegExp>
- <RegExp input="$$7" output="<thumb
aspect="poster"preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>";
dest="2">
+ <RegExp input="$$7" output="<thumb
aspect="poster"
preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>";
dest="2">
<expression repeat="yes"
noclean="1">"file_path":"([^"]*)</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
diff --git a/metadata.themoviedb.org/addon.xml
b/metadata.themoviedb.org/addon.xml
index 30fa707..dc9aba0 100644
--- a/metadata.themoviedb.org/addon.xml
+++ b/metadata.themoviedb.org/addon.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.themoviedb.org"
name="The Movie Database"
- version="3.6.1"
+ version="3.7.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.themoviedb.org" version="2.7.0"/>
+ <import addon="metadata.common.themoviedb.org" version="2.8.0"/>
<import addon="metadata.common.hdtrailers.net" version="1.0.7"/>
- <import addon="metadata.common.imdb.com" version="2.1.9"/>
+ <import addon="metadata.common.imdb.com" version="2.6.0"/>
<import addon="plugin.video.youtube" version="2.9.1" optional="true"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
diff --git a/metadata.themoviedb.org/changelog.txt
b/metadata.themoviedb.org/changelog.txt
index e6309db..405b205 100644
--- a/metadata.themoviedb.org/changelog.txt
+++ b/metadata.themoviedb.org/changelog.txt
@@ -1,3 +1,6 @@
+[B]3.7.0[/B]
+- updated: out factored studio and country scraping to common library
+
[B]3.6.1[/B]
- updated: Scraper name
diff --git a/metadata.themoviedb.org/tmdb.xml b/metadata.themoviedb.org/tmdb.xml
index f8a44b3..2b90cf0 100644
--- a/metadata.themoviedb.org/tmdb.xml
+++ b/metadata.themoviedb.org/tmdb.xml
@@ -65,18 +65,6 @@
<RegExp input="$$10"
output="<runtime>\1</runtime>" dest="5+">
<expression>(.+)</expression>
</RegExp>
- <RegExp input="$$1" output="\1" dest="7">
- <expression clear="yes"
noclean="1">"production_companies":\[([^\]]*)</expression>
- </RegExp>
- <RegExp input="$$7"
output="<studio>\1</studio>" dest="5+">
- <expression trim="1"
fixchars="1">"name":"([^"]*)</expression>
- </RegExp>
- <RegExp input="$$1" output="\1" dest="7">
- <expression clear="yes"
noclean="1">"production_countries":\[([^\]]*)</expression>
- </RegExp>
- <RegExp input="$$7"
output="<country>\1</country>" dest="5+">
- <expression trim="1"
fixchars="1">"name":"([^"]*)</expression>
- </RegExp>
<RegExp input="$INFO[RatingS]" output="<chain
function="GetIMDBRatingById">$$6</chain>" dest="5+">
<RegExp input="$$1" output="\1" dest="6">
<expression
noclean="1">"id":[0-9]*,"imdb_id":"([^"]*)</expression>
@@ -86,6 +74,12 @@
<RegExp input="$INFO[RatingS]" output="<chain
function="GetTMDBRatingByIdChain">$$2</chain>" dest="5+">
<expression>TMDb</expression>
</RegExp>
+ <RegExp input="$$2" output="<chain
function="GetTMDBStudioByIdChain">$$2</chain>" dest="5+">
+ <expression />
+ </RegExp>
+ <RegExp input="$$2" output="<chain
function="GetTMDBCountryByIdChain">$$2</chain>" dest="5+">
+ <expression />
+ </RegExp>
<RegExp input="$$2" output="<chain
function="GetTMDBDirectorsByIdChain">$$2</chain>" dest="5+">
<expression />
</RegExp>
diff --git a/metadata.universal/addon.xml b/metadata.universal/addon.xml
index 1171203..80da982 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.8.1"
+ version="1.9.0"
provider-name="Olympia, Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -21,7 +21,7 @@
library="universal.xml"/>
<extension point="xbmc.addon.metadata">
<summary lang="en">Universal Movie Scraper</summary>
- <description lang="en">This scraper collecting information from the
following supported sites: IMDb, TMDb, Rotten Tomatoes, Trakt.tv, OFDb.de. It
always does the initial search on IMDb, but following that it can be set field
by field that from which site you want that specific information.</description>
+ <description lang="en">This scraper collecting information from the
following supported sites: IMDb, TMDb, Rotten Tomatoes, Trakt.tv, OFDb.de. It
always does the initial search on TMDb, but following that it can be set field
by field that from which site you want that specific information.</description>
<platform>all</platform>
</extension>
</addon>
diff --git a/metadata.universal/changelog.txt b/metadata.universal/changelog.txt
index 0d711d2..d37b8c9 100644
--- a/metadata.universal/changelog.txt
+++ b/metadata.universal/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.9.0[/B]
+- updated: Settings Clean-up / added TOP250 and outline from IMDb
+
[B]1.8.1[/B]
- fixed: studio and country won't scrape
diff --git a/metadata.universal/resources/language/English/strings.xml
b/metadata.universal/resources/language/English/strings.xml
index d58e2c7..998ca78 100644
--- a/metadata.universal/resources/language/English/strings.xml
+++ b/metadata.universal/resources/language/English/strings.xml
@@ -36,12 +36,18 @@
<string id="30040"> Genre Language</string>
<string id="30041"> Preferred Trailer Language</string>
<string id="30041"> Preferred Trailer Language</string>
- <string id="30042">Tagline Sources</string>
+ <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="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>
</strings>
diff --git a/metadata.universal/resources/settings.xml
b/metadata.universal/resources/settings.xml
index ffcac50..510ee10 100644
--- a/metadata.universal/resources/settings.xml
+++ b/metadata.universal/resources/settings.xml
@@ -12,7 +12,7 @@
<setting label="30042" type="labelenum" values="IMDb|themoviedb.org"
id="taglinesource" default="IMDb"/>
<setting label="30043" 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="tmdbtaglinelanguage" default="en" visible="eq(-1,1)"/>
<setting type="sep"/>
- <setting label="30015" type="labelenum"
values="IMDb|IMDbFull|themoviedb.org" id="creditssource" default="IMDb"/>
+ <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="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)"/>
@@ -20,6 +20,15 @@
<setting label="30013" type="bool" id="tmdbset" default="true"/>
</category>
+ <category label="30200">
+ <setting type="sep"/>
+ <setting label="30015" type="labelenum"
values="IMDb|IMDbFull|themoviedb.org" id="creditssource" default="IMDb"/>
+ <setting type="sep"/>
+ <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"/>
+ </category>
+
<category label="30011">
<setting type="lsep" label="Poster Sources"/>
<setting label="30037" type="bool" id="trakttvposter" default="false"/>
@@ -48,6 +57,7 @@
<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 label="30044" type="bool" id="imdbtop250" default="true"/>
<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)"/>
diff --git a/metadata.universal/universal.xml b/metadata.universal/universal.xml
index b549846..f62fa5c 100644
--- a/metadata.universal/universal.xml
+++ b/metadata.universal/universal.xml
@@ -35,20 +35,20 @@
<RegExp input="$$1" output="\1" dest="2">
<expression clear="yes"
noclean="1">"id":[0-9]*,"imdb_id":"([^"]*)</expression>
</RegExp>
- <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="\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="$$2" output="<id>\1</id>"
dest="5">
+ <expression/>
+ </RegExp>
<RegExp input="$$19"
output="<originaltitle>\1</originaltitle>" dest="5+">
<expression/>
</RegExp>
- <RegExp input="$$1"
output="<year>\1</year>" dest="5+">
- <expression
noclean="1">"release_date":"([0-9]+)-</expression>
+ <RegExp input="$$20"
output="<year>\1</year>" dest="5+">
+ <expression/>
</RegExp>
<RegExp input="$INFO[titlesource]" output="<chain
function="GetIMDBAKATitlesById">$$2</chain>" dest="5+">
<expression>IMDb</expression>
@@ -62,9 +62,6 @@
<RegExp input="$INFO[certificationssource]"
output="<chain function="GetIMDBCountryCert">$$2</chain>"
dest="5+">
<expression>IMDb</expression>
</RegExp>
- <RegExp input="$$1"
output="<tagline>\1</tagline>" dest="5+">
-
<expression><h4[^>]*?>Taglines:</h4>\n?([^<]*)</expression>
- </RegExp>
<RegExp input="$$1"
output="<runtime>\1</runtime>" dest="5+">
<expression
noclean="1">"runtime":([0-9]+)</expression>
</RegExp>
@@ -83,6 +80,9 @@
<RegExp input="$INFO[mratingsource]" output="<chain
function="GetTRAKTTVRatingByIdChain">$$2</chain>" dest="5+">
<expression>trakt.tv</expression>
</RegExp>
+ <RegExp conditional="imdbtop250" input="$$2"
output="<chain function="GetIMDBTOP250ById">$$2</chain>"
dest="5+">
+ <expression />
+ </RegExp>
<RegExp input="$INFO[genressource]" output="<chain
function="GetIMDBGenresById">$$2</chain>" dest="5+">
<expression>IMDb</expression>
</RegExp>
@@ -92,20 +92,20 @@
<RegExp input="$INFO[genressource]" output="<chain
function="GetTRAKTTVGenresByIdChain">$$2</chain>" dest="5+">
<expression>trakt.tv</expression>
</RegExp>
- <RegExp input="$$1" output="\1" dest="7">
- <expression clear="yes"
noclean="1">"production_countries":\[([^\]]*)</expression>
+ <RegExp input="$INFO[studiosource]" output="<chain
function="GetIMDBStudioById">$$2</chain>" dest="5+">
+ <expression>IMDb</expression>
</RegExp>
- <RegExp input="$$7"
output="<country>\1</country>" dest="5+">
- <expression trim="1"
fixchars="1">"name":"([^"]*)</expression>
+ <RegExp input="$INFO[studiosource]" output="<chain
function="GetTMDBStudioByIdChain">$$2</chain>" dest="5+">
+ <expression>themoviedb.org</expression>
</RegExp>
- <RegExp input="$$1" output="\1" dest="7">
- <expression clear="yes"
noclean="1">"production_companies":\[([^\]]*)</expression>
+ <RegExp input="$INFO[countrysource]" output="<chain
function="GetIMDBCountryById">$$2</chain>" dest="5+">
+ <expression>IMDb</expression>
</RegExp>
- <RegExp input="$$7"
output="<studio>\1</studio>" dest="5+">
- <expression trim="1"
fixchars="1">"name":"([^"]*)</expression>
+ <RegExp input="$INFO[countrysource]" output="<chain
function="GetTMDBCountryByIdChain">$$2</chain>" dest="5+">
+ <expression>themoviedb.org</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>
+ <RegExp conditional="imdboutline" input="$$2"
output="<chain function="GetIMDBOutlineById">$$2</chain>"
dest="5+">
+ <expression/>
</RegExp>
<RegExp conditional="rtoutline" input="$$2"
output="<chain function="GetRTOutlineById">$$2</chain>"
dest="5+">
<expression/>
@@ -183,12 +183,6 @@
<expression/>
</RegExp>
<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>
- <RegExp input="$$1" output="\2" dest="9">
- <expression><meta
name="title" content="([^"]*?)
\([^\(]*?([0-9]{4})\)</expression>
- </RegExp>
<expression/>
</RegExp>
<RegExp conditional="tmdbtrailer" input="$$2"
output="<chain
function="GetTMDBLangTrailerByIdChain">$$2</chain>"
dest="5+">
@@ -197,22 +191,13 @@
<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>
- </RegExp>
+ <RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet480p">$$19</chain>" dest="5+">
<expression>480p</expression>
</RegExp>
- <RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet720p">$$6</chain>" dest="5+">
- <RegExp input="$$1" output="\1" dest="6">
- <expression><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
- </RegExp>
+ <RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet720p">$$19</chain>" dest="5+">
<expression>720p</expression>
</RegExp>
- <RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet1080p">$$6</chain>" dest="5+">
- <RegExp input="$$1" output="\1" dest="6">
- <expression><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
- </RegExp>
+ <RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet1080p">$$19</chain>" dest="5+">
<expression>1080p</expression>
</RegExp>
<RegExp conditional="imdbthumbs" input="$$2"
output="<chain function="GetIMDBThumbsById">$$2</chain>"
dest="5+">
-----------------------------------------------------------------------
Summary of changes:
metadata.common.imdb.com/addon.xml | 2 +-
metadata.common.imdb.com/changelog.txt | 2 +
metadata.common.imdb.com/imdb.xml | 56 +++++++++++++++++++
metadata.common.themoviedb.org/addon.xml | 2 +-
metadata.common.themoviedb.org/tmdb.xml | 48 +++++++++++++++--
metadata.themoviedb.org/addon.xml | 6 +-
metadata.themoviedb.org/changelog.txt | 3 +
metadata.themoviedb.org/tmdb.xml | 18 ++----
metadata.universal/addon.xml | 4 +-
metadata.universal/changelog.txt | 3 +
.../resources/language/English/strings.xml | 8 +++-
metadata.universal/resources/settings.xml | 12 ++++-
metadata.universal/universal.xml | 57 +++++++------------
13 files changed, 160 insertions(+), 61 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Keep yourself connected to Go Parallel:
INSIGHTS What's next for parallel hardware, programming and related areas?
Interviews and blogs by thought leaders keep you ahead of the curve.
http://goparallel.sourceforge.net
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
