diff options
13 files changed, 113 insertions, 58 deletions
diff --git a/addons/metadata.common.dtrailer.com/addon.xml b/addons/metadata.common.dtrailer.com/addon.xml deleted file mode 100644 index ee75bc18ae..0000000000 --- a/addons/metadata.common.dtrailer.com/addon.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<addon id="metadata.common.dtrailer.com" - name="DTrailer common scraper functions" - version="1.0.1" - provider-name="Team XBMC"> - <requires> - <import addon="xbmc.metadata" version="1.0"/> - </requires> - <extension point="xbmc.metadata.scraper.library" - library="dtrailer.xml"/> - <extension point="xbmc.addon.metadata"> - <platform>all</platform> - <minversion>20000</minversion> - <summary lang="en">DTrailer Scraper Library</summary> - <summary lang="hu">Dtrailer scraper könyvtár</summary> - <summary lang="nl">DTralier Scraper Collectie</summary> - <summary lang="pt">Biblioteca de trailers DTrailer</summary> - <description lang="en">Download trailers from en.dtrailer.com</description> - <description lang="hu">Filmelőzetesek letöltése a www.themoviedb.org webhelyről.</description> - <description lang="nl">Download trailers van en.dtrailer.com</description> - <description lang="pt">Descarregar trailers de en.dtrailer.com</description> - </extension> -</addon> diff --git a/addons/metadata.common.dtrailer.com/dtrailer.xml b/addons/metadata.common.dtrailer.com/dtrailer.xml deleted file mode 100644 index ee5705a494..0000000000 --- a/addons/metadata.common.dtrailer.com/dtrailer.xml +++ /dev/null @@ -1,20 +0,0 @@ -<scraperfunctions> - <GetDTrailer dest="3"> - <RegExp input="$$1" dest="3" output="<details><url function="GetDTrailerLink">http://en.dtrailer.com/movies/search/\1</url></details>"> - <expression/> - </RegExp> - </GetDTrailer> - <GetDTrailerLink dest="3"> - <RegExp input="$$5" dest="3" output="<details>\1</details>"> - <RegExp input="$$1" dest="5" output="<url function="ParseDTrailer">http://en.dtrailer.com/movies/watch/\1</url>"> - <expression><a href="http://en.dtrailer.com/movies/watch/(/?[^\>]+)" class="thumb" title="(/?[^\>]+)"></expression> - </RegExp> - <expression noclean="1"/> - </RegExp> - </GetDTrailerLink> - <ParseDTrailer dest="5"> - <RegExp input="$$1" output="<details><trailer>http://www.dtrailer.com/dupload/trailerz/\1.flv</trailer></details>" dest="5"> - <expression noclean="1">s1\.addVariable\("file","(/?[^\>]+).flv"\);</expression> - </RegExp> - </ParseDTrailer> -</scraperfunctions> diff --git a/addons/metadata.common.hdtrailers.net/addon.xml b/addons/metadata.common.hdtrailers.net/addon.xml new file mode 100644 index 0000000000..947a02d064 --- /dev/null +++ b/addons/metadata.common.hdtrailers.net/addon.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<addon id="metadata.common.hdtrailers.net" + name="HD-Trailers common scraper functions" + version="1.0.1" + provider-name="Bence Nádas (olympia)"> + <requires> + <import addon="xbmc.metadata" version="1.0"/> + </requires> + <extension point="xbmc.metadata.scraper.library" + library="hdtrailers.xml"/> + <extension point="xbmc.addon.metadata"> + <summary lang="en">HD-Trailers.net Scraper Library</summary> + <summary lang="hu">HD-Trailers.net Scraper Könyvtár</summary> + <summary lang="nl">HD-Trailers.net Scraper Collectie</summary> + <description lang="en">Download Movie Trailers from www.hd-trailers.net</description> + <description lang="hu">Filmelőzetesek letöltése a www.hd-trailers.net-ről.</description> + <description lang="nl">Download trailers van www.hd-trailers.net</description> + <minversion>20000</minversion> + <platform>all</platform> + </extension> +</addon> diff --git a/addons/metadata.common.hdtrailers.net/hdtrailers.xml b/addons/metadata.common.hdtrailers.net/hdtrailers.xml new file mode 100644 index 0000000000..5adc11348f --- /dev/null +++ b/addons/metadata.common.hdtrailers.net/hdtrailers.xml @@ -0,0 +1,62 @@ +<scraperfunctions> + <GetHDTrailersnet480p dest="3"> + <RegExp input="$$6" output="<details><url function="Parse480pTrailer">http://www.hd-trailers.net/blog/?s="\1%20%28Theatrical%20Trailer%29%22</url</details>" dest="3"> + <RegExp input="$$1" output="\1" dest="6"> + <expression noclean="1" fixchars="1" trim="1" encode="1">(.*)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetHDTrailersnet480p> + <GetHDTrailersnet720p dest="3"> + <RegExp input="$$6" output="<details><url function="Parse720pTrailer">http://www.hd-trailers.net/blog/?s="\1%20%28Theatrical%20Trailer%29%22</url</details>" dest="3"> + <RegExp input="$$1" output="\1" dest="6"> + <expression noclean="1" fixchars="1" trim="1" encode="1">(.*)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetHDTrailersnet720p> + <GetHDTrailersnet1080p dest="3"> + <RegExp input="$$6" output="<details><url function="Parse1080pTrailer">http://www.hd-trailers.net/blog/?s="\1%20%28Theatrical%20Trailer%29%22</url</details>" dest="3"> + <RegExp input="$$1" output="\1" dest="6"> + <expression noclean="1" fixchars="1" trim="1" encode="1">(.*)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetHDTrailersnet1080p> + <Parse480pTrailer dest="5"> + <!--Fetch 480p trailer link from hdtrailers.net--> + <RegExp input="$$1" output="<details><trailer>http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\1</trailer></details>" dest="5"> + <expression noclean="1">sid=(\d*)">480p</a></expression> + </RegExp> + </Parse480pTrailer> + <Parse720pTrailer dest="5"> + <RegExp input="$$6" output="<details><trailer>\1</trailer></details>" dest="5"> + <!--Fallback to fetch 480p trailer link if 720p is not available--> + <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\1" dest="6"> + <expression noclean="1">sid=(\d*)">480p</a></expression> + </RegExp> + <!--Fetch 720p trailer link from hdtrailers.net--> + <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\1" dest="6"> + <expression noclean="1">sid=(\d*)">720p</a></expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </Parse720pTrailer> + <Parse1080pTrailer dest="5"> + <RegExp input="$$6" output="<details><trailer>\1</trailer></details>" dest="5"> + <!--Fallback to fetch 480p trailer link if 720p and 1080p are not available--> + <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\1" dest="6"> + <expression noclean="1">sid=(\d*)">480p</a></expression> + </RegExp> + <!--Fallback to fetch 720p trailer link if 1080p is not available--> + <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\1" dest="6"> + <expression noclean="1">sid=(\d*)">720p</a></expression> + </RegExp> + <!--Fetch 1080p trailer link from hdtrailers.net--> + <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\1" dest="6"> + <expression noclean="1">sid=(\d*)">1080p</a></expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </Parse1080pTrailer> +</scraperfunctions> diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index 7ed0f3d382..69c7ec70ce 100644 --- a/addons/metadata.themoviedb.org/addon.xml +++ b/addons/metadata.themoviedb.org/addon.xml @@ -1,22 +1,25 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.themoviedb.org" name="The MovieDB" + version="1.0.4" version="1.0.3" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> <import addon="metadata.common.themoviedb.org" version="1.0.1"/> - <import addon="metadata.common.dtrailer.com" version="1.0.1"/> + <import addon="metadata.common.hdtrailers.net" version="1.0.1"/> </requires> <extension point="xbmc.metadata.scraper.movies" language="en" library="tmdb.xml"/> <extension point="xbmc.addon.metadata"> <summary lang="en">TMDB Movie Scraper</summary> + <summary lang="hu">TMDB Film scraper</summary> <summary lang="nl">TMDB Film Scraper</summary> <summary lang="pt">Scraper de filmes TMDb</summary> <summary lang="zh">TMDB电影刮削器</summary> <description lang="en">themoviedb.org is a free and open movie database. It's completely user driven by people like you. TMDb is currently used by millions of people every month and with their powerful API, it is also used by many popular media centers like XBMC to retrieve Movie Metadata, Posters and Fanart to enrich the user's experience.</description> + <description lang="hu">A themoviedb.org egy ingyenes és nyílt filmadatbázis. Teljes egészében a olyan felhasználók töltik fel, mint például Te. A TMDb-t havonta emberek milliói használják és a hatékony API-n keresztül számos népszerű média center is, mint például az XBMC a filmadatok, poszterek, fanartok letöltésére.</description> <description lang="nl">themoviedb.org is een vrije en open film databank. Het wordt compleet aangedreven door gebruikers zoals jezelf. TMDb wordt momenteel maandelijks gebruikt door miljoenen mensen. Hun krachtige API maakt het voor mediaspelers zoals XBMC mogelijk om voor een film bijkomende informatie, posters en fanarts op te halen.</description> <description lang="pt">O themoviedb.org é uma base de dados de filmes livre e aberta. É completamente actualizado por pessoas como você e usado por milhões todos os meses. Com o poderoso motor de busca disponível, também se tornou no favorito de muitos softwares média center, como o popular XBMC, para obter informação, posters e fanart que enriquecem a experiência do utilizador.</description> <description lang="zh">themoviedb.org是一个开放和自由的电影数据库。它完全由象你一样的用户来掌控。TMDb每月为上百万用户提供服务，并通过强大的API界面为许多流行的媒体中心系统如XBMC提供电影资料、封面海报和同人画以丰富用户的体验。</description> diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index 8d00e83f34..f5fd93a45c 100644 --- a/addons/metadata.themoviedb.org/changelog.txt +++ b/addons/metadata.themoviedb.org/changelog.txt @@ -1,3 +1,6 @@ +[B]1.0.4[/B] +- replace dtrailer.com with HD-Trailers.net for trailer scraping + [B]1.0.3[/B] - scraper library interfaces changed. no functional changes diff --git a/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml b/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml index 0094a30c16..247c657fd7 100644 --- a/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <strings> <string id="30000">启用同人画</string> - <string id="30001">启用Dtrailer.com预告片</string> + <string id="30001">启用HD-Trailers.net预告片</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/English/strings.xml b/addons/metadata.themoviedb.org/resources/language/English/strings.xml index 5d297d209e..0714b9ef87 100644 --- a/addons/metadata.themoviedb.org/resources/language/English/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/English/strings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <strings> <string id="30000">Enable Fanart</string> - <string id="30001">Enable Trailers from Dtrailer.com</string> + <string id="30001">Enable Trailers from HD-Trailers.net</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml index 964c6a5dc7..32e58db7a7 100644 --- a/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <strings> <string id="30000">Fanart engedélyezése</string> - <string id="30001">Trailer letöltés engedélyezése a Dtrailer.com-ról</string> + <string id="30001">Trailer letöltés engedélyezése a HD-Trailers.net-ről</string> </strings>
\ No newline at end of file diff --git a/addons/metadata.themoviedb.org/resources/language/Korean/strings.xml b/addons/metadata.themoviedb.org/resources/language/Korean/strings.xml index e373a110cc..b4e20f5c74 100644 --- a/addons/metadata.themoviedb.org/resources/language/Korean/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Korean/strings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <strings> <string id="30000">팬아트 사용</string> - <string id="30001">Dtrailer.com 에서 예고편 가져오기</string> + <string id="30001">HD-Trailers.net 에서 예고편 가져오기</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.xml b/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.xml index a9a622873d..5e76d6801a 100644 --- a/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <strings> <string id="30000">Ligar Fanart</string> - <string id="30001">Ligar trailers de Dtrailer.com</string> + <string id="30001">Ligar trailers de HD-Trailers.net</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/settings.xml b/addons/metadata.themoviedb.org/resources/settings.xml index f0146c6730..eb49294e16 100644 --- a/addons/metadata.themoviedb.org/resources/settings.xml +++ b/addons/metadata.themoviedb.org/resources/settings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <settings> <setting label="30000" type="bool" id="fanart" default="true"/> - <setting label="30001" type="bool" id="dtrailer" default="false"/> + <setting label="30001" type="labelenum" values="No|480p|720p|1080p" id="TrailerQ" default="480p"/> </settings> diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml index d6e443d96b..9e336ed07f 100644 --- a/addons/metadata.themoviedb.org/tmdb.xml +++ b/addons/metadata.themoviedb.org/tmdb.xml @@ -88,14 +88,23 @@ <RegExp conditional="fanart" input="$$1" output="<url cache="tmdb-$$2.xml" function="GetTMDBFanartById">$$3</url>" dest="5+"> <expression/> </RegExp> - <RegExp conditional="dtrailer" input="$$6" output="<chain function="GetDTrailer">\1</chain>" dest="5+"> - <RegExp input="$$4" output="\1-" dest="6"> - <RegExp input="$$1" output="\1" dest="4"> - <expression><name>([^<]*)</name></expression> - </RegExp> - <expression repeat="yes">([a-zA-Z0-9]+)</expression> - </RegExp> - <expression/> + <RegExp input="$INFO[TrailerQ]" output="<chain function="GetHDTrailersnet480p">$$6</chain>" dest="5+"> + <RegExp input="$$1" output="\1" dest="6"> + <expression noclean="1"><name>([^<]*)</name></expression> + </RegExp> + <expression>480p</expression> + </RegExp> + <RegExp input="$INFO[TrailerQ]" output="<chain function="GetHDTrailersnet720p">$$6</chain>" dest="5+"> + <RegExp input="$$1" output="\1" dest="6"> + <expression noclean="1"><name>([^<]*)</name></expression> + </RegExp> + <expression>720p</expression> + </RegExp> + <RegExp input="$INFO[TrailerQ]" output="<chain function="GetHDTrailersnet1080p">$$6</chain>" dest="5+"> + <RegExp input="$$1" output="\1" dest="6"> + <expression noclean="1"><name>([^<]*)</name></expression> + </RegExp> + <expression>1080p</expression> </RegExp> <expression noclean="1"/> </RegExp> |