The branch, eden has been updated
via 2c4c82d908b28df2014f9da5d339500602a66a85 (commit)
from 744cf004de11c7689a3634d3ec91471a973382c2 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=2c4c82d908b28df2014f9da5d339500602a66a85
commit 2c4c82d908b28df2014f9da5d339500602a66a85
Author: olympia <[email protected]>
Date: Sat Nov 17 15:53:09 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" " edb.org" standalone="yes"?> themoviedb.org/addon.xml t;tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>";
dest="5"> ]</url>"
dest="5"> è è ! è ! aMÿ aMÿ xÔÂc+ pWMÿ ¦b+
¦b+ aMÿ `¦b+ OaMÿ ÀÏ&d+ u
¦b+ À&d+ ØÄ&d+ ¨É&d+ *§b+ xÔÂc+ pWMÿ @VMÿ k
¦b+ à! à! aMÿ aMÿ H¢c+ PXMÿ ¦b+
¦b+ aMÿ `¦b+ OaMÿ @aMÿ 8aMÿ 8+Çb+ p aMÿ u
¦b+ *§b+ PXMÿ WMÿ k
¦b+ G H I J K M N O P aMÿ aMÿ HUyc+ ðYMÿ ¦b+
¦b+ aMÿ 0Ï&d+ u
¦b+ àÂc+ Vc+ À&d+ ØÄ&d+ ¨É&d+ *§b+ HUyc+ ðYMÿ 0XMÿ k
¦b+ 8Uyc+ ðYMÿ `XMÿ k
¦b+ (Uyc+ ðYMÿ XMÿ k
¦b+ Uyc+ ðYMÿ ÀXMÿ k ¦b+ ¨Î&d+ u
¦b+ ¨É&d+ @SMÿ ØVc+ e
¦b+ ØÄ&d+ `YMÿ yØVc+ e
¦b+ À&d+ YMÿ ZØVc+ e
¦b+ ØVc+ àÂc+ Vc+ À&d+ ØäÂc+ ØÄ&d+ ¨É&d+ *§b+ 8+Çb+ M"c+ aMÿ pVc+ @[Mÿ ZMÿ k
¦b+ 5 6 7 8 : < = > ? @ B D aMÿ aMÿ àM c+ aMÿ u
¦b+ %Çb+ ÀYMÿ M"c+ e ¦b+ %Çb+ Õ_@f ÆS
Qöl±í Ácîb+ aMÿ àM c+ P\Mÿ [Mÿ k
¦b+ u]ÞÓ
4Q ÷U^Qʧ ¶uª¹ñìò*ÄvaMÿ aMÿ Hëb+ ä'c+ ÀbMÿ ¦ðd+ ¦ðd+ 6%c+ OaMÿ bMÿ 8aMÿ ]Mÿ ïÂc+ u
¦b+ ØäÂc+ dMÿ ¢ðd+ ÐbMÿ `^Mÿ ÿÿÿÿÿÿÿÿ¢ðd+ aMÿ .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>
diff --git a/metadata.universal/resources/settings.xml
b/metadata.universal/resources/settings.xml
index 6e26c13..eed539a 100644
--- a/metadata.universal/resources/settings.xml
+++ b/metadata.universal/resources/settings.xml
@@ -4,15 +4,15 @@
<setting type="sep"/>
<setting label="30023" type="labelenum" values="IMDb|themoviedb.org"
id="titlesource" default="IMDb"/>
<setting label="30008" type="labelenum" values="Keep Original|USA /
International|Argentina|Austria|Belgium|Brazil|Bulgaria|Canada|China|Colombia|Chile|Croatia|Czech
Republic|Denmark|Finland|France|Germany|Greece|Hong
Kong|Hungary|Iceland|India|Israel|Italy|Japan|Mexico|Netherlands|Norway|Pakistan|Poland|Portugal|Romania|Russia|Serbia|Singapore|Slovenia|Spain|Sweden|Switzerland|Thailand|Turkey|Uruguay|Venezuela"
id="imdbakatitles" default="Keep Original" visible="eq(-1,0)"/>
- <setting label="30027" type="labelenum"
values="cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbtitlelanguage" default="en" visible="eq(-2,1)"/>
+ <setting label="30027" type="labelenum"
values="bg|cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|th|tr|zh"
id="tmdbtitlelanguage" default="en" visible="eq(-2,1)"/>
<setting type="sep"/>
<setting label="30014" type="labelenum"
values="IMDb|themoviedb.org|Rotten Tomatoes|trakt.tv|OFDb.de|port.hu"
id="plotsource" default="IMDb"/>
- <setting label="30020" type="labelenum"
values="cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbplotlanguage" default="en" visible="eq(-1,1)"/>
+ <setting label="30020" type="labelenum"
values="bg|cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|th|tr|zh"
id="tmdbplotlanguage" default="en" visible="eq(-1,1)"/>
<setting type="sep"/>
<setting label="30015" type="labelenum"
values="IMDb|IMDbFull|themoviedb.org" id="creditssource" default="IMDb"/>
<setting type="sep"/>
<setting label="30022" type="labelenum"
values="IMDb|themoviedb.org|trakt.tv" id="genressource" default="IMDb"/>
- <setting label="30040" type="labelenum"
values="cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbgenreslanguage" default="en" visible="eq(-1,1)"/>
+ <setting label="30040" type="labelenum"
values="bg|cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|th|tr|zh"
id="tmdbgenreslanguage" default="en" visible="eq(-1,1)"/>
<setting type="sep"/>
<setting label="30013" type="bool" id="tmdbset" default="true"/>
</category>
@@ -21,7 +21,7 @@
<setting type="lsep" label="Poster Sources"/>
<setting label="30037" type="bool" id="trakttvposter" default="false"/>
<setting label="30002" type="bool" id="tmdbthumbs" default="true"/>
- <setting label="30034" type="labelenum"
values="cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbthumblanguage" default="en" enable="!eq(-1,false)"/>
+ <setting label="30034" type="labelenum"
values="bg|cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|th|tr|zh"
id="tmdbthumblanguage" default="en" enable="!eq(-1,false)"/>
<setting label="30003" type="bool" id="impawards" default="false"/>
<setting label="30004" type="bool" id="movieposterdb" default="false"/>
<setting label="30036" type="bool" id="imdbthumbs" default="false"/>
@@ -34,7 +34,7 @@
<setting label="30028" type="lsep"/>
<setting label="30006" type="labelenum" values="No|480p|720p|1080p"
id="TrailerQ" default="No"/>
<setting label="30009" type="bool" id="tmdbtrailer" default="true"/>
- <setting label="30041" type="labelenum"
values="cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbtrailerlanguage" default="en" enable="!eq(-1,false)"/>
+ <setting label="30041" type="labelenum"
values="bg|cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|th|tr|zh"
id="tmdbtrailerlanguage" default="en" enable="!eq(-1,false)"/>
<setting label="30039" type="bool" id="trakttvtrailer" default="false"/>
<setting label="30005" type="bool" id="ytrailer" default="false"/>
</category>
@@ -48,7 +48,7 @@
<setting type="lsep" label="30031"/>
<setting label="30032" type="labelenum" values="IMDb|themoviedb.org"
id="certificationssource" default="IMDb"/>
<setting label="30033" type="labelenum"
values="Argentina|Australia|Austria|Belgium|Brazil|Bulgaria|Canada|China|Colombia|Chile|Croatia|Czech
Republic|Denmark|Finland|France|Germany|Greece|Hong
Kong|Hungary|Iceland|India|Israel|Italy|Japan|Mexico|Netherlands|Norway|Pakistan|Poland|Portugal|Romania|Russia|Serbia|Singapore|Slovenia|Spain|Sweden|Switzerland|Thailand|Turkey|UK|Uruguay|USA|Venezuela"
id="imdbcertcountry" default="USA" visible="eq(-1,0)"/>
- <setting label="30033" type="labelenum"
values="au|cs|da|de|el|es|fi|fr|gb|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|us|zh"
id="tmdbcertcountry" default="us" visible="eq(-2,1)"/>/>
+ <setting label="30033" type="labelenum"
values="au|bg|cs|da|de|el|es|fi|fr|gb|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|th|tr|us|zh"
id="tmdbcertcountry" default="us" visible="eq(-2,1)"/>/>
<setting label="30035" type="text" id="certprefix" default="Rated "/>
</category>
-----------------------------------------------------------------------
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 ++-----------
metadata.universal/resources/settings.xml | 12 ++++----
6 files changed, 60 insertions(+), 26 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
