diff options
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/metadata.common.themoviedb.org/addon.xml | 2 | ||||
| -rw-r--r-- | addons/metadata.common.themoviedb.org/tmdb.xml | 6 | ||||
| -rw-r--r-- | addons/metadata.themoviedb.org/addon.xml | 8 | ||||
| -rw-r--r-- | addons/metadata.themoviedb.org/changelog.txt | 21 | ||||
| -rw-r--r-- | addons/metadata.themoviedb.org/tmdb.xml | 40 |
5 files changed, 36 insertions, 41 deletions
diff --git a/addons/metadata.common.themoviedb.org/addon.xml b/addons/metadata.common.themoviedb.org/addon.xml index 7cd3d85820..252d868303 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.1.0" + version="2.1.2" 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 ee000716d6..8390acfcaa 100644 --- a/addons/metadata.common.themoviedb.org/tmdb.xml +++ b/addons/metadata.common.themoviedb.org/tmdb.xml @@ -39,9 +39,6 @@ <RegExp input="$$9" output="<plot>\1</plot>" dest="2"> <expression>(.+)</expression> </RegExp> - <RegExp input="$$1" output="<outline>\1</outline>" dest="2+"> - <expression fixchars="1">"overview":"(.{180,}?)[.?!]</expression> - </RegExp> <expression noclean="1" /> </RegExp> </ParseTMDBPlot> @@ -50,9 +47,6 @@ <RegExp input="$$1" output="<plot>\1</plot>" dest="2"> <expression clear="yes" fixchars="1">"overview":"(.*?)",</expression> </RegExp> - <RegExp input="$$1" output="<outline>\1</outline>" dest="2+"> - <expression fixchars="1">"overview":"(.{180,}?)[.?!]</expression> - </RegExp> <expression noclean="1" /> </RegExp> </ParseFallbackTMDBPlot> diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index add0461534..3b2d65ca76 100644 --- a/addons/metadata.themoviedb.org/addon.xml +++ b/addons/metadata.themoviedb.org/addon.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.themoviedb.org" name="The MovieDB" - version="3.0.2" + version="3.0.9" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> - <import addon="metadata.common.themoviedb.org" version="2.1.0"/> + <import addon="metadata.common.themoviedb.org" version="2.1.2"/> <import addon="metadata.common.hdtrailers.net" version="1.0.7"/> - <import addon="metadata.common.imdb.com" version="2.1.5"/> - <import addon="plugin.video.youtube" version="2.1.0" optional="true"/> + <import addon="metadata.common.imdb.com" version="2.1.9"/> + <import addon="plugin.video.youtube" version="2.1.4" optional="true"/> </requires> <extension point="xbmc.metadata.scraper.movies" language="en" diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index ad99a7687c..1386211adc 100644 --- a/addons/metadata.themoviedb.org/changelog.txt +++ b/addons/metadata.themoviedb.org/changelog.txt @@ -1,3 +1,24 @@ +[B]3.0.9[/B] +- fixed: missing language parameter name in NfoUrl + +[B]3.0.8[/B] +- fixed: movies without release date won't find + +[B]3.0.7[/B] +- fixed: keep originaltitle; IMDb ID; remove TMDb title fallback, because it became obsolate + +[B]3.0.6[/B] +- updated chinese translation + +[B]3.0.5[/B] +- reverted latest change + +[B]3.0.4[/B] +- added: option to not scrape sets + +[B]3.0.3[/B] +- fixed: plot outline includes trash on some movies + [B]3.0.2[/B] - fixed: imdb IDs not properly handled diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml index ae478630d3..a60cf39580 100644 --- a/addons/metadata.themoviedb.org/tmdb.xml +++ b/addons/metadata.themoviedb.org/tmdb.xml @@ -9,13 +9,13 @@ </RegExp> </CreateSearchUrl> <NfoUrl dest="3"> - <RegExp input="$$1" output="<details><url>http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&$INFO[language]</url><id>\2</id></details>" dest="3"> + <RegExp input="$$1" output="<details><url>http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url><id>\2</id></details>" dest="3"> <expression clear="yes" noclean="1">(themoviedb.org/movie/)([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<details><url>http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&$INFO[language]</url><id>tt\1</id></details>" dest="3"> + <RegExp input="$$1" output="<details><url>http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url><id>tt\1</id></details>" dest="3"> <expression>imdb....?/title/tt([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<details><url>http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&$INFO[language]</url><id>tt\1</id></details>" dest="3"> + <RegExp input="$$1" output="<details><url>http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url><id>tt\1</id></details>" dest="3"> <expression>imdb....?/Title\?([0-9]*)</expression> </RegExp> </NfoUrl> @@ -27,6 +27,9 @@ <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&language=$INFO[language]</url></entity>" dest="3+"> <expression repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":"([0-9]+)-</expression> </RegExp> + <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&language=$INFO[language]</url></entity>" dest="3+"> + <expression repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":null</expression> + </RegExp> <expression noclean="1" /> </RegExp> </GetSearchResults> @@ -35,24 +38,18 @@ <RegExp input="$$1" output="<id>\1</id>" dest="5"> <expression noclean="1">"id":([0-9]*),"imdb</expression> </RegExp> - <RegExp input="$$1" output="<id>tt\1</id>" dest="5+"> + <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="9"> <expression fixchars="1">"original_title":"([^"]*)</expression> </RegExp> - <RegExp input="$$1" output="\1" dest="10"> - <expression fixchars="1">"title":"([^"]*)</expression> - </RegExp> - <RegExp input="$$10" output="<url function="ParseFallbackTMDBTitle" cache="tmdb-en-$$2.json">http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&language=en</url>" dest="5+"> - <expression>^$</expression> - </RegExp> - <RegExp input="$$10" output="<title>\1</title>" dest="5+"> - <expression>(.+)</expression> - </RegExp> <RegExp conditional="keeporiginaltitle" input="$$9" output="<title>\1</title>" dest="5+"> <expression/> </RegExp> + <RegExp input="$$1" output="<title>\1</title>" dest="5+"> + <expression fixchars="1">"title":"([^"]*)</expression> + </RegExp> <RegExp input="$$9" output="<originaltitle>\1</originaltitle>" dest="5+"> <expression/> </RegExp> @@ -149,23 +146,6 @@ <expression noclean="1" /> </RegExp> </GetDetails> - <ParseFallbackTMDBTitle dest="5"> - <RegExp input="$$10" output="<details><title>\1</title></details>" dest="5"> - <RegExp input="$$1" output="\1" dest="11"> - <expression clear="yes" fixchars="1">"original_title":"([^"]*)</expression> - </RegExp> - <RegExp input="$$11" output="\1" dest="10"> - <expression>(.+)</expression> - </RegExp> - <RegExp input="$$1" output="\1" dest="11"> - <expression fixchars="1">"title":"([^"]*)</expression> - </RegExp> - <RegExp input="$$11" output="\1" dest="10"> - <expression>(.+)</expression> - </RegExp> - <expression noclean="1" /> - </RegExp> - </ParseFallbackTMDBTitle> <ParseFallbackTMDBRuntime dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<runtime>\1</runtime>" dest="2"> |