The branch, frodo has been updated
via d12b6eaee3523f635aee47a5e838bf3aaf5086a9 (commit)
from b0b900a31fb32de512261cda6d7eada2d18c7fe4 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=d12b6eaee3523f635aee47a5e838bf3aaf5086a9
commit d12b6eaee3523f635aee47a5e838bf3aaf5086a9
Author: olympia <[email protected]>
Date: Sat Nov 17 15:51:40 2012 +0100
[metadata.themoviedb.org] updated to version 3.6.0
diff --git a/metadata.common.themoviedb.org/addon.xml
b/metadata.common.themoviedb.org/addon.xml
index 1d5f1b3..0a7fb44 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="2.6.0"
+ version="2.7.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.themoviedb.org/tmdb.xml
b/metadata.common.themoviedb.org/tmdb.xml
index aaa3afe..8648af6 100644
--- a/metadata.common.themoviedb.org/tmdb.xml
+++ b/metadata.common.themoviedb.org/tmdb.xml
@@ -87,6 +87,51 @@
</RegExp>
</ParseFallbackTMDBPlot>
+ <GetTMDBTaglineByIdChain 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="ParseTMDBTagline"
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBTaglineByIdChain>
+ <GetTMDBLangTaglineByIdChain 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="ParseTMDBTagline"
cache="tmdb-$INFO[tmdbtaglinelanguage]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbtaglinelanguage]</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBLangTaglineByIdChain>
+ <ParseTMDBTagline dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1" output="\1" dest="9">
+ <expression clear="yes"
fixchars="1">"tagline":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$9" output="<url
function="ParseFallbackTMDBTagline"
cache="tmdb-en-$$8.json">http://api.themoviedb.org/3/movie/$$8?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>";
dest="2">
+ <expression>^$</expression>
+ </RegExp>
+ <RegExp input="$$9"
output="<tagline>\1</tagline>" dest="2">
+ <expression>(.+)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseTMDBTagline>
+ <ParseFallbackTMDBTagline dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<tagline>\1</tagline>" dest="2">
+ <expression clear="yes"
fixchars="1">"tagline":"([^"]*)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseFallbackTMDBTagline>
+
<GetTMDBSetByIdChain dest="4">
<RegExp input="$$5" output="<details>\1</details>"
dest="4">
<RegExp input="$$1" output="<url
function="ParseTMDBSet"
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>";
dest="5">
diff --git a/metadata.themoviedb.org/addon.xml
b/metadata.themoviedb.org/addon.xml
index 694e5f2..95ecbeb 100644
--- a/metadata.themoviedb.org/addon.xml
+++ b/metadata.themoviedb.org/addon.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.themoviedb.org"
name="The MovieDB"
- version="3.5.0"
+ version="3.6.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.themoviedb.org" version="2.6.0"/>
+ <import addon="metadata.common.themoviedb.org" version="2.7.0"/>
<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.9.1" optional="true"/>
diff --git a/metadata.themoviedb.org/changelog.txt
b/metadata.themoviedb.org/changelog.txt
index 63784ac..5637e7d 100644
--- a/metadata.themoviedb.org/changelog.txt
+++ b/metadata.themoviedb.org/changelog.txt
@@ -1,3 +1,6 @@
+[B]3.6.0[/B]
+- updated: out factored tagline scraping to common library
+
[B]3.5.0[/B]
- added: aspect tag and reorder languages according to the alphabet
diff --git a/metadata.themoviedb.org/tmdb.xml b/metadata.themoviedb.org/tmdb.xml
index 20bf719..f8a44b3 100644
--- a/metadata.themoviedb.org/tmdb.xml
+++ b/metadata.themoviedb.org/tmdb.xml
@@ -65,15 +65,6 @@
<RegExp input="$$10"
output="<runtime>\1</runtime>" dest="5+">
<expression>(.+)</expression>
</RegExp>
- <RegExp input="$$1" output="\1" dest="10">
- <expression clear="yes"
fixchars="1">"tagline":"([^"]*)</expression>
- </RegExp>
- <RegExp input="$$10" output="<url
function="ParseFallbackTMDBTagline"
cache="tmdb-en-$$2.json">http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>";
dest="5+">
- <expression>^$</expression>
- </RegExp>
- <RegExp input="$$10"
output="<tagline>\1</tagline>" dest="5+">
- <expression>(.+)</expression>
- </RegExp>
<RegExp input="$$1" output="\1" dest="7">
<expression clear="yes"
noclean="1">"production_companies":\[([^\]]*)</expression>
</RegExp>
@@ -110,6 +101,9 @@
<RegExp input="$$2" output="<chain
function="GetTMDBPlotByIdChain">$$2</chain>" dest="5+">
<expression />
</RegExp>
+ <RegExp input="$$2" output="<chain
function="GetTMDBTaglineByIdChain">$$2</chain>" dest="5+">
+ <expression />
+ </RegExp>
<RegExp input="$$2" output="<chain
function="GetTMDBCastByIdChain">$$2</chain>" dest="5+">
<expression />
</RegExp>
@@ -154,12 +148,4 @@
<expression noclean="1" />
</RegExp>
</ParseFallbackTMDBRuntime>
- <ParseFallbackTMDBTagline dest="5">
- <RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="<tagline>\1</tagline>" dest="2">
- <expression
fixchars="1">"tagline":"([^"]*)</expression>
- </RegExp>
- <expression noclean="1" />
- </RegExp>
- </ParseFallbackTMDBTagline>
</scraper>
-----------------------------------------------------------------------
Summary of changes:
metadata.common.themoviedb.org/addon.xml | 2 +-
metadata.common.themoviedb.org/tmdb.xml | 45 ++++++++++++++++++++++++++++++
metadata.themoviedb.org/addon.xml | 4 +-
metadata.themoviedb.org/changelog.txt | 3 ++
metadata.themoviedb.org/tmdb.xml | 20 ++-----------
5 files changed, 54 insertions(+), 20 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
