The branch, frodo has been updated
via af2d2826dd445cf5f16bde2fc858e1fc66095628 (commit)
from 6e52602aed9bf555c26d16d7f8a9f5fd2d713df0 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=af2d2826dd445cf5f16bde2fc858e1fc66095628
commit af2d2826dd445cf5f16bde2fc858e1fc66095628
Author: olympia <olym...@xbmc.org>
Date: Thu Jul 24 12:14:49 2014 +0200
[metadata.universal] updated to version 2.6.0
diff --git a/metadata.universal/addon.xml b/metadata.universal/addon.xml
index f778987..3f10dae 100644
--- a/metadata.universal/addon.xml
+++ b/metadata.universal/addon.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.universal"
name="Universal Movie Scraper"
- version="2.5.2"
+ version="2.6.0"
provider-name="Olympia, Team XBMC">
<requires>
<import addon="xbmc.metadata" version="2.1.0"/>
+ <import addon="metadata.common.fanart.tv" version="3.1.0"/>
<import addon="metadata.common.themoviedb.org" version="2.9.0"/>
<import addon="metadata.common.movieposterdb.com" version="1.0.5"/>
<import addon="metadata.common.imdb.com" version="2.7.0"/>
diff --git a/metadata.universal/changelog.txt b/metadata.universal/changelog.txt
index fd21957..fc1b17c 100644
--- a/metadata.universal/changelog.txt
+++ b/metadata.universal/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.6.0[/B]
+- added: support to get movieart from fanart.tv
+
[B]2.5.2[/B]
- updated language files from Transifex
diff --git a/metadata.universal/resources/language/English/strings.xml
b/metadata.universal/resources/language/English/strings.xml
index 3ee6053..f2ecc84 100644
--- a/metadata.universal/resources/language/English/strings.xml
+++ b/metadata.universal/resources/language/English/strings.xml
@@ -65,4 +65,6 @@
<string id="30401">Plot / Tagline / Outline</string>
<string id="30500">Fanart</string>
<string id="30501">Fanart Sources</string>
+ <string id="30502">Enable posters from fanart.tv</string>
+ <string id="30503">Enable fanart from fanart.tv</string>
</strings>
diff --git a/metadata.universal/resources/settings.xml
b/metadata.universal/resources/settings.xml
index 7bcab16..e588563 100644
--- a/metadata.universal/resources/settings.xml
+++ b/metadata.universal/resources/settings.xml
@@ -42,6 +42,8 @@
<category label="30011">
<setting type="lsep" label="30047"/>
<setting type="sep"/>
+ <setting label="30502" type="bool" id="fanarttvposter" default="false"/>
+ <setting type="sep"/>
<setting label="30002" type="bool" id="tmdbthumbs" default="true"/>
<setting label="30034" type="select"
values="bg|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 type="sep"/>
@@ -58,6 +60,8 @@
<category label="30500">
<setting type="lsep" label="30501"/>
<setting type="sep"/>
+ <setting label="30503" type="bool" id="fanarttvfanart" default="false"/>
+ <setting type="sep"/>
<setting label="30001" type="bool" id="fanart" default="true"/>
<setting type="sep"/>
<setting label="30038" type="bool" id="trakttvfanart" default="false"/>
diff --git a/metadata.universal/universal.xml b/metadata.universal/universal.xml
index f62a030..5f8360f 100644
--- a/metadata.universal/universal.xml
+++ b/metadata.universal/universal.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2013-02-03">
+<scraper framework="1.1" date="2014-07-24">
<NfoUrl dest="3">
<RegExp input="$$1"
output="<url>http://akas.imdb.com/title/tt\1/</url><id>tt\1</id>";
dest="3">
<expression clear="yes"
noclean="1">imdb....?/Title\?([0-9]*)</expression>
@@ -235,6 +235,9 @@
<RegExp input="$INFO[tmdbtags]" output="<chain
function="GetTMDBTagsByIdChain">$$2</chain>" dest="5+">
<expression>themoviedb.org</expression>
</RegExp>
+ <RegExp conditional="fanarttvposter" input="$$2"
output="<chain
function="GetFanartTvThumbsByIdChain">$$2</chain>" dest="5+">
+ <expression/>
+ </RegExp>
<RegExp conditional="tmdbthumbs" input="$$2"
output="<chain
function="GetTMDBLangThumbsByIdChain">$$2</chain>" dest="5+">
<expression/>
</RegExp>
@@ -247,6 +250,9 @@
<RegExp conditional="movieposterdb" input="$$2"
output="<chain
function="GetMoviePosterDBThumbs">$$2</chain>" dest="5+">
<expression/>
</RegExp>
+ <RegExp conditional="fanarttvfanart" input="$$2"
output="<chain
function="GetFanartTvFanartByIdChain">$$2</chain>" dest="5+">
+ <expression/>
+ </RegExp>
<RegExp conditional="fanart" input="$$2"
output="<chain
function="GetTMDBFanartByIdChain">$$2</chain>" dest="5+">
<expression/>
</RegExp>
-----------------------------------------------------------------------
Summary of changes:
metadata.universal/addon.xml | 3 ++-
metadata.universal/changelog.txt | 3 +++
.../resources/language/English/strings.xml | 2 ++
metadata.universal/resources/settings.xml | 4 ++++
metadata.universal/universal.xml | 8 +++++++-
5 files changed, 18 insertions(+), 2 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Want fast and easy access to all the code in your enterprise? Index and
search up to 200,000 lines of code with a free copy of Black Duck
Code Sight - the same software that powers the world's largest code
search on Ohloh, the Black Duck Open Hub! Try it now.
http://p.sf.net/sfu/bds
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
