The branch, dharma has been updated
       via  88f78b5c9738e416ebd9d263a75366708e38bdbc (commit)
      from  de0fe7396fe8f1d3e855baac71dfa2cd1365e9e2 (commit)

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

commit 88f78b5c9738e416ebd9d263a75366708e38bdbc
Author: vdrfan <[email protected]>
Date:   Thu Jul 14 17:01:09 2011 +0200

    [metadata.ofdb.de] updated to version 1.1.0
    (cherry picked from commit 3940e8928c02a0fdc72d8d432cb856d59a037998)

diff --git a/metadata.ofdb.de/addon.xml b/metadata.ofdb.de/addon.xml
index 65837f3..1c76237 100644
--- a/metadata.ofdb.de/addon.xml
+++ b/metadata.ofdb.de/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.ofdb.de"
        name="OFDB"
-       version="1.0.17"
+       version="1.1.0"
        provider-name="Team XBMC + morte0815">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.ofdb.de/ofdb.xml b/metadata.ofdb.de/ofdb.xml
index eef3eda..1938a3b 100644
--- a/metadata.ofdb.de/ofdb.xml
+++ b/metadata.ofdb.de/ofdb.xml
@@ -1,33 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<scraper framework="1.1" date="2010-01-13">
+<scraper framework="1.1" date="2011-07-14">
        <NfoUrl dest="3">
