The branch, eden-pre has been updated
via 50505d997d3ab655108131b508bfb74a0e7d7a8b (commit)
from 4d692585d382aa2ed4b0122a4436a939d5cfbd1d (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=50505d997d3ab655108131b508bfb74a0e7d7a8b
commit 50505d997d3ab655108131b508bfb74a0e7d7a8b
Author: olympia <[email protected]>
Date: Wed Apr 27 12:11:12 2011 +0200
[metadata.themoviedb.org] added trailer scraping from TMDB via youtube
plugin
diff --git a/metadata.common.themoviedb.org/addon.xml
b/metadata.common.themoviedb.org/addon.xml
index 515aa62..196449f 100644
--- a/metadata.common.themoviedb.org/addon.xml
+++ b/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="1.0.7"
+ version="1.1.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -15,19 +15,23 @@
<summary lang="es">Scraper de peliculas de TMDb</summary>
<summary lang="fr">Scraper TMDb</summary>
<summary lang="hu">TMDb leolvasó-könyvtár</summary>
- <summary lang="nl">TMDb Scraper Collectie</summary>
+ <summary lang="nl">TMDb-scraperfuncties</summary> <!--Dit
gaat over de functies, niet over de mediabibliotheek!-->
<summary lang="pl">Scraper biblioteki TMDb</summary>
<summary lang="pt">Scraper de filmes TMDb</summary>
+ <summary lang="ro">BibliotecÄ catalog TMDb</summary>
<summary lang="ru">ÐбÑабоÑÑик Ð´Ð»Ñ TMDb</summary>
+ <summary lang="se">Skrapebibliotek för TMDb</summary>
<summary lang="zh">TMDbå®åå¨ä»£ç åº</summary>
<description lang="en">Download thumbs and fanarts from
www.themoviedb.org</description>
- <description lang="es">Descarga información, posters y fanart de
www.themoviedb.org</description>
+ <description lang="es">Descarga posters y fanart de
www.themoviedb.org</description>
<description lang="fr">Télécharge vignettes et backdrops depuis
www.themoviedb.org</description>
<description lang="hu">Bélyeg- és fanartképek letöltése a
www.themoviedb.org webhelyrÅl</description>
- <description lang="nl">Download afbeeldingen en fanart van
www.themoviedb.org</description>
- <description lang="pl">Pobieraj ikony i fanart z
www.themoviedb.org</description>
+ <description lang="nl">Miniaturen en fanart ophalen van
www.themoviedb.org</description>
+ <description lang="pl">Pobieraj ikony i fanarty z
www.themoviedb.org</description>
<description lang="pt">Descarregar informação de filmes de
www.themoviedb.org</description>
+ <description lang="ro">DescÄrcaÈi miniaturi Èi imagini realizate de
fani de pe www.themoviedb.org</description>
<description lang="ru">ÐагÑÑжаÑÑ Ð¼Ð¸Ð½Ð¸Ð°ÑÑÑÑ Ð¸
ÑанаÑÑ Ñ www.themoviedb.org</description>
+ <description lang="se">Ladda ner miniatyrer och fanart från
www.themoviedb.org</description>
<description
lang="zh">ä»www.themoviedb.orgä¸è½½æµ·æ¥åå人ç»</description>
</extension>
</addon>
diff --git a/metadata.common.themoviedb.org/tmdb.xml
b/metadata.common.themoviedb.org/tmdb.xml
index cbf50d0..c9b775b 100644
--- a/metadata.common.themoviedb.org/tmdb.xml
+++ b/metadata.common.themoviedb.org/tmdb.xml
@@ -1,4 +1,20 @@
<scraperfunctions>
+ <GetTMDBTrailerByIdChain dest="4">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="4">
+ <RegExp input="$$1" output="<url
function="ParseTMDBTrailer"
cache="tmdb-$INFO[language]-\1.xml">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
+ <expression>^([0-9]+)$</expression>
+ </RegExp>
+ <expression noclean="1"/>
+ </RegExp>
+ </GetTMDBTrailerByIdChain>
+ <ParseTMDBTrailer dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<trailer>plugin://plugin.video.youtube/?action=play_video&videoid=\1</trailer>"
dest="2">
+ <expression
noclean="1"><trailer>.*?youtube.com/watch\?v=([^<]*)</trailer></expression>
+ </RegExp>
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ </ParseTMDBTrailer>
<GetTMDBFanartByIdChain dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
<RegExp input="$$1" output="<url
function="ParseTMDBFanart"
cache="tmdb-images-tt\1.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/tt\1</url>";
dest="5">
diff --git a/metadata.themoviedb.org/addon.xml
b/metadata.themoviedb.org/addon.xml
index 27736d8..99372ea 100644
--- a/metadata.themoviedb.org/addon.xml
+++ b/metadata.themoviedb.org/addon.xml
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.themoviedb.org"
name="The MovieDB"
- version="1.3.1"
+ version="1.4.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.themoviedb.org" version="1.0.7"/>
+ <import addon="metadata.common.themoviedb.org" version="1.1.0"/>
<import addon="metadata.common.hdtrailers.net" version="1.0.6"/>
<import addon="metadata.common.imdb.com" version="2.0.8"/>
+ <import addon="plugin.video.youtube" version="2.0.3"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="en"
diff --git a/metadata.themoviedb.org/changelog.txt
b/metadata.themoviedb.org/changelog.txt
index 3492dd1..bd83d3e 100644
--- a/metadata.themoviedb.org/changelog.txt
+++ b/metadata.themoviedb.org/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.4.0[/B]
+- added: trailer scraping from TMDB via youtube plugin
+
[B]1.3.1[/B]
- fixed: added year to search string properly
diff --git a/metadata.themoviedb.org/resources/language/English/strings.xml
b/metadata.themoviedb.org/resources/language/English/strings.xml
index 0030780..026e1dc 100644
--- a/metadata.themoviedb.org/resources/language/English/strings.xml
+++ b/metadata.themoviedb.org/resources/language/English/strings.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
<string id="30000">Enable Fanart</string>
- <string id="30001">Enable Trailers from HD-Trailers.net</string>
+ <string id="30004">Enable Trailer</string>
+ <string id="30001">Prefer Trailer from HD-Trailers.net</string>
<string id="30002">Preferred language</string>
<string id="30003">Get rating from IMDb</string>
</strings>
diff --git a/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
b/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
index f1e947f..ff8a1cd 100644
--- a/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
+++ b/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
<string id="30000">Fanartképek engedélyezése</string>
- <string id="30001">FilmelÅzetesek a HD-Trailers.net-rÅl</string>
+ <string id="30004">FilmelÅzetesek engedélyezése</string>
+ <string id="30001">FilmelÅzetesek inkább a HD-Trailers.net-rÅl</string>
<string id="30002">Preferált nyelv</string>
<string id="30003">Ãrtékelés az IMDb-rÅl</string>
</strings>
diff --git a/metadata.themoviedb.org/resources/settings.xml
b/metadata.themoviedb.org/resources/settings.xml
index eb35274..871115c 100644
--- a/metadata.themoviedb.org/resources/settings.xml
+++ b/metadata.themoviedb.org/resources/settings.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<settings>
<setting label="30000" type="bool" id="fanart" default="true"/>
- <setting label="30001" type="labelenum" values="No|480p|720p|1080p"
id="TrailerQ" default="480p"/>
+ <setting label="30004" type="bool" id="trailer" default="true"/>
+ <setting label="30001" type="labelenum" values="No|480p|720p|1080p"
id="TrailerQ" default="No"/>
<setting label="30002" type="labelenum"
values="da|fi|nl|de|it|es|fr|pl|hu|el|tr|ru|he|ja|pt|zh|cs|sl|hr|ko|en|sv|no"
id="language" default="en"/>
<setting label="30003" type="bool" id="imdbrating" default="false"/>
</settings>
diff --git a/metadata.themoviedb.org/tmdb.xml b/metadata.themoviedb.org/tmdb.xml
index 6ab67e9..31f6f4b 100644
--- a/metadata.themoviedb.org/tmdb.xml
+++ b/metadata.themoviedb.org/tmdb.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2011-04-15">
+<scraper framework="1.1" date="2011-04-25">
<CreateSearchUrl dest="3">
<RegExp input="$$1"
output="<url>http://api.themoviedb.org/2.1/Movie.search/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\1$$4</url>";
dest="3">
<RegExp input="$$2" output="+\1" dest="4">
@@ -106,6 +106,9 @@
<RegExp conditional="fanart" input="$$2"
output="<chain
function="GetTMDBFanartByIdChain">$$2</chain>" dest="5+">
<expression/>
</RegExp>
+ <RegExp conditional="trailer" input="$$2"
output="<chain
function="GetTMDBTrailerByIdChain">$$2</chain>" dest="5+">
+ <expression/>
+ </RegExp>
<RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet480p">$$6</chain>" dest="5+">
<RegExp input="$$1" output="\1" dest="6">
<expression
noclean="1"><original_name>([^<]*)</original_name></expression>
-----------------------------------------------------------------------
Summary of changes:
metadata.common.themoviedb.org/addon.xml | 14 +++++++++-----
metadata.common.themoviedb.org/tmdb.xml | 16 ++++++++++++++++
metadata.themoviedb.org/addon.xml | 5 +++--
metadata.themoviedb.org/changelog.txt | 3 +++
.../resources/language/English/strings.xml | 3 ++-
.../resources/language/Hungarian/strings.xml | 3 ++-
metadata.themoviedb.org/resources/settings.xml | 3 ++-
metadata.themoviedb.org/tmdb.xml | 5 ++++-
8 files changed, 41 insertions(+), 11 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
