The branch, eden has been updated
via 26694552ac8c8bf941e7c9736a3dce12193c1b74 (commit)
from 7c525e424275036e0db82818ead856e07dad7279 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=26694552ac8c8bf941e7c9736a3dce12193c1b74
commit 26694552ac8c8bf941e7c9736a3dce12193c1b74
Author: olympia <[email protected]>
Date: Sun Apr 15 20:25:54 2012 +0200
[metadata.themoviedb.org] updated to version 3.1.0
[metadata.common.themoviedb.org] added some new functions
diff --git a/metadata.common.themoviedb.org/addon.xml
b/metadata.common.themoviedb.org/addon.xml
index be0684d..265edf7 100644
--- a/metadata.common.themoviedb.org/addon.xml
+++ b/metadata.common.themoviedb.org/addon.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="metadata.common.themoviedb.org"
- name="The MovieDB common scraper functions"
- version="2.1.4"
- provider-name="Team XBMC">
- <requires>
- <import addon="xbmc.metadata" version="1.0"/>
- </requires>
- <extension point="xbmc.metadata.scraper.library"
- library="tmdb.xml"/>
- <extension point="xbmc.addon.metadata">
- <platform>all</platform>
- <minversion>20000</minversion>
- <summary lang="bg">ÐиблиоÑека за ÑвалÑне на инÑ.
Ð¾Ñ TMDb</summary>
- <summary lang="en">TMDb Scraper Library</summary>
- <summary lang="es">Scraper de peliculas de TMDb</summary>
- <summary lang="fi">TMDb elokuvatietojen lataajan kirjasto</summary>
- <summary lang="fr">Scraper TMDb</summary>
- <summary lang="hu">TMDb leolvasó-könyvtár</summary>
- <summary lang="nl">TMDb-scraperfuncties</summary>
- <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="bg">Ð¡Ð²Ð°Ð»Ñ Ð¼Ð¸Ð½Ð¸Ð°ÑÑÑи и fanarts оÑ
www.themoviedb.org</description>
- <description lang="en">Download thumbs and fanarts from
www.themoviedb.org</description>
- <description lang="es">Descarga posters y fanart de
www.themoviedb.org</description>
- <description lang="fi">Lataa pienoiskuvia ja fanitaidetta
www.themoviedb.org -sivustolta</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">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>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="metadata.common.themoviedb.org"
+ name="The MovieDB common scraper functions"
+ version="2.1.5"
+ provider-name="Team XBMC">
+ <requires>
+ <import addon="xbmc.metadata" version="1.0"/>
+ </requires>
+ <extension point="xbmc.metadata.scraper.library"
+ library="tmdb.xml"/>
+ <extension point="xbmc.addon.metadata">
+ <platform>all</platform>
+ <minversion>20000</minversion>
+ <summary lang="bg">ÐиблиоÑека за ÑвалÑне на инÑ.
Ð¾Ñ TMDb</summary>
+ <summary lang="en">TMDb Scraper Library</summary>
+ <summary lang="es">Scraper de peliculas de TMDb</summary>
+ <summary lang="fi">TMDb elokuvatietojen lataajan kirjasto</summary>
+ <summary lang="fr">Scraper TMDb</summary>
+ <summary lang="hu">TMDb leolvasó-könyvtár</summary>
+ <summary lang="nl">TMDb-scraperfuncties</summary>
+ <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="bg">Ð¡Ð²Ð°Ð»Ñ Ð¼Ð¸Ð½Ð¸Ð°ÑÑÑи и fanarts оÑ
www.themoviedb.org</description>
+ <description lang="en">Download thumbs and fanarts from
www.themoviedb.org</description>
+ <description lang="es">Descarga posters y fanart de
www.themoviedb.org</description>
+ <description lang="fi">Lataa pienoiskuvia ja fanitaidetta
www.themoviedb.org -sivustolta</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">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 a270f4c..d8e85bf 100644
--- a/metadata.common.themoviedb.org/tmdb.xml
+++ b/metadata.common.themoviedb.org/tmdb.xml
@@ -17,6 +17,31 @@
</RegExp>
</ParseTMDBCertifications>
+ <GetTMDBTitleByIdChain dest="4">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="4">
+ <RegExp input="$$1" output="<url
function="ParseTMDBTitle"
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBTitleByIdChain>
+ <GetTMDBLangTitleByIdChain dest="4">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="4">
+ <RegExp input="$$1" output="<url
function="ParseTMDBTitle"
cache="tmdb-$INFO[tmdbtitlelanguage]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[tmdbtitlelanguage]</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBLangTitleByIdChain>
+ <ParseTMDBTitle dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<title>\1</title>" dest="2">
+ <expression
fixchars="1">"title":"([^"]*)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseTMDBTitle>
+
<GetTMDBPlotByIdChain clearbuffers="no" dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
<RegExp input="$$1" output="\1" dest="8">
@@ -28,6 +53,17 @@
<expression noclean="1" />
</RegExp>
</GetTMDBPlotByIdChain>
+ <GetTMDBLangPlotByIdChain clearbuffers="no" dest="4">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="4">
+ <RegExp input="$$1" output="\1" dest="8">
+ <expression clear="yes" noclean="1" />
+ </RegExp>
+ <RegExp input="$$8" output="<url
function="ParseTMDBPlot"
cache="tmdb-$INFO[tmdbplotlanguage]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[tmdbplotlanguage]</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBLangPlotByIdChain>
<ParseTMDBPlot dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="9">
@@ -227,6 +263,14 @@
<expression noclean="1" />
</RegExp>
</GetTMDBThumbsByIdChain>
+ <GetTMDBLangThumbsByIdChain dest="4">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="4">
+ <RegExp input="$$1" output="<url
function="ParseTMDBThumbs"
cache="tmdb-images-$INFO[tmdbthumblanguage]-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[tmdbthumblanguage]</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBLangThumbsByIdChain>
<GetTMDBThumbsById dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
<RegExp input="$$1" output="<url
function="ParseTMDBThumbs"
cache="tmdb-images-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url>";
dest="5">
diff --git a/metadata.themoviedb.org/addon.xml
b/metadata.themoviedb.org/addon.xml
index 3b2d65c..6cfecc7 100644
--- a/metadata.themoviedb.org/addon.xml
+++ b/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.9"
+ version="3.1.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.themoviedb.org" version="2.1.2"/>
+ <import addon="metadata.common.themoviedb.org" version="2.1.5"/>
<import addon="metadata.common.hdtrailers.net" version="1.0.7"/>
<import addon="metadata.common.imdb.com" version="2.1.9"/>
- <import addon="plugin.video.youtube" version="2.1.4" optional="true"/>
+ <import addon="plugin.video.youtube" version="2.9.1" optional="true"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="en"
diff --git a/metadata.themoviedb.org/changelog.txt
b/metadata.themoviedb.org/changelog.txt
index 1386211..9a51136 100644
--- a/metadata.themoviedb.org/changelog.txt
+++ b/metadata.themoviedb.org/changelog.txt
@@ -1,3 +1,6 @@
+[B]3.1.0[/B]
+- updated: factored out title scraping to common library
+
[B]3.0.9[/B]
- fixed: missing language parameter name in NfoUrl
diff --git a/metadata.themoviedb.org/tmdb.xml b/metadata.themoviedb.org/tmdb.xml
index a60cf39..45445be 100644
--- a/metadata.themoviedb.org/tmdb.xml
+++ b/metadata.themoviedb.org/tmdb.xml
@@ -47,8 +47,8 @@
<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 input="$$2" output="<chain
function="GetTMDBTitleByIdChain">$$2</chain>" dest="5+">
+ <expression />
</RegExp>
<RegExp input="$$9"
output="<originaltitle>\1</originaltitle>" dest="5+">
<expression/>
-----------------------------------------------------------------------
Summary of changes:
metadata.common.themoviedb.org/addon.xml | 82 +++++++++++++++---------------
metadata.common.themoviedb.org/tmdb.xml | 44 ++++++++++++++++
metadata.themoviedb.org/addon.xml | 6 +-
metadata.themoviedb.org/changelog.txt | 3 +
metadata.themoviedb.org/tmdb.xml | 4 +-
5 files changed, 93 insertions(+), 46 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
For Developers, A Lot Can Happen In A Second.
Boundary is the first to Know...and Tell You.
Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!
http://p.sf.net/sfu/Boundary-d2dvs2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
