diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2012-12-01 13:00:30 +0100 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2012-12-01 13:00:30 +0100 |
| commit | af7102d32c19dc511f51767731686d042a1da691 (patch) | |
| tree | 49c58af217ee511cfe188e1358c9e85e9b849df3 /addons/metadata.themoviedb.org | |
| parent | c81334142cdd64b7d5b1db7e6336588d472452d7 (diff) | |
[addons] sync packaged addons/scrapers with Frodo repo
Diffstat (limited to 'addons/metadata.themoviedb.org')
| -rw-r--r-- | addons/metadata.themoviedb.org/addon.xml | 6 | ||||
| -rw-r--r-- | addons/metadata.themoviedb.org/changelog.txt | 6 | ||||
| -rw-r--r-- | addons/metadata.themoviedb.org/tmdb.xml | 20 |
3 files changed, 12 insertions, 20 deletions
diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index 694e5f2002..30fa707418 100644 --- a/addons/metadata.themoviedb.org/addon.xml +++ b/addons/metadata.themoviedb.org/addon.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.themoviedb.org" - name="The MovieDB" - version="3.5.0" + name="The Movie Database" + version="3.6.1" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> - <import addon="metadata.common.themoviedb.org" version="2.6.0"/> + <import addon="metadata.common.themoviedb.org" version="2.7.0"/> <import addon="metadata.common.hdtrailers.net" version="1.0.7"/> <import addon="metadata.common.imdb.com" version="2.1.9"/> <import addon="plugin.video.youtube" version="2.9.1" optional="true"/> diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index 63784acd54..e6309db74e 100644 --- a/addons/metadata.themoviedb.org/changelog.txt +++ b/addons/metadata.themoviedb.org/changelog.txt @@ -1,3 +1,9 @@ +[B]3.6.1[/B] +- updated: Scraper name + +[B]3.6.0[/B] +- updated: out factored tagline scraping to common library + [B]3.5.0[/B] - added: aspect tag and reorder languages according to the alphabet diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml index 20bf719a8b..f8a44b3f85 100644 --- a/addons/metadata.themoviedb.org/tmdb.xml +++ b/addons/metadata.themoviedb.org/tmdb.xml @@ -65,15 +65,6 @@ <RegExp input="$$10" output="<runtime>\1</runtime>" dest="5+"> <expression>(.+)</expression> </RegExp> - <RegExp input="$$1" output="\1" dest="10"> - <expression clear="yes" fixchars="1">"tagline":"([^"]*)</expression> - </RegExp> - <RegExp input="$$10" output="<url function="ParseFallbackTMDBTagline" cache="tmdb-en-$$2.json">http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="5+"> - <expression>^$</expression> - </RegExp> - <RegExp input="$$10" output="<tagline>\1</tagline>" dest="5+"> - <expression>(.+)</expression> - </RegExp> <RegExp input="$$1" output="\1" dest="7"> <expression clear="yes" noclean="1">"production_companies":\[([^\]]*)</expression> </RegExp> @@ -110,6 +101,9 @@ <RegExp input="$$2" output="<chain function="GetTMDBPlotByIdChain">$$2</chain>" dest="5+"> <expression /> </RegExp> + <RegExp input="$$2" output="<chain function="GetTMDBTaglineByIdChain">$$2</chain>" dest="5+"> + <expression /> + </RegExp> <RegExp input="$$2" output="<chain function="GetTMDBCastByIdChain">$$2</chain>" dest="5+"> <expression /> </RegExp> @@ -154,12 +148,4 @@ <expression noclean="1" /> </RegExp> </ParseFallbackTMDBRuntime> - <ParseFallbackTMDBTagline dest="5"> - <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<tagline>\1</tagline>" dest="2"> - <expression fixchars="1">"tagline":"([^"]*)</expression> - </RegExp> - <expression noclean="1" /> - </RegExp> - </ParseFallbackTMDBTagline> </scraper> |