The branch, dharma has been updated
       via  2ecf7cca830837856341cb3f14c300047f3134ac (commit)
      from  3a9cfef38898e155f4d42c6606c02d73d7262b6e (commit)

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

commit 2ecf7cca830837856341cb3f14c300047f3134ac
Author: vdrfan <[email protected]>
Date:   Wed Sep 28 18:07:52 2011 +0200

    [metadata.moviemaze.de] updated to version 1.0.16
    (cherry picked from commit 3a9a3ecfc3a41d159f61ae5feef79973518fbda6)

diff --git a/metadata.moviemaze.de/addon.xml b/metadata.moviemaze.de/addon.xml
index 43fa321..f7061c8 100644
--- a/metadata.moviemaze.de/addon.xml
+++ b/metadata.moviemaze.de/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.moviemaze.de"
        name="MovieMaze"
-       version="1.0.15"
+       version="1.0.16"
        provider-name="Team XBMC + w00dst0ck">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.moviemaze.de/moviemaze.xml 
b/metadata.moviemaze.de/moviemaze.xml
index d2d73b3..468bf02 100644
--- a/metadata.moviemaze.de/moviemaze.xml
+++ b/metadata.moviemaze.de/moviemaze.xml
@@ -70,7 +70,7 @@
                                
<expression>/media/poster/([0-9]+)/([^&quot;]*)</expression>
                        </RegExp>
                        <!--URL to Trailer-->
-                       <RegExp conditional="trailer" input="$$1" 
output="&lt;url 
function=&quot;GetTrailerLink&quot;&gt;http://www.moviemaze.de/media/trailer/\1.html&lt;/url&gt;";
 dest="5+">
+                       <RegExp conditional="trailer" input="$$1" 
output="&lt;url 
function=&quot;GetTrailer&quot;&gt;http://www.moviemaze.de/media/trailer/\1.html&lt;/url&gt;";
 dest="5+">
                                
<expression>/media/trailer/([0-9]+,[a-zA-Z0-9\-]+).html. ti</expression>
                        </RegExp>
                        <!--User rating-->
@@ -136,21 +136,17 @@
                </RegExp>
        </GetThumbnailLink>
        <!-- Trailer -->
+       <GetTrailer dest="2">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url 
function=&quot;GetTrailerLink&quot;&gt;\1&lt;/url&gt;&lt;/details&gt;" dest="2">
+                       <expression>clipxml:'(.*?)'</expression>
+               </RegExp>
+       </GetTrailer>
        <GetTrailerLink dest="5">
                <RegExp input="$$2" output="&lt;?xml version=&quot;1.0&quot; 
encoding=&quot;iso-8859-1&quot; 
standalone=&quot;yes&quot;&gt;&lt;details&gt;\1&lt;/details&gt;" dest="5+">
-                       <RegExp input="$$1" output="&lt;trailer 
urlencoded=&quot;yes&quot;&gt;http://www.moviemaze.de/media/trailer/delivery/\1.mov&lt;/trailer&gt;";
 dest="2+">
-                               
<expression>delivery/([0-9]+/[a-z0-9]+/[0-9]+_trailer[0-9]+-de_640).mov</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="&lt;trailer 
urlencoded=&quot;yes&quot;&gt;http://www.moviemaze.de/media/trailer/delivery/\1.mov&lt;/trailer&gt;";
 dest="2+">
-                               
<expression>delivery/([0-9]+/[a-z0-9]+/[0-9]+_trailer[0-9]+-de_480).mov</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="&lt;trailer 
urlencoded=&quot;yes&quot;&gt;http://www.moviemaze.de/media/trailer/delivery/\1.mov&lt;/trailer&gt;";
 dest="2+">
-                               
<expression>delivery/([0-9]+/[a-z0-9]+/[0-9]+_trailer[0-9]+-de_384).mov</expression>
+                       <RegExp input="$$1" output="&lt;trailer 
urlencoded=&quot;yes&quot;&gt;\1&lt;/trailer&gt;" dest="2">
+                               
<expression>&lt;downloadurl&gt;[^&lt;]*&lt;!\[CDATA\[([^&lt;]*)\]\][^&lt;]*&lt;/downloadurl&gt;</expression>
                        </RegExp>
-                       <RegExp input="$$1" output="&lt;trailer 
urlencoded=&quot;yes&quot;&gt;http://www.moviemaze.de/media/trailer/delivery/\1.mov&lt;/trailer&gt;";
 dest="2+">
-                               
<expression>delivery/([0-9]+/[a-z0-9]+/[0-9]+_trailer[0-9]+-de_320).mov</expression>
-                       </RegExp>
-                       <expression clear="yes" noclean="1" />
+                       <expression noclean="1" />
                </RegExp>
        </GetTrailerLink>
        <ChainTMDBThumbs dest="13">

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

Summary of changes:
 metadata.moviemaze.de/addon.xml     |    2 +-
 metadata.moviemaze.de/moviemaze.xml |   22 +++++++++-------------
 2 files changed, 10 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to