The branch, dharma-pre has been updated
       via  81abfbd98903addb92c63846a23224148a23b86c (commit)
      from  faa6f5abd1357a2ab4bdbc5cf281f7f4dd89dd10 (commit)

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

commit 81abfbd98903addb92c63846a23224148a23b86c
Author: taxigps <[email protected]>
Date:   Tue Nov 23 22:42:17 2010 +0800

    [metadata.m1905.com] updated to version 1.0.5 for the web site changes

diff --git a/metadata.m1905.com/addon.xml b/metadata.m1905.com/addon.xml
index 75c5b91..191c86e 100644
--- a/metadata.m1905.com/addon.xml
+++ b/metadata.m1905.com/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.m1905.com"
        name="M1905"
-       version="1.0.4"
+       version="1.0.5"
        provider-name="Taxigps">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.m1905.com/m1905.xml b/metadata.m1905.com/m1905.xml
index 6956a8c..71c2120 100644
--- a/metadata.m1905.com/m1905.xml
+++ b/metadata.m1905.com/m1905.xml
@@ -12,8 +12,8 @@
        </CreateSearchUrl>
        <GetSearchResults dest="8">
                <RegExp input="$$5" output="&lt;?xml version=&quot;1.0&quot; 
encoding=&quot;iso-8859-1&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;\2 - 
\3&lt;/title&gt;&lt;url&gt;http://www.m1905.com/film/\1.shtml&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/entity&gt;";
 dest="5+">
-                               <expression repeat="yes" noclean="1">&lt;a 
href=&quot;film/([0-9]*?).shtml&quot; target=&quot;_blank&quot; 
class=&quot;red14link&quot;&gt;《(.*?)》&lt;/a&gt;.*?class=&quot;blue14&quot;&gt;(.*?)&lt;/a&gt;</expression>
+                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\2(\3)&lt;/title&gt;&lt;url&gt;http://www.m1905.com/film/\1.shtml&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/entity&gt;";
 dest="5+">
+                               <expression repeat="yes" noclean="1">&lt;h2 
class=&quot;fl&quot;&gt;&lt;a 
href=&quot;http://www.m1905.com/film/([0-9]+).shtml&quot; 
target=&quot;_blank&quot; class=&quot;blue_fa f14 
fb&quot;&gt;(.*?)&lt;/a&gt;.*?上映时间:&lt;/dt&gt;&lt;dd&gt;([0-9]*)</expression>
                        </RegExp>
                        <expression clear="yes" noclean="1"/>
                </RegExp>
@@ -45,7 +45,7 @@
                                <expression>发行公司:&lt;span 
class=&quot;blue12font&quot; style=&quot;color: 
#505050&quot;&gt;([^&lt;]*)&lt;</expression>
                        </RegExp>
                        <RegExp input="$$1" 
output="&lt;outline&gt;\1&lt;/outline&gt;&lt;plot&gt;\1&lt;/plot&gt;" dest="5+">
-                               <expression>剧情简介 
&lt;/li&gt;.*?class=&quot;hui5012font&quot;&gt;(.*?)\n</expression>
+                               <expression 
fixchars="1">剧情简介&lt;/li&gt;.*?class=&quot;hui5012font&quot;&gt;(.*?)\n</expression>
                        </RegExp>
                        <RegExp input="$$2" output="&lt;url 
cache=&quot;$$2-plot.html&quot; 
function=&quot;GetPlot&quot;&gt;http://www.m1905.com/list.php?catid=105&amp;amp;contentid=$$2&lt;/url&gt;";
 dest="5+">
                                <expression/>
@@ -56,7 +56,10 @@
                        <RegExp input="$$2" output="&lt;url 
cache=&quot;$$2-posters.html&quot; 
function=&quot;GetM1905Poster&quot;&gt;http://www.m1905.com/list.php?catid=127&amp;amp;contentid=$$2&lt;/url&gt;";
 dest="5+">
                                <expression/>
                        </RegExp>
-                       <RegExp conditional="fanart" input="$$2" 
output="&lt;url cache=&quot;$$2-fanart.html&quot; 
function=&quot;GetM1905Fanart&quot;&gt;http://www.m1905.com/list.php?catid=119&amp;amp;contentid=$$2&lt;/url&gt;";
 dest="5+">
+                       <RegExp conditional="fanart" input="$$2" 
output="&lt;url cache=&quot;$$2-fanart1.html&quot; 
function=&quot;GetM1905Wallpapers&quot;&gt;http://www.m1905.com/film/$$2/wallpaper/&lt;/url&gt;";
 dest="5+">
