The branch, eden-pre has been updated
via 0c8e70d580bf920c1fa02342672c21904a504d9c (commit)
from 10946661aa71f8fb517868fbdfa9bb3eb7aec5d7 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=0c8e70d580bf920c1fa02342672c21904a504d9c
commit 0c8e70d580bf920c1fa02342672c21904a504d9c
Author: vdrfan <[email protected]>
Date: Fri Jul 15 12:58:27 2011 +0200
[metadata.ofdb.de] updated to version 1.1.1
diff --git a/metadata.ofdb.de/addon.xml b/metadata.ofdb.de/addon.xml
index 1c76237..90bf94b 100644
--- a/metadata.ofdb.de/addon.xml
+++ b/metadata.ofdb.de/addon.xml
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.ofdb.de"
name="OFDB"
- version="1.1.0"
+ version="1.1.1"
provider-name="Team XBMC + morte0815">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
<import addon="metadata.common.imdb.com" version="2.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.movieposterdb.com" version="1.0.4"/>
+ <import addon="plugin.video.youtube" version="2.0.3"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="de"
library="ofdb.xml"/>
<extension point="xbmc.addon.metadata">
+ <summary lang="de">OFDb.de Film Scraper</summary>
<summary lang="en">OFDb.de Movie Scraper</summary>
<summary lang="hu">OFDb.de filmadat leolvasó</summary>
<summary lang="kr">OFDb.de ìí ì¤í¬ëí¼</summary>
@@ -20,6 +22,7 @@
<summary lang="nl">OFDb.de Film Scraper</summary>
<summary lang="pl">Scraper filmów OFDb.de</summary>
<summary lang="pt">Scraper de filmes OFDb.de</summary>
+ <description lang="de">Lade Filminformation von www.ofdb.de</description>
<description lang="en">Download Movie information from
www.ofdb.de</description>
<description lang="hu">Film információk letöltése a www.ofdb.de
webhelyrÅl</description>
<description lang="kr">www.ofdb.de ìì ìí ì ë³´
ë¤ì´ë¡ë</description>
diff --git a/metadata.ofdb.de/ofdb.xml b/metadata.ofdb.de/ofdb.xml
index 1938a3b..6a6b515 100644
--- a/metadata.ofdb.de/ofdb.xml
+++ b/metadata.ofdb.de/ofdb.xml
@@ -36,7 +36,7 @@
<RegExp input="$$1"
output="<year>\1</year>" dest="5+">
<expression
noclean="1"><titel>.*?\(([0-9]*)\)</titel></expression>
</RegExp>
- <RegExp input="$$1"
output="<url>http://www.ofdb.de/film/\1,</url><id>\1</id>";
dest="5+">
+ <RegExp input="$$1" output="<url
cache="ofdb-\1.html">http://www.ofdb.de/film/\1,</url><id>\1</id>";
dest="5+">
<expression
noclean="1"><ofdbid>([^<]*)</ofdbid></expression>
</RegExp>
<expression noclean="1"/>
@@ -127,10 +127,6 @@
<RegExp input="$$1" output="<url
function="OFDbInfo">http://www.ofdb.de/view.php?page=fassung&amp;fid=\1&amp;vid=\2</url>";
dest="5+">
<expression><a
href=.view.php.page=fassung&fid=([0-9]+)&vid=([0-9]+).>Kino:</expression>
</RegExp>
- <!--URL to IMDB-->
- <RegExp input="$$1" output="<url
cache="ofdb-tt\2-imdb.html"
function="IMDB-Details">http://www.imdb.de/title/tt\2/</url>";
dest="5+">
-
<expression>(imdb.com/)Title\?([0-9]+)</expression>
- </RegExp>
<!--URL to IMDBcredits-->
<RegExp conditional="!fullcredits" input="$$1"
output="<chain
function="GetIMDBScaledCastById">tt\2</chain>" dest="5+">
<expression>(imdb.com/)Title\?([0-9]+)</expression>
@@ -150,6 +146,10 @@
<RegExp conditional="fullcredits" input="$$1"
output="<chain
function="GetIMDBFullWritersById">tt\2</chain>" dest="5+">
<expression>(imdb.com/)Title\?([0-9]+)</expression>
</RegExp>
+ <!-- TMDB Trailer-->
+ <RegExp conditional="tmdbtrailer" input="$$1"
output="<url
function="GetTMDBTrailer">http://api.themoviedb.org/2.1/Movie.imdbLookup/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/tt\2</url>";
dest="5+">
+
<expression>(imdb.com/)Title\?([0-9]+)</expression>
+ </RegExp>
<!-- TMDB Fanart-->
<RegExp conditional="tmdbfanart" input="$$1"
output="<chain
function="GetTMDBFanartByIdChain">tt\2</chain>" dest="5+">
<expression>(imdb.com/)Title\?([0-9]+)</expression>
@@ -196,30 +196,15 @@
<expression noclean="1"/>
</RegExp>
</OFDbInfo>
- <!--IMDB-Details-->
- <IMDB-Details dest="5">
- <RegExp input="$$3" output="<?xml version="1.0"
encoding="utf-8"
standalone="yes"?><details>\1</details>" dest="5">
- <RegExp input="$$1"
output="<tagline>\1</tagline>" dest="3+">
-
<expression>Werbezeile:</h5>([^<]*)<</expression>
- </RegExp>
- <RegExp conditional="trailer" input="$$1"
output="<url
function="GetTrailer">http://akas.imdb.com/video/imdb/vi\1/player</url>";
dest="3+">
- <expression>/vi([0-9]*)/"</expression>
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </IMDB-Details>
- <!-- Trailer -->
- <GetTrailer dest="5">
- <RegExp conditional="trailer" input="$$2"
output="<details><trailer
urlencoded="yes">\1</trailer></details>" dest="5">
- <RegExp input="$$1" output="\1" dest="2">
- <expression
noclean="1">"file"[^"]*"([^"]*)</expression>
- </RegExp>
- <RegExp input="$$1" output="$$2/\1" dest="2">
- <expression
noclean="1">"id"[^"]*"([^"]*)</expression>
+ <!-- TMDB Trailer -->
+ <GetTMDBTrailer dest="5">
+ <RegExp input="$$6" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="<chain
function="GetTMDBTrailerByIdChain">\1</chain>" dest="6">
+
<expression><id>([0-9]*)</id></expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
- </GetTrailer>
+ </GetTMDBTrailer>
<!-- Ofdb Poster -->
<GetOfdbThumb dest="5">
<RegExp input="$$6" output="<details>\1</details>"
dest="5">
diff --git a/metadata.ofdb.de/resources/language/English/strings.xml
b/metadata.ofdb.de/resources/language/English/strings.xml
index 361d85b..2813205 100644
--- a/metadata.ofdb.de/resources/language/English/strings.xml
+++ b/metadata.ofdb.de/resources/language/English/strings.xml
@@ -3,7 +3,7 @@
<string id="30000">Fanart (themoviedb.org)</string>
<string id="30001">Poster (themoviedb.org)</string>
<string id="30002">Poster (movieposterdb.com)</string>
- <string id="30003">Trailer</string>
+ <string id="30003">Trailer (themoviedb.org)</string>
<string id="30004">Actor thumbs size</string>
<string id="30005">Enable full cast credits</string>
</strings>
diff --git a/metadata.ofdb.de/resources/language/German/strings.xml
b/metadata.ofdb.de/resources/language/German/strings.xml
index fd99ce5..b767886 100644
--- a/metadata.ofdb.de/resources/language/German/strings.xml
+++ b/metadata.ofdb.de/resources/language/German/strings.xml
@@ -3,7 +3,7 @@
<string id="30000">Fanart (themoviedb.org)</string>
<string id="30001">Poster (themoviedb.org)</string>
<string id="30002">Poster (movieposterdb.com)</string>
- <string id="30003">Trailer</string>
+ <string id="30003">Trailer (themoviedb.org)</string>
<string id="30004">Groesse der Darsteller Bilder</string>
<string id="30005">Komplette Darsteller Liste herunterladen</string>
</strings>
diff --git a/metadata.ofdb.de/resources/language/Hungarian/strings.xml
b/metadata.ofdb.de/resources/language/Hungarian/strings.xml
index 7649020..c17a8e7 100644
--- a/metadata.ofdb.de/resources/language/Hungarian/strings.xml
+++ b/metadata.ofdb.de/resources/language/Hungarian/strings.xml
@@ -3,7 +3,7 @@
<string id="30000">Fanartkép (themoviedb.org)</string>
<string id="30001">Poszter (themoviedb.org)</string>
<string id="30002">Poszter (movieposterdb.com)</string>
- <string id="30003">FilmelÅzetesek</string>
+ <string id="30003">FilmelÅzetesek (themoviedb.org)</string>
<string id="30004">SzÃnész bélyegképek mérete</string>
<string id="30005">Teljes szereposztás engedélyezése</string>
</strings>
diff --git a/metadata.ofdb.de/resources/language/Korean/strings.xml
b/metadata.ofdb.de/resources/language/Korean/strings.xml
index d560648..84cef65 100644
--- a/metadata.ofdb.de/resources/language/Korean/strings.xml
+++ b/metadata.ofdb.de/resources/language/Korean/strings.xml
@@ -3,7 +3,7 @@
<string id="30000">í¬ìí¸ (themoviedb.org)</string>
<string id="30001">í¬ì¤í°(themoviedb.org)</string>
<string id="30002">í¬ì¤í°(movieposterdb.com)</string>
- <string id="30003">ìê³ í¸</string>
+ <string id="30003">ìê³ í¸ (themoviedb.org)</string>
<string id="30004">ë°°ì° ë¯¸ë¦¬ë³´ê¸° í¬ê¸°</string>
<string id="30005">ì ì²´ ì¶ì°ì§ ê°ì ¸ì¤ê¸°</string>
</strings>
diff --git a/metadata.ofdb.de/resources/language/Polish/strings.xml
b/metadata.ofdb.de/resources/language/Polish/strings.xml
index 554dc04..9492696 100644
--- a/metadata.ofdb.de/resources/language/Polish/strings.xml
+++ b/metadata.ofdb.de/resources/language/Polish/strings.xml
@@ -3,7 +3,7 @@
<string id="30000">Pobieraj fanart z themoviedb.org</string>
<string id="30001">Pobieraj plakaty z themoviedb.org</string>
<string id="30002">Pobieraj plakaty z movieposterdb.com</string>
- <string id="30003">Zwiastun</string>
+ <string id="30003">Zwiastun (themoviedb.org)</string>
<string id="30004">Rozmiar miniatur aktorów</string>
<string id="30005">WÅÄ
cz peÅnÄ
obsadÄ</string>
</strings>
diff --git a/metadata.ofdb.de/resources/language/Portuguese/strings.xml
b/metadata.ofdb.de/resources/language/Portuguese/strings.xml
index 8ec17db..dc5fc38 100644
--- a/metadata.ofdb.de/resources/language/Portuguese/strings.xml
+++ b/metadata.ofdb.de/resources/language/Portuguese/strings.xml
@@ -3,7 +3,7 @@
<string id="30000">Fanart (themoviedb.org)</string>
<string id="30001">Poster (themoviedb.org)</string>
<string id="30002">Poster (movieposterdb.com)</string>
- <string id="30003">Trailer</string>
+ <string id="30003">Trailer (themoviedb.org)</string>
<string id="30004">Tamanho de miniaturas de actores</string>
<string id="30005">Ligar créditos de elenco completo</string>
</strings>
diff --git a/metadata.ofdb.de/resources/settings.xml
b/metadata.ofdb.de/resources/settings.xml
index 15ac436..27cce8b 100644
--- a/metadata.ofdb.de/resources/settings.xml
+++ b/metadata.ofdb.de/resources/settings.xml
@@ -3,7 +3,8 @@
<setting label="30000" type="bool" id="tmdbfanart" default="true"/>
<setting label="30001" type="bool" id="tmdbthumbs" default="true"/>
<setting label="30002" type="bool" id="movieposterdb" default="false"/>
- <setting label="30003" type="bool" id="trailer" default="true"/>
+ <setting label="30003" type="bool" id="tmdbtrailer" default="true"/>
<setting label="30004" type="labelenum" values="192|256|384|512|1024"
id="imdbscale" default="512"/>
<setting label="30005" type="bool" id="fullcredits" default="false"/>
+ <setting label="30006" type="labelenum" values="de" id="language"
default="de" visible="false"/>
</settings>
-----------------------------------------------------------------------
Summary of changes:
metadata.ofdb.de/addon.xml | 7 +++-
metadata.ofdb.de/changelog.txt | 5 +++
metadata.ofdb.de/ofdb.xml | 37 ++++++--------------
.../resources/language/English/strings.xml | 2 +-
.../resources/language/German/strings.xml | 2 +-
.../resources/language/Hungarian/strings.xml | 2 +-
.../resources/language/Korean/strings.xml | 2 +-
.../resources/language/Polish/strings.xml | 2 +-
.../resources/language/Portuguese/strings.xml | 2 +-
metadata.ofdb.de/resources/settings.xml | 3 +-
10 files changed, 29 insertions(+), 35 deletions(-)
create mode 100644 metadata.ofdb.de/changelog.txt
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric
Ries, the creator of the Lean Startup Methodology on "Lean Startup
Secrets Revealed." This video shows you how to validate your ideas,
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
