From 1bfda8c792a10d5833bee9a82c446a05b455074e Mon Sep 17 00:00:00 2001 From: spiff_ Date: Tue, 22 Jun 2010 09:24:58 +0000 Subject: [PATCH] sync with git git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@31296 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 --- addons/metadata.common.dtrailer.com/addon.xml | 23 -------- addons/metadata.common.dtrailer.com/dtrailer.xml | 20 ------- addons/metadata.common.hdtrailers.net/addon.xml | 21 ++++++++ .../metadata.common.hdtrailers.net/hdtrailers.xml | 62 ++++++++++++++++++++++ addons/metadata.themoviedb.org/addon.xml | 5 +- addons/metadata.themoviedb.org/changelog.txt | 3 ++ .../language/Chinese (Simple)/strings.xml | 2 +- .../resources/language/English/strings.xml | 2 +- .../resources/language/Hungarian/strings.xml | 2 +- .../resources/language/Korean/strings.xml | 2 +- .../resources/language/Portuguese/strings.xml | 2 +- .../metadata.themoviedb.org/resources/settings.xml | 2 +- addons/metadata.themoviedb.org/tmdb.xml | 25 ++++++--- 13 files changed, 113 insertions(+), 58 deletions(-) delete mode 100644 addons/metadata.common.dtrailer.com/addon.xml delete mode 100644 addons/metadata.common.dtrailer.com/dtrailer.xml create mode 100644 addons/metadata.common.hdtrailers.net/addon.xml create mode 100644 addons/metadata.common.hdtrailers.net/hdtrailers.xml diff --git a/addons/metadata.common.dtrailer.com/addon.xml b/addons/metadata.common.dtrailer.com/addon.xml deleted file mode 100644 index ee75bc1..0000000 --- a/addons/metadata.common.dtrailer.com/addon.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - all - 20000 - DTrailer Scraper Library - Dtrailer scraper könyvtár - DTralier Scraper Collectie - Biblioteca de trailers DTrailer - Download trailers from en.dtrailer.com - Filmelőzetesek letöltése a www.themoviedb.org webhelyről. - Download trailers van en.dtrailer.com - Descarregar trailers de en.dtrailer.com - - diff --git a/addons/metadata.common.dtrailer.com/dtrailer.xml b/addons/metadata.common.dtrailer.com/dtrailer.xml deleted file mode 100644 index ee5705a..0000000 --- a/addons/metadata.common.dtrailer.com/dtrailer.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - <a href="http://en.dtrailer.com/movies/watch/(/?[^\>]+)" class="thumb" title="(/?[^\>]+)"> - - - - - - - s1\.addVariable\("file","(/?[^\>]+).flv"\); - - - diff --git a/addons/metadata.common.hdtrailers.net/addon.xml b/addons/metadata.common.hdtrailers.net/addon.xml new file mode 100644 index 0000000..947a02d --- /dev/null +++ b/addons/metadata.common.hdtrailers.net/addon.xml @@ -0,0 +1,21 @@ + + + + + + + + HD-Trailers.net Scraper Library + HD-Trailers.net Scraper Könyvtár + HD-Trailers.net Scraper Collectie + Download Movie Trailers from www.hd-trailers.net + Filmelőzetesek letöltése a www.hd-trailers.net-ről. + Download trailers van www.hd-trailers.net + 20000 + all + + diff --git a/addons/metadata.common.hdtrailers.net/hdtrailers.xml b/addons/metadata.common.hdtrailers.net/hdtrailers.xml new file mode 100644 index 0000000..5adc113 --- /dev/null +++ b/addons/metadata.common.hdtrailers.net/hdtrailers.xml @@ -0,0 +1,62 @@ + + + + + (.*) + + + + + + + + (.*) + + + + + + + + (.*) + + + + + + + + sid=(\d*)">480p</a> + + + + + + + sid=(\d*)">480p</a> + + + + sid=(\d*)">720p</a> + + + + + + + + + sid=(\d*)">480p</a> + + + + sid=(\d*)">720p</a> + + + + sid=(\d*)">1080p</a> + + + + + diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index 7ed0f3d..69c7ec7 100644 --- a/addons/metadata.themoviedb.org/addon.xml +++ b/addons/metadata.themoviedb.org/addon.xml @@ -1,22 +1,25 @@ - + TMDB Movie Scraper + TMDB Film scraper TMDB Film Scraper Scraper de filmes TMDb TMDB电影刮削器 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. + 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. 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. 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. themoviedb.org是一个开放和自由的电影数据库。它完全由象你一样的用户来掌控。TMDb每月为上百万用户提供服务，并通过强大的API界面为许多流行的媒体中心系统如XBMC提供电影资料、封面海报和同人画以丰富用户的体验。 diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index 8d00e83..f5fd93a 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 0094a30..247c657 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 @@  启用同人画 - 启用Dtrailer.com预告片 + 启用HD-Trailers.net预告片 diff --git a/addons/metadata.themoviedb.org/resources/language/English/strings.xml b/addons/metadata.themoviedb.org/resources/language/English/strings.xml index 5d297d2..0714b9e 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 @@ Enable Fanart - Enable Trailers from Dtrailer.com + Enable Trailers from HD-Trailers.net diff --git a/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml index 964c6a5..32e58db 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 @@  Fanart engedélyezése - Trailer letöltés engedélyezése a Dtrailer.com-ról + Trailer letöltés engedélyezése a HD-Trailers.net-ről \ 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 e373a11..b4e20f5 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 @@ 팬아트 사용 - Dtrailer.com 에서 예고편 가져오기 + HD-Trailers.net 에서 예고편 가져오기 diff --git a/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.xml b/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.xml index a9a6228..5e76d68 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 @@ Ligar Fanart - Ligar trailers de Dtrailer.com + Ligar trailers de HD-Trailers.net diff --git a/addons/metadata.themoviedb.org/resources/settings.xml b/addons/metadata.themoviedb.org/resources/settings.xml index f0146c6..eb49294 100644 --- a/addons/metadata.themoviedb.org/resources/settings.xml +++ b/addons/metadata.themoviedb.org/resources/settings.xml @@ -1,5 +1,5 @@ - + diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml index d6e443d..9e336ed 100644 --- a/addons/metadata.themoviedb.org/tmdb.xml +++ b/addons/metadata.themoviedb.org/tmdb.xml @@ -88,14 +88,23 @@ - - - - <name>([^<]*)</name> - - ([a-zA-Z0-9]+) - - + + + <name>([^<]*)</name> + + 480p + + + + <name>([^<]*)</name> + + 720p + + + + <name>([^<]*)</name> + + 1080p -- 2.7.4