diff options
| -rw-r--r-- | addons/metadata.common.imdb.com/addon.xml | 2 | ||||
| -rw-r--r-- | addons/metadata.common.imdb.com/changelog.txt | 2 | ||||
| -rw-r--r-- | addons/metadata.common.imdb.com/imdb.xml | 56 | ||||
| -rw-r--r-- | addons/metadata.common.themoviedb.org/addon.xml | 2 | ||||
| -rw-r--r-- | addons/metadata.common.themoviedb.org/tmdb.xml | 40 | ||||
| -rw-r--r-- | addons/metadata.themoviedb.org/addon.xml | 6 | ||||
| -rw-r--r-- | addons/metadata.themoviedb.org/changelog.txt | 3 | ||||
| -rw-r--r-- | addons/metadata.themoviedb.org/tmdb.xml | 18 |
8 files changed, 112 insertions, 17 deletions
diff --git a/addons/metadata.common.imdb.com/addon.xml b/addons/metadata.common.imdb.com/addon.xml index 703065cee7..af2ae90014 100644 --- 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 e539161108..ab77a31962 100644 --- 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 930286103b..4fa1e2383f 100644 --- 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="<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/addons/metadata.common.themoviedb.org/addon.xml b/addons/metadata.common.themoviedb.org/addon.xml index 017d06bbe3..4b1bd9f1f5 100644 --- 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 bc2c0ee8da..0d030e3e8c 100644 --- 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="<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"> diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index 30fa707418..dc9aba0e35 100644 --- 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 e6309db74e..405b205424 100644 --- 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 f8a44b3f85..2b90cf03da 100644 --- a/addons/metadata.themoviedb.org/tmdb.xml +++ b/addons/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> |