The branch, eden has been updated
       via  32a79378a847e697e863f7e462457db30e64fb52 (commit)
      from  8ff172d25f86d391f872fd012e772eba2d8622d4 (commit)

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

commit 32a79378a847e697e863f7e462457db30e64fb52
Author: olympia <[email protected]>
Date:   Tue Mar 27 18:24:16 2012 +0200

    [metadata.filmweb.pl] updated to version 1.2.3

diff --git a/metadata.filmweb.pl/addon.xml b/metadata.filmweb.pl/addon.xml
index 5e14af6..7017255 100644
--- a/metadata.filmweb.pl/addon.xml
+++ b/metadata.filmweb.pl/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.filmweb.pl"
        name="Filmweb"
-       version="1.2.2"
+       version="1.2.3"
        provider-name="smuto">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.filmweb.pl/filmweb.xml b/metadata.filmweb.pl/filmweb.xml
index ca570f4..ca1d722 100644
--- a/metadata.filmweb.pl/filmweb.xml
+++ b/metadata.filmweb.pl/filmweb.xml
@@ -1,25 +1,25 @@
  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<scraper framework="1.0" date="2012-02-28">
+<scraper framework="1.0" date="2012-03-25">
        <NfoUrl dest="3">
-               <RegExp input="$$1" output="&lt;url 
cache=&quot;filmweb-\1&quot;&gt;http://www.filmweb.pl/Film?id=\1&lt;/url&gt;";  
dest="3">
+               <RegExp conditional="!TryAllURL" input="$$1" output="&lt;url 
cache=&quot;filmweb-\1&quot;&gt;http://www.filmweb.pl/Film?id=\1&lt;/url&gt;";  
dest="3">
                        <expression 
noclean="1">filmweb.pl/f([0-9]*)/</expression>
                </RegExp>
-               <RegExp input="$$1" output="&lt;url 
cache=&quot;filmweb-\1&quot;&gt;http://www.filmweb.pl/Film?id=\1&lt;/url&gt;";  
dest="3+">
+               <RegExp conditional="!TryAllURL" input="$$1" output="&lt;url 
cache=&quot;filmweb-\1&quot;&gt;http://www.filmweb.pl/Film?id=\1&lt;/url&gt;";  
dest="3+">
                        <expression 
noclean="1">filmweb.pl/film/.+?-[0-9]{4}-([0-9]*)</expression>
                </RegExp>
                <RegExp input="$$1" output="&lt;url 
cache=&quot;filmweb-\1&quot;&gt;http://www.filmweb.pl/Film?id=\1&lt;/url&gt;";  
dest="3+">
                        <expression noclean="1">Film.id=([0-9]*)</expression>
                </RegExp>
-               <RegExp input="$$1" 
output="&lt;url&gt;http://www.filmweb.pl/\1&lt;/url&gt;";  dest="3+">
+               <RegExp conditional="!TryAllURL" input="$$1" 
output="&lt;url&gt;http://www.filmweb.pl/\1&lt;/url&gt;";  dest="3+">
                        <expression noclean="1">http://www.filmweb.pl/([^ 
]+[A-Za-z0-9])</expression>
                </RegExp>
-               <RegExp input="$$1" 
output="&lt;url&gt;http://www.filmweb.pl/\1&lt;/url&gt;";  dest="3+">
+               <RegExp conditional="!TryAllURL" input="$$1" 
output="&lt;url&gt;http://www.filmweb.pl/\1&lt;/url&gt;";  dest="3+">
                        <expression 
noclean="1">http://([^\/]+).filmweb.pl</expression>
                </RegExp>
-               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
function=&quot;GetByIMDBId&quot;&gt;http://www.google.com/search?q=tt\2+site:imdb.com&lt;/url&gt;&lt;details&gt;";
 dest="3+">
+               <RegExp conditional="!TryAllURL" input="$$1" 
output="&lt;details&gt;&lt;url 
function=&quot;GetByIMDBId&quot;&gt;http://www.google.com/search?q=tt\2+site:imdb.com&lt;/url&gt;&lt;details&gt;";
 dest="3+">
                        <expression>(imdb.com/)Title\?([0-9]+)</expression>
                </RegExp>
-               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
function=&quot;GetByIMDBId&quot;&gt;http://www.google.com/search?q=tt\2+site:imdb.com&lt;/url&gt;&lt;details&gt;";
 dest="3+">
+               <RegExp conditional="!TryAllURL" input="$$1" 
output="&lt;details&gt;&lt;url 
function=&quot;GetByIMDBId&quot;&gt;http://www.google.com/search?q=tt\2+site:imdb.com&lt;/url&gt;&lt;details&gt;";
 dest="3+">
                        <expression>(imdb.com/title/tt)([0-9]*)</expression>
                </RegExp>
        </NfoUrl>
diff --git a/metadata.filmweb.pl/resources/language/English/strings.xml 
b/metadata.filmweb.pl/resources/language/English/strings.xml
index 71c2be3..de473f2 100644
--- a/metadata.filmweb.pl/resources/language/English/strings.xml
+++ b/metadata.filmweb.pl/resources/language/English/strings.xml
@@ -6,4 +6,5 @@
     <string id="30003">Prefer DVD Plot</string>
     <string id="30007">IMDb Actor Thumb(s) Size</string>
     <string id="30008">Use original title</string>
+    <string id="30009">Use NFOURL by filmweb.id only</string>
 </strings>
\ No newline at end of file
diff --git a/metadata.filmweb.pl/resources/settings.xml 
b/metadata.filmweb.pl/resources/settings.xml
index 1cb93ae..4736c20 100644
--- a/metadata.filmweb.pl/resources/settings.xml
+++ b/metadata.filmweb.pl/resources/settings.xml
@@ -3,6 +3,7 @@
     <setting label="30000" type="bool" id="poster" default="true"/>
     <setting label="30003" type="bool" id="opis" default="false"/>
     <setting label="30008" type="bool" id="UseOriginalTitle" default="false"/>
+    <setting label="30009" type="bool" id="TryAllURL" default="true"/>
     <setting id="language" default="pl" />
     <setting type="sep" />
     <setting label="30002" type="bool" id="iMDBRatings" default="false"/>

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

Summary of changes:
 metadata.filmweb.pl/addon.xml                      |    2 +-
 metadata.filmweb.pl/filmweb.xml                    |   14 +++++++-------
 .../resources/language/English/strings.xml         |    1 +
 metadata.filmweb.pl/resources/settings.xml         |    1 +
 4 files changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to