-               <RegExp input="$$1" output="&lt;url&gt;\1\2,\3&lt;/url&gt;" 
dest="3">
-                       <expression clear="yes" 
noclean="1">(http://www.ofdb.de/film/)([0-9]*),(.*)</expression>
+               <RegExp input="$$1" 
output="&lt;details&gt;&lt;url&gt;http://ofdbgw.org/movie/\2&lt;/url&gt;&lt;id&gt;\2&lt;/id&gt;&lt;/details&gt;";
 dest="3">
+                       <expression clear="yes" 
noclean="1">(http://www.ofdb.de/film/)([0-9]*),</expression>
                </RegExp>
-               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
function=&quot;GetByIMDBId&quot;&gt;http://www.ofdb.de/view.php?SText=\2&amp;amp;Kat=IMDb&amp;amp;page=suchergebnis&amp;amp;sourceid=mozilla-search&lt;/url&gt;&lt;details&gt;";
 dest="3+">
-                       <expression>(imdb.com/)Title\?([0-9]+)</expression>
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
function=&quot;GetByIMDBId&quot;&gt;http://ofdbgw.org/imdb2ofdb/tt\1&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;";
 dest="3">
+                       <expression 
noclean="1">imdb....?/Title\?([0-9]*)</expression>
                </RegExp>
-               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
function=&quot;GetByIMDBId&quot;&gt;http://www.ofdb.de/view.php?SText=\2&amp;amp;Kat=IMDb&amp;amp;page=suchergebnis&amp;amp;sourceid=mozilla-search&lt;/url&gt;&lt;details&gt;";
 dest="3+">
-                       <expression>(imdb.com/title/tt)([0-9]*)</expression>
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
function=&quot;GetByIMDBId&quot;&gt;http://ofdbgw.org/imdb2ofdb/tt\1&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;";
 dest="3+">
+                       <expression 
noclean="1">imdb....?/title/tt([0-9]*)</expression>
                </RegExp>
        </NfoUrl>
        <GetByIMDBId dest="3">
                <RegExp input="$$1" 
output="&lt;url&gt;http://www.ofdb.de/film/\1,&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;";
 dest="3+">
-                       <expression repeat="yes" 
noclean="1">&quot;film/([0-9]*),</expression>
+                       <expression 
noclean="1">&lt;ofdbid&gt;([^&lt;]*)&lt;/ofdbid&gt;</expression>
                </RegExp>
        </GetByIMDBId>
+       <GetOFDbURL dest="3">
+               <RegExp input="$$5" 
output="&lt;results&gt;&lt;entity&gt;\1&lt;/entity&gt;&lt;/results&gt;" 
dest="3+">
+                       <RegExp input="$$6" output="\1" dest="5+">
+                               <RegExp input="$$1" 
output="&lt;title&gt;\1&lt;/title&gt;" dest="6">
+                                       <expression 
noclean="1">&lt;titel&gt;([^/]*)\s/([^\(]*)\s</expression>
+                               </RegExp>
+                               <RegExp input="$$6" output="\1" dest="5">
+                                       <RegExp input="$$7" 
output="&lt;title&gt;\2 \1&lt;/title&gt;" dest="6">
+                                               <RegExp input="$$1" output="\1" 
dest="7">
+                                                       <expression 
noclean="1">&lt;titel&gt;([^/]*)\s/([^\(]*)\s</expression>
+                                               </RegExp>
+                                               <expression>(.*), 
(Die|Der|Das|The)</expression>
+                                       </RegExp>
+                                       <expression noclean="1"/>
+                               </RegExp>
+                               <expression noclean="1"/>
+                       </RegExp>
+                       <RegExp input="$$1" 
output="&lt;year&gt;\1&lt;/year&gt;" dest="5+">
+                               <expression 
noclean="1">&lt;titel&gt;.*?\(([0-9]*)\)&lt;/titel&gt;</expression>
+                       </RegExp>
+                       <RegExp input="$$1" 
output="&lt;url&gt;http://www.ofdb.de/film/\1,&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;";
 dest="5+">
+                               <expression 
noclean="1">&lt;ofdbid&gt;([^&lt;]*)&lt;/ofdbid&gt;</expression>
+                       </RegExp>
+                       <expression noclean="1"/>
+               </RegExp>
+       </GetOFDbURL>
        <CreateSearchUrl dest="3">
-               <RegExp input="$$1" 
output="&lt;url&gt;http://api.bing.com/xml.aspx?AppId=16E50AB9947899C41433EB944C60174737855036&amp;amp;Sources=web&amp;amp;xmltype=attributebased&amp;amp;Query=site:ofdb.de/film+\1$$4&amp;amp;web.count=50&lt;/url&gt;";
 dest="3">
-                       <RegExp input="$$2" output="%20\1" dest="4+">
+               <RegExp input="$$1" 
output="&lt;url&gt;http://api.themoviedb.org/2.1/Movie.search/de/xml/57983e31fb435df4df77afb854740ea9/\1$$4&lt;/url&gt;";
 dest="3">
+                       <RegExp input="$$2" output="+\1" dest="4">
                                <expression clear="yes">(.+)</expression>
                        </RegExp>
                        <expression noclean="1"/>
                </RegExp>
        </CreateSearchUrl>
        <GetSearchResults dest="8">
-               <RegExp input="$$5" output="&lt;?xml version=&quot;1.0&quot; 
encoding=&quot;utf-8&quot; 
standalone=&quot;yes&quot;?&gt;&lt;results&gt;\1&lt;/results&gt;" dest="8">
-                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\1&lt;/title&gt;&lt;year&gt;\2&lt;/year&gt;&lt;url
 cache=&quot;ofdb-\4.html&quot;&gt;\3\4,&lt;/url&gt;&lt;/entity&gt;" dest="5+">
-                               <expression repeat="yes" 
trim="1">Title=&quot;OFDb - 
([^&quot;]*)\(([0-9]*)\)&quot;.*?Url=&quot;(http://www.ofdb.de/film/)([0-9]*)</expression>
+               <RegExp input="$$5" output="&lt;results&gt;\1&lt;/results&gt;" 
dest="8">
+                       <RegExp input="$$1" output="&lt;url 
function=&quot;GetOFDbURL&quot;&gt;http://ofdbgw.org/imdb2ofdb/\1&lt;/url&gt;"; 
dest="5+">
+                               <expression noclean="1" 
repeat="yes">&lt;imdb_id&gt;([^&lt;]*)&lt;/imdb_id&gt;</expression>
                        </RegExp>
                        <expression noclean="1"/>
                </RegExp>

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

Summary of changes:
 metadata.ofdb.de/addon.xml |    2 +-
 metadata.ofdb.de/ofdb.xml  |   52 +++++++++++++++++++++++++++++++++-----------
 2 files changed, 40 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric 
Ries, the creator of the Lean Startup Methodology on "Lean Startup 
Secrets Revealed." This video shows you how to validate your ideas, 
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to