[addons] sync scrapers with repo

diff --git a/addons/metadata.common.imdb.com/addon.xml b/addons/metadata.common.imdb.com/addon.xml
index 703065c..af2ae90 100644 (file)
--- a/addons/metadata.common.imdb.com/addon.xml
+++ b/addons/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/addons/metadata.common.imdb.com/changelog.txt b/addons/metadata.common.imdb.com/changelog.txt
index e539161..ab77a31 100644 (file)
--- a/addons/metadata.common.imdb.com/changelog.txt
+++ b/addons/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/addons/metadata.common.imdb.com/imdb.xml b/addons/metadata.common.imdb.com/imdb.xml
index 9302861..4fa1e23 100644 (file)
--- a/addons/metadata.common.imdb.com/imdb.xml
+++ b/addons/metadata.common.imdb.com/imdb.xml
@@ -27,6 +27,48 @@
                </RegExp>
        </ParseIMDBRating>
 
+       <GetIMDBTOP250ById dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;$$1-main.html&quot; function=&quot;ParseIMDBTOP250&quot;&gt;http://akas.imdb.com/title/$$1/&lt;/url&gt;&lt;/details&gt;" dest="5">
+                       <expression noclean="1" />
+               </RegExp>
+       </GetIMDBTOP250ById>
+       <ParseIMDBTOP250 dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+                       <RegExp input="$$1" output="&lt;top250&gt;\1&lt;/top250&gt;" dest="2">
+                               <expression>Top\s250\s#([0-9]*)&lt;/</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseIMDBTOP250>
+
+       <GetIMDBStudioById dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;$$1-main.html&quot; function=&quot;ParseIMDBStudio&quot;&gt;http://akas.imdb.com/title/$$1/&lt;/url&gt;&lt;/details&gt;" dest="5">
+                       <expression noclean="1" />
+               </RegExp>
+       </GetIMDBStudioById>
+       <ParseIMDBStudio dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+                       <RegExp input="$$1" output="&lt;studio&gt;\1&lt;/studio&gt;" dest="2">
+                               <expression>&quot;/company/[^&gt;]+&gt;([^&lt;]+)&lt;/a&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseIMDBStudio>
+
+       <GetIMDBCountryById dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;$$1-main.html&quot; function=&quot;ParseIMDBCountry&quot;&gt;http://akas.imdb.com/title/$$1/&lt;/url&gt;&lt;/details&gt;" dest="5">
+                       <expression noclean="1" />
+               </RegExp>
+       </GetIMDBCountryById>
+       <ParseIMDBCountry dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+                       <RegExp input="$$1" output="&lt;country&gt;\1&lt;/country&gt;" dest="2">
+                               <expression repeat="yes">&quot;/country/[^&gt;]+&gt;([^&lt;]+)&lt;/a&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseIMDBCountry>
+
        <GetMetaCriticRatingById dest="5">
                <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;$$1-main.html&quot; function=&quot;ParseMetaCriticRating&quot;&gt;http://akas.imdb.com/title/$$1/&lt;/url&gt;&lt;/details&gt;" dest="5">
                        <expression noclean="1" />
@@ -69,6 +111,20 @@
                </RegExp>
        </ParseIMDBTagline>
 
+       <GetIMDBOutlineById dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;$$1-main.html&quot; function=&quot;ParseIMDBOutline&quot;&gt;http://akas.imdb.com/title/$$1/&lt;/url&gt;&lt;/details&gt;" dest="5">
+                       <expression noclean="1" />
+               </RegExp>
+       </GetIMDBOutlineById>
+       <ParseIMDBOutline dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+                       <RegExp input="$$1" output="&lt;outline&gt;\1&lt;/outline&gt;" dest="2">
+                               <expression fixchars="1" trim="1">&lt;p&gt;\n?&lt;p itemprop=&quot;description&quot;&gt;([^&lt;]+)&lt;/p&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseIMDBOutline>
+
        <GetIMDBCastById dest="5">
                <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;$$1-main.html&quot; function=&quot;ParseIMDBCast&quot;&gt;http://akas.imdb.com/title/$$1/&lt;/url&gt;&lt;/details&gt;" dest="5">
                        <expression noclean="1" />

diff --git a/addons/metadata.common.themoviedb.org/addon.xml b/addons/metadata.common.themoviedb.org/addon.xml
index 017d06b..4b1bd9f 100644 (file)
--- a/addons/metadata.common.themoviedb.org/addon.xml
+++ b/addons/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.1"
+       version="2.8.0"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>

diff --git a/addons/metadata.common.themoviedb.org/tmdb.xml b/addons/metadata.common.themoviedb.org/tmdb.xml
index bc2c0ee..0d030e3 100644 (file)
--- a/addons/metadata.common.themoviedb.org/tmdb.xml
+++ b/addons/metadata.common.themoviedb.org/tmdb.xml
@@ -268,6 +268,46 @@
                </RegExp>
        </ParseTMDBRating>
 
+       <GetTMDBStudioByIdChain dest="4">
+               <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
+                       <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBStudio&quot; cache=&quot;tmdb-en-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=en&lt;/url&gt;" dest="5">
+                               <expression />
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </GetTMDBStudioByIdChain>
+       <ParseTMDBStudio dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+                       <RegExp input="$$1" output="\1" dest="7">
+                               <expression clear="yes" noclean="1">&quot;production_companies&quot;:\[([^\]]*)</expression>
+                       </RegExp>
+                       <RegExp input="$$7" output="&lt;studio&gt;\1&lt;/studio&gt;" dest="2">
+                               <expression trim="1" fixchars="1">&quot;name&quot;:&quot;([^&quot;]*)</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseTMDBStudio>
+
+       <GetTMDBCountryByIdChain dest="4">
+               <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
+                       <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBCountry&quot; cache=&quot;tmdb-en-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=en&lt;/url&gt;" dest="5">
+                               <expression />
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </GetTMDBCountryByIdChain>
+       <ParseTMDBCountry dest="5">
+               <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+                       <RegExp input="$$1" output="\1" dest="7">
+                               <expression clear="yes" noclean="1">&quot;production_countries&quot;:\[([^\]]*)</expression>
+                       </RegExp>
+                       <RegExp input="$$7" output="&lt;country&gt;\1&lt;/country&gt;" dest="2">
+                               <expression trim="1" fixchars="1">&quot;name&quot;:&quot;([^&quot;]*)</expression>
+                       </RegExp>
+                       <expression noclean="1" />
+               </RegExp>
+       </ParseTMDBCountry>
+
        <GetTMDBTrailerByIdChain dest="4">
                <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
                        <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBTrailer&quot; cache=&quot;tmdb-trailer-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/trailers?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;" dest="5">

diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml
index 30fa707..dc9aba0 100644 (file)
--- a/addons/metadata.themoviedb.org/addon.xml
+++ b/addons/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/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt
index e6309db..405b205 100644 (file)
--- a/addons/metadata.themoviedb.org/changelog.txt
+++ b/addons/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/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml
index f8a44b3..2b90cf0 100644 (file)
--- a/addons/metadata.themoviedb.org/tmdb.xml
+++ b/addons/metadata.themoviedb.org/tmdb.xml
@@ -65,18 +65,6 @@
                        <RegExp input="$$10" output="&lt;runtime&gt;\1&lt;/runtime&gt;" dest="5+">
                                <expression>(.+)</expression>
                        </RegExp>
-                       <RegExp input="$$1" output="\1" dest="7">
-                               <expression clear="yes" noclean="1">&quot;production_companies&quot;:\[([^\]]*)</expression>
-                       </RegExp>
-                       <RegExp input="$$7" output="&lt;studio&gt;\1&lt;/studio&gt;" dest="5+">
-                               <expression trim="1" fixchars="1">&quot;name&quot;:&quot;([^&quot;]*)</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="\1" dest="7">
-                               <expression clear="yes" noclean="1">&quot;production_countries&quot;:\[([^\]]*)</expression>
-                       </RegExp>
-                       <RegExp input="$$7" output="&lt;country&gt;\1&lt;/country&gt;" dest="5+">
-                               <expression trim="1" fixchars="1">&quot;name&quot;:&quot;([^&quot;]*)</expression>
-                       </RegExp>
                        <RegExp input="$INFO[RatingS]" output="&lt;chain function=&quot;GetIMDBRatingById&quot;&gt;$$6&lt;/chain&gt;" dest="5+">
                                <RegExp input="$$1" output="\1" dest="6">
                                        <expression noclean="1">&quot;id&quot;:[0-9]*,&quot;imdb_id&quot;:&quot;([^&quot;]*)</expression>
@@ -86,6 +74,12 @@
                        <RegExp input="$INFO[RatingS]" output="&lt;chain function=&quot;GetTMDBRatingByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
                                <expression>TMDb</expression>
                        </RegExp>
+                       <RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBStudioByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+                               <expression />
+                       </RegExp>
+                       <RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBCountryByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+                               <expression />
+                       </RegExp>
                        <RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBDirectorsByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
                                <expression />
                        </RegExp>