The branch, eden has been updated
       via  0cf2bd33f284a94b53f0cd93026fa461494ba746 (commit)
      from  d3802d877ca22805223a8880495b28dd63949059 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=0cf2bd33f284a94b53f0cd93026fa461494ba746

commit 0cf2bd33f284a94b53f0cd93026fa461494ba746
Author: olympia <[email protected]>
Date:   Sat Nov 17 16:58:35 2012 +0100

    [metadata.universal] updated to version 1.6.0

diff --git a/metadata.universal/addon.xml b/metadata.universal/addon.xml
index 29a4ba8..9e0474c 100644
--- a/metadata.universal/addon.xml
+++ b/metadata.universal/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.universal"
        name="Universal Scraper"
-       version="1.5.0"
+       version="1.6.0"
        provider-name="Olympia, Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.universal/changelog.txt b/metadata.universal/changelog.txt
index 20d1119..eb72114 100644
--- a/metadata.universal/changelog.txt
+++ b/metadata.universal/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.6.0[/B]
+- added: option to select tagline source
+
 [B]1.5.0[/B]
 - added: option to select preferred trailer language
 
diff --git a/metadata.universal/resources/language/English/strings.xml 
b/metadata.universal/resources/language/English/strings.xml
index f52341d..d58e2c7 100644
--- a/metadata.universal/resources/language/English/strings.xml
+++ b/metadata.universal/resources/language/English/strings.xml
@@ -35,6 +35,9 @@
     <string id="30039">Enable trailers from trakt.tv</string>
     <string id="30040">     Genre Language</string>
     <string id="30041">     Preferred Trailer Language</string>
+    <string id="30041">     Preferred Trailer Language</string>
+    <string id="30042">Tagline Sources</string>
+    <string id="30043">     Preferred Tagline Language</string>
 
     <string id="30100">Rating</string>
     <string id="30021">Get Ratings from</string>
diff --git a/metadata.universal/resources/settings.xml 
b/metadata.universal/resources/settings.xml
index eed539a..ffcac50 100644
--- a/metadata.universal/resources/settings.xml
+++ b/metadata.universal/resources/settings.xml
@@ -4,15 +4,18 @@
     <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="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 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 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="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 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 type="sep"/>
+      <setting label="30042" type="labelenum" values="IMDb|themoviedb.org" 
id="taglinesource" default="IMDb"/>
+      <setting label="30043" 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="tmdbtaglinelanguage" 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="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 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 type="sep"/>
       <setting label="30013" type="bool" id="tmdbset" default="true"/>
   </category>
@@ -21,7 +24,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="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="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="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 +37,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="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="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="30039" type="bool" id="trakttvtrailer" default="false"/>
     <setting label="30005" type="bool" id="ytrailer" default="false"/>
   </category>
@@ -48,7 +51,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|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="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="30035" type="text" id="certprefix" default="Rated "/>
   </category>
 
diff --git a/metadata.universal/universal.xml b/metadata.universal/universal.xml
index df735ac..190866d 100644
--- a/metadata.universal/universal.xml
+++ b/metadata.universal/universal.xml
@@ -119,6 +119,12 @@
                        <RegExp input="$INFO[plotsource]" output="&lt;chain 
function=&quot;GetTMDBLangPlotByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
                                <expression>themoviedb.org</expression>
                        </RegExp>
+                       <RegExp input="$INFO[taglinesource]" output="&lt;chain 
function=&quot;GetIMDBTaglineById&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+                               <expression>IMDb</expression>
+                       </RegExp>
+                       <RegExp input="$INFO[taglinesource]" output="&lt;chain 
function=&quot;GetTMDBLangTaglineByIdChain&quot;&gt;$$2&lt;/chain&gt;" 
dest="5+">
+                               <expression>themoviedb.org</expression>
+                       </RegExp>
                        <RegExp input="$INFO[plotsource]" output="&lt;chain 
function=&quot;GetRTPlotById&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
                                <expression>Rotten Tomatoes</expression>
                        </RegExp>

-----------------------------------------------------------------------

Summary of changes:
 metadata.universal/addon.xml                       |    2 +-
 metadata.universal/changelog.txt                   |    3 +++
 .../resources/language/English/strings.xml         |    3 +++
 metadata.universal/resources/settings.xml          |   15 +++++++++------
 metadata.universal/universal.xml                   |    6 ++++++
 5 files changed, 22 insertions(+), 7 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

Reply via email to