+                               <expression/>
+                       </RegExp>
+                       <RegExp conditional="fanart" input="$$2" 
output="&lt;url cache=&quot;$$2-fanart2.html&quot; 
function=&quot;GetM1905Fanart&quot;&gt;http://www.m1905.com/film/$$2/still/&lt;/url&gt;";
 dest="5+">
                                <expression/>
                        </RegExp>
                        <expression noclean="1"/>
@@ -73,7 +76,7 @@
        <GetPlot dest="5">
                <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
                        <RegExp input="$$1" 
output="&lt;plot&gt;\1&lt;/plot&gt;" dest="2">
-                               <expression clear="yes">&lt;div 
id=&quot;gut_center_center_down&quot; 
class=&quot;hui34343412font&quot;&gt;(.*?)&lt;/div&gt;</expression>
+                               <expression clear="yes" fixchars="1">&lt;div 
id=&quot;gut_center_center_down&quot; 
class=&quot;hui34343412font&quot;&gt;(.*?)&lt;/div&gt;</expression>
                        </RegExp>
                        <expression noclean="1"/>
                </RegExp>
@@ -107,15 +110,26 @@
                                <expression clear="yes" 
noclean="1">--中间内容开始--(.*?)--中间内容结束--</expression>
                        </RegExp>
                        <RegExp input="$$6" 
output="&lt;thumb&gt;http://www.m1905.com/\1\2&lt;/thumb&gt;"; dest="2">
-                               <expression repeat="yes" 
noclean="1">(uploadfile/[0-9]+/[0-9]+/)thumb_[0-9]+_[0-9]+_([0-9]+\.jpg)</expression>
+                               <expression repeat="yes" 
noclean="1">(uploadfile/.*?/)thumb_0_[0-9]+_[0-9]+_(.*?\.jpg)</expression>
                        </RegExp>
                        <expression noclean="1"/>
                </RegExp>
        </GetM1905Poster>
+       <GetM1905Wallpapers clearbuffers="no" dest="5">
+               <RegExp input="$$6" output="&lt;thumb 
preview=&quot;\1\2\3&quot;&gt;\1\3&lt;/thumb&gt;" dest="10">
+                       <RegExp input="$$1" output="\1" dest="6">
+                               <expression clear="yes" 
noclean="1">--中间内容开始--.*?剧照(.*?)--中间内容结束--</expression>
+                       </RegExp>
+                       <expression repeat="yes" 
noclean="1,2,3">(uploadfile/.*?/)(thumb_0_[0-9]+_[0-9]+_)(.*?\.jpg)</expression>
+               </RegExp>
+       </GetM1905Wallpapers>
        <GetM1905Fanart dest="5">
-               <RegExp input="$$11" output="&lt;details&gt;&lt;fanart 
url=&quot;http://www.m1905.com/&quot;&gt;\1&lt;/fanart&gt;&lt;/details&gt;"; 
dest="5">
-                       <RegExp input="$$1" output="&lt;thumb 
preview=&quot;\1\2\3&quot;&gt;\1\3&lt;/thumb&gt;" dest="11">
-                               <expression clear="yes" repeat="yes" 
noclean="1,2,3">&lt;a href=&quot;film/photo/still/[^&lt;]*&lt;img 
src=&quot;(uploadfile/[0-9]+/[0-9]+/)(thumb_[0-9]+_[0-9]+_)([0-9]+\.jpg)</expression>
+               <RegExp input="$$10" output="&lt;details&gt;&lt;fanart 
url=&quot;http://www.m1905.com/&quot;&gt;\1&lt;/fanart&gt;&lt;/details&gt;"; 
dest="5">
+                       <RegExp input="$$1" output="\1" dest="6">
+                               <expression clear="yes" 
noclean="1">--中间内容开始--.*?剧照(.*?)--中间内容结束--</expression>
+                       </RegExp>
+                       <RegExp input="$$6" output="&lt;thumb 
preview=&quot;\1\2\3&quot;&gt;\1\3&lt;/thumb&gt;" dest="10+">
+                               <expression repeat="yes" 
noclean="1,2,3">(uploadfile/.*?/)(thumb_0_[0-9]+_[0-9]+_)(.*?\.jpg)</expression>
                        </RegExp>
                        <expression noclean="1"/>
                </RegExp>

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

Summary of changes:
 metadata.m1905.com/addon.xml |    2 +-
 metadata.m1905.com/m1905.xml |   32 +++++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to