[Xbmc-addons] Scrapers branch, frodo, updated. 72b83c74ff9a5b695dc368cd74215b226931949a

olympia Sat, 22 Dec 2012 13:07:39 -0800

The branch, frodo has been updated
       via  72b83c74ff9a5b695dc368cd74215b226931949a (commit)
      from  b96e2bd73df17053a3c8a3dbab8f6a41247da876 (commit)


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

commit 72b83c74ff9a5b695dc368cd74215b226931949a
Author: olympia <[email protected]>
Date:   Sat Dec 22 22:06:40 2012 +0100

    [metadata.universal] updated to version 2.1.2

diff --git a/metadata.universal/addon.xml b/metadata.universal/addon.xml
index d3ddd7f..1b7d0ff 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="2.1.1"
+       version="2.1.2"
        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 d340b98..30a7339 100644
--- a/metadata.universal/changelog.txt
+++ b/metadata.universal/changelog.txt
@@ -1,3 +1,7 @@
+[B]2.1.2[/B]
+- changed: Clean-up
+- added: br to settings
+
 [B]2.1.1[/B]
 - added: IMDb videos to search results
 
diff --git a/metadata.universal/resources/settings.xml 
b/metadata.universal/resources/settings.xml
index 16e7405..57e9e39 100644
--- a/metadata.universal/resources/settings.xml
+++ b/metadata.universal/resources/settings.xml
@@ -4,13 +4,13 @@
     <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|tr|zh"
 id="tmdbtitlelanguage" default="en" visible="eq(-2,1)"/>
+      <setting label="30027" type="labelenum" 
values="bg|br|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="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|tr|zh"
 id="tmdbgenreslanguage" default="en" visible="eq(-1,1)"/>
+      <setting label="30040" type="labelenum" 
values="bg|br|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"/>
-      <setting label="30046" 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|tr|zh"
 id="tmdbsetlanguage" default="en" enable="!eq(-1,false)"/>
+      <setting label="30046" type="labelenum" 
values="bg|br|cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
 id="tmdbsetlanguage" default="en" enable="!eq(-1,false)"/>
     <setting type="sep"/>
   </category>
 
@@ -18,10 +18,10 @@
     <setting type="lsep" label="30401"/>
       <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|tr|zh"
 id="tmdbplotlanguage" default="en" visible="eq(-1,1)"/>
+      <setting label="30020" type="labelenum" 
values="bg|br|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="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="tmdbtaglinelanguage" default="en" visible="eq(-1,1)"/>
+      <setting label="30043" type="labelenum" 
values="bg|br|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="30045" type="labelenum" values="IMDb|Rotten Tomatoes / 
Critics' Consensus|None" id="outlinesource" default="IMDb"/>
     <setting type="sep"/>
@@ -43,7 +43,7 @@
     <setting label="30037" type="bool" id="trakttvposter" default="false"/>
     <setting type="sep"/>
     <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|tr|zh"
 id="tmdbthumblanguage" default="en" enable="!eq(-1,false)"/>
+    <setting label="30034" type="labelenum" 
values="bg|br|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"/>
     <setting label="30003" type="bool" id="impawards" default="false"/>
     <setting type="sep"/>
@@ -68,7 +68,7 @@
     <setting label="30006" type="labelenum" values="No|480p|720p|1080p" 
id="TrailerQ" default="No"/>
     <setting type="sep"/>
     <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|tr|zh"
 id="tmdbtrailerlanguage" default="en" enable="!eq(-1,false)"/>
+    <setting label="30041" type="labelenum" 
values="bg|br|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 type="sep"/>
     <setting label="30039" type="bool" id="trakttvtrailer" default="false"/>
     <setting type="sep"/>
@@ -88,7 +88,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|tr|us|zh"
 id="tmdbcertcountry" default="us" visible="eq(-2,1)"/>/>
+      <setting label="30033" type="labelenum" 
values="au|bg|br|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 type="sep"/>
     <setting label="30035" type="text" id="certprefix" default="Rated "/>
     <setting type="sep"/>
@@ -97,9 +97,9 @@
   <category label="30300">
     <setting type="lsep" label="30303"/>
     <setting type="sep"/>
-    <setting label="30301" type="bool" id="tmdbsearch" default="false" 
enable="!eq(1,true)"/>
+    <setting label="30301" type="bool" id="tmdbsearch" default="false" 
enable="!eq(2,true)"/>
     <setting type="sep"/>
-    <setting label="30302" type="bool" id="imdbsearch" default="true" 
enable="!eq(-1,true)"/>
+    <setting label="30302" type="bool" id="imdbsearch" default="true" 
enable="!eq(-2,true)"/>
     <setting label="30304" type="labelenum" 
values="bg-bg|cs-cz|el-gr|es-ar|da-dk|de-at|de-de|fi-fi|fr-fr|hr-hr|he-il|hu-hu|it-it|ja-jp|nb-no|nl-nl|pl-pl|pt-pt|ro-ro|ru-ru|se-se|sl-si|sr-rs|th-th|tr-tr|None"
 id="imdbsearchlanguage" default="None" visible="!eq(-1,false)"/>
     <setting type="sep"/>
   </category>
diff --git a/metadata.universal/universal.xml b/metadata.universal/universal.xml
index 8044ae2..93fbc97 100644
--- a/metadata.universal/universal.xml
+++ b/metadata.universal/universal.xml
@@ -76,10 +76,10 @@
        </GetAKASearchResults>
        <GetDetails dest="3">
                <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="3">
-                       <RegExp conditional="imdbsearch" input="$$1" 
output="&lt;originaltitle&gt;\2&lt;/originaltitle&gt;" dest="19">
-                               <expression>&lt;meta name=&quot;title&quot; 
content=&quot;(IMDb - )?(?:&amp;#x22;)?([^&quot;]*?)(?:&amp;#x22;)? 
\([^\(]*?([0-9]{4})\)</expression>
+                       <RegExp conditional="imdbsearch" input="$$1" 
output="\2" dest="19">
+                               <expression fixchars="2">&lt;meta 
name=&quot;title&quot; content=&quot;(IMDb - 
)?(?:&amp;#x22;)?([^&quot;]*?)(?:&amp;#x22;)? \([^\(]*?([0-9]{4})\)</expression>
                        </RegExp>
-                       <RegExp conditional="imdbsearch" input="$$1" 
output="&lt;year&gt;\2&lt;/year&gt;" dest="20">
+                       <RegExp conditional="imdbsearch" input="$$1" 
output="\2" dest="20">
                                <expression>&lt;meta name=&quot;title&quot; 
content=&quot;([^&quot;]*?) \([^\(]*?([0-9]{4})\)</expression>
                        </RegExp>
                        <RegExp conditional="tmdbsearch" input="$$1" 
output="\1" dest="2">
@@ -91,10 +91,7 @@
                        <RegExp conditional="tmdbsearch" input="$$1" 
output="\1" dest="19">
                                <expression 
fixchars="1">&quot;original_title&quot;:&quot;([^&quot;]*)</expression>
                        </RegExp>
-                       <RegExp conditional="tmdbsearch" input="$$1" 
output="&lt;year&gt;\2&lt;/year&gt;" dest="20">
-                               <expression>&lt;meta name=&quot;title&quot; 
content=&quot;([^&quot;]*?) \([^\(]*?([0-9]{4})\)</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="\1" dest="20">
+                       <RegExp conditional="tmdbsearch" input="$$1" 
output="\2" dest="20">
                                <expression 
noclean="1">&quot;release_date&quot;:&quot;([0-9]+)-</expression>
                        </RegExp>
                        <RegExp input="$$2" output="&lt;id&gt;\1&lt;/id&gt;" 
dest="5">

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

Summary of changes:
 metadata.universal/addon.xml              |    2 +-
 metadata.universal/changelog.txt          |    4 ++++
 metadata.universal/resources/settings.xml |   20 ++++++++++----------
 metadata.universal/universal.xml          |   11 ++++-------
 4 files changed, 19 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

[Xbmc-addons] Scrapers branch, frodo, updated. 72b83c74ff9a5b695dc368cd74215b226931949a

Reply via email to