[Xbmc-addons] Scrapers branch, dharma, updated. 3660ed64c30adb8453d9fff639fef4f8a4ad7b0d

[taxi gps]

The branch, dharma has been updated
       via  3660ed64c30adb8453d9fff639fef4f8a4ad7b0d (commit)
      from  8b59487dff02b9c4ed73496edf3fc5cb875be867 (commit)

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

commit 3660ed64c30adb8453d9fff639fef4f8a4ad7b0d
Author: taxigps <taxi...@sina.com>
Date:   Wed Aug 1 16:58:16 2012 +0800

    [metadata.m1905.com] update to 1.0.7

diff --git a/metadata.m1905.com/addon.xml b/metadata.m1905.com/addon.xml
index 84f84ed..3723c6d 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.6"
+       version="1.0.7"
        provider-name="Taxigps">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.m1905.com/icon.png b/metadata.m1905.com/icon.png
index e7c5a5b..ee70261 100644
Binary files a/metadata.m1905.com/icon.png and b/metadata.m1905.com/icon.png 
differ
diff --git a/metadata.m1905.com/m1905.xml b/metadata.m1905.com/m1905.xml
index ce945ca..e8f2ebc 100644
--- a/metadata.m1905.com/m1905.xml
+++ b/metadata.m1905.com/m1905.xml
@@ -11,9 +11,9 @@
                </RegExp>
        </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;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 input="$$5" output="&lt;results&gt;\1&lt;/results&gt;" 
dest="8">
+                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;url&gt;http://www.m1905.com/mdb/film/\1/&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/entity&gt;";
 dest="5+">
+                               <expression repeat="yes">&lt;h3 
class=&quot;fl&quot;&gt;&lt;a 
href=&quot;http://www.m1905.com/mdb/film/([0-9]+)/&quot; 
target=&quot;_blank&quot; class=&quot;blue_fa f14 
fb&quot;&gt;(.*?)&lt;/a&gt;</expression>
                        </RegExp>
                        <expression clear="yes" noclean="1"/>
                </RegExp>
@@ -24,42 +24,39 @@
                                <expression/>
                        </RegExp>
                        <RegExp input="$$1" 
output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
-                               <expression trim="1" noclean="1">&lt;span 
style=&quot;font-size:25px; color:#505050; 
font-weight:bold;&quot;&gt;《(.*?)》&lt;/span&gt;</expression>
+                               <expression>&lt;div 
class=&quot;laMovName&quot;.*?&lt;a 
href=[^&gt;]+&gt;(.*?)&lt;/a&gt;</expression>
                        </RegExp>
                        <RegExp input="$$1" 
output="&lt;year&gt;\1&lt;/year&gt;" dest="5+">
-                               <expression>上映日期：&lt;span 
class=&quot;blue12font&quot; style=&quot;color: 
#505050&quot;&gt;([0-9]*)</expression>
+                               <expression>上映日期:&lt;/strong&gt;&lt;a 
[^&gt;]+&gt;([0-9]+)&lt;/a&gt;</expression>
                        </RegExp>
-                       <RegExp input="$$1" 
output="&lt;runtime&gt;\1&lt;/runtime&gt;" dest="5+">
-                               <expression trim="1">片长：&lt;span 
class=&quot;blue12font&quot; style=&quot;color: 
#505050&quot;&gt;([^&lt;]*)&lt;</expression>
+                       <RegExp input="$$1" output="\1 " dest="6">
+                               <expression clear="yes" 
noclean="1">地区:&lt;/strong&gt;(.*?)&lt;/li&gt;</expression>
+                       </RegExp>
+                       <RegExp input="$$6" 
output="&lt;country&gt;\1&lt;/country&gt;" dest="5+">
+                               <expression repeat="yes">&lt;a 
[^&gt;]+&gt;(.*?)&lt;/a&gt;</expression>
                        </RegExp>
-                       <RegExp input="$$2" output="&lt;url 
cache=&quot;$$2-rating.html&quot; 
function=&quot;GetRating&quot;&gt;http://www.m1905.com/list.php?catid=157&amp;amp;movieid=$$2&amp;amp;mydo=ajax&amp;amp;action_ajax=show&amp;amp;&lt;/url&gt;";
 dest="5+">
+                       <RegExp input="$$2" output="&lt;url 
cache=&quot;$$2-rating.html&quot; 
function=&quot;GetRating&quot;&gt;http://www.m1905.com/pubfunc/score_rating_20110624.php?score_type=movie&amp;amp;movieid=$$2&amp;amp;mydo=ajax&lt;/url&gt;";
 dest="5+">
                                <expression/>
                        </RegExp>
                        <RegExp input="$$1" output="\1 " dest="6">
-                               <expression clear="yes" 
noclean="1">类型：&lt;span class=&quot;blue12font&quot; style=&quot;color: 
#505050&quot;&gt;([^&lt;]*)&lt;</expression>
+                               <expression clear="yes" 
noclean="1">类型:&lt;/strong&gt;(.*?)&lt;/li&gt;</expression>
                        </RegExp>
                        <RegExp input="$$6" 
output="&lt;genre&gt;\1&lt;/genre&gt;" dest="5+">
-                               <expression repeat="yes">([^ ]*) </expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;studio&gt;\1&lt;/studio&gt;" dest="5+">
-                               <expression>发行公司：&lt;span 
class=&quot;blue12font&quot; style=&quot;color: 
#505050&quot;&gt;([^&lt;]*)&lt;</expression>
+                               <expression repeat="yes">&lt;a 
[^&gt;]+&gt;(.*?)&lt;/a&gt;</expression>
                        </RegExp>
-                       <RegExp input="$$1" 
output="&lt;outline&gt;\1&lt;/outline&gt;&lt;plot&gt;\1&lt;/plot&gt;" dest="5+">
-                               <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/>
+                       <RegExp input="$$1" 
output="&lt;plot&gt;\1&lt;/plot&gt;" dest="5+">
+                               <expression fixchars="1">&lt;p 
id=&quot;Content_jq02&quot;[^&gt;]+&gt;(.*?)&lt;span class=</expression>
                        </RegExp>
-                       <RegExp input="$$2" output="&lt;url 
cache=&quot;$$2-fullcredits.html&quot; 
function=&quot;GetFullcredits&quot;&gt;http://www.m1905.com/list.php?catid=109&amp;amp;contentid=$$2&lt;/url&gt;";
 dest="5+">
+                       <RegExp input="$$2" output="&lt;url 
cache=&quot;$$2-fullcredits.html&quot; 
function=&quot;GetFullcredits&quot;&gt;http://www.m1905.com/mdb/film/$$2/performer/&lt;/url&gt;";
 dest="5+">
                                <expression/>
                        </RegExp>
-                       <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+">
+                       <RegExp input="$$2" output="&lt;url 
cache=&quot;$$2-posters.html&quot; 
function=&quot;GetM1905Poster&quot;&gt;http://www.m1905.com/mdb/film/$$2/poster/&lt;/url&gt;";
 dest="5+">
                                <expression/>
                        </RegExp>
-                       <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+">
+                       <RegExp conditional="fanart" input="$$2" 
output="&lt;url cache=&quot;$$2-fanart1.html&quot; 
function=&quot;GetM1905Wallpapers&quot;&gt;http://www.m1905.com/mdb/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+">
+                       <RegExp conditional="fanart" input="$$2" 
output="&lt;url cache=&quot;$$2-fanart2.html&quot; 
function=&quot;GetM1905Fanart&quot;&gt;http://www.m1905.com/mdb/film/$$2/still/&lt;/url&gt;";
 dest="5+">
                                <expression/>
                        </RegExp>
                        <expression noclean="1"/>
@@ -68,38 +65,30 @@
        <GetRating clearbuffers="no" dest="5">
                <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
                        <RegExp input="$$1" 
output="&lt;rating&gt;\2&lt;/rating&gt;&lt;votes&gt;\1&lt;/votes&gt;" dest="2">
-                               <expression 
clear="yes">([0-9]*)\|([0-9]*)\|</expression>
+                               <expression>([0-9]*)\|([\.0-9]*)\|</expression>
                        </RegExp>
                        <expression noclean="1"/>
                </RegExp>
        </GetRating>
-       <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" 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>
-       </GetPlot>
        <GetFullcredits dest="5">
                <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
                        <RegExp input="$$1" output="\1" dest="6">
-                               <expression clear="yes" noclean="1">演员 
Actor：.*?class=&quot;hui5012font&quot;&gt;(.*?)&lt;/div&gt;</expression>
+                               <expression clear="yes" 
noclean="1">演员&lt;/strong&gt;&lt;/h2&gt;(.*?)&lt;/div&gt;</expression>
                        </RegExp>
                        <RegExp input="$$6" 
output="&lt;actor&gt;&lt;thumb&gt;\2\3&lt;/thumb&gt;&lt;name&gt;\4&lt;/name&gt;&lt;role&gt;&lt;/role&gt;&lt;/actor&gt;"
 dest="2">
-                               <expression clear="yes" repeat="yes" 
trim="1">&lt;li style=&quot;.*?&quot;&gt;(&lt;a href=[^&gt;]*&gt;&lt;img 
src=&quot;(http://.*?)thumb_1_28_28_([0-9]*.jpg)&quot;[^&gt;]*&gt;&lt;/a&gt;|)&lt;/li&gt;[^&lt;]*&lt;li
 class=&quot;blue12font&quot; 
style=&quot;.*?&quot;&gt;(.*?)&lt;/li&gt;</expression>
+                               <expression repeat="yes" trim="4">&lt;a 
href=.*?src=&quot;((http://image.*?)thumb_\d_\d+_\d+_(\d+.jpg)|http://static.m1905.com/images/mingxing/no_small.jpg)&quot;[^&gt;]*&gt;&lt;/a&gt;&lt;a
 href=[^&gt;]*&gt;(.*?)&lt;/a&gt;</expression>
                        </RegExp>
                        <RegExp input="$$1" output="\1" dest="8">
-                               <expression clear="yes" noclean="1">导演 
Director：(.*?)&lt;/ul&gt;</expression>
+                               <expression clear="yes" 
noclean="1">导演&lt;/strong&gt;&lt;/h2&gt;(.*?)&lt;/div&gt;</expression>
                        </RegExp>
                        <RegExp input="$$8" 
output="&lt;director&gt;\1&lt;/director&gt;" dest="2+">
-                               <expression repeat="no" 
trim="1">&lt;li&gt;([^&lt;]*)&lt;</expression>
+                               <expression repeat="yes">&lt;a 
href=[^&gt;]+&gt;(.*?)&lt;/a&gt;</expression>
                        </RegExp>
                        <RegExp input="$$1" output="\1" dest="9">
-                               <expression clear="yes" noclean="1">编剧 
Writer：(.*?)&lt;/ul&gt;</expression>
+                               <expression clear="yes" 
noclean="1">编剧&lt;/strong&gt;&lt;/h2&gt;(.*?)&lt;/div&gt;</expression>
                        </RegExp>
                        <RegExp input="$$9" 
output="&lt;credits&gt;\1&lt;/credits&gt;" dest="2+">
-                               <expression repeat="no" 
trim="1">&lt;li&gt;([^&lt;]*)&lt;</expression>
+                               <expression repeat="yes">&lt;a 
href=[^&gt;]+&gt;(.*?)&lt;/a&gt;</expression>
                        </RegExp>
                        <expression noclean="1"/>
                </RegExp>
@@ -107,29 +96,29 @@
        <GetM1905Poster dest="5">
                <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
                        <RegExp input="$$1" output="\1" dest="6">
-                               <expression clear="yes" 
noclean="1">--中间内容开始--(.*?)--中间内容结束--</expression>
+                               <expression clear="yes" 
noclean="1">海报&lt;/span&gt;&lt;/h1&gt;(.*?)&lt;/div&gt;</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/.*?/)thumb_0_[0-9]+_[0-9]+_(.*?\.jpg)</expression>
+                       <RegExp input="$$6" 
output="&lt;thumb&gt;\1\2&lt;/thumb&gt;" dest="2">
+                               <expression repeat="yes">&lt;img 
src=&quot;(http://image.*?)thumb_\d_\d+_\d+_(\d+.jpg)&quot;</expression>
                        </RegExp>
                        <expression noclean="1"/>
                </RegExp>
        </GetM1905Poster>
        <GetM1905Wallpapers clearbuffers="no" dest="5">
-               <RegExp input="$$6" output="&lt;thumb&gt;\1\3&lt;/thumb&gt;" 
dest="10">
+               <RegExp input="$$6" output="&lt;thumb&gt;\1\2&lt;/thumb&gt;" 
dest="10">
                        <RegExp input="$$1" output="\1" dest="6">
-                               <expression clear="yes" 
noclean="1">--中间内容开始--.*?剧照(.*?)--中间内容结束--</expression>
+                               <expression clear="yes" 
noclean="1">资讯图片&lt;/span&gt;&lt;/h1&gt;(.*?)&lt;/div&gt;</expression>
                        </RegExp>
-                       <expression repeat="yes" 
noclean="1,2,3">(uploadfile/.*?/)(thumb_0_[0-9]+_[0-9]+_)(.*?\.jpg)</expression>
+                       <expression repeat="yes">&lt;img 
src=&quot;(http://image.*?)thumb_\d_\d+_\d+_(\d+.jpg)&quot;</expression>
                </RegExp>
        </GetM1905Wallpapers>
        <GetM1905Fanart dest="5">
-               <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="$$10" 
output="&lt;details&gt;&lt;fanart&gt;\1&lt;/fanart&gt;&lt;/details&gt;" 
dest="5">
                        <RegExp input="$$1" output="\1" dest="6">
-                               <expression clear="yes" 
noclean="1">--中间内容开始--.*?剧照(.*?)--中间内容结束--</expression>
+                               <expression clear="yes" 
noclean="1">剧照&lt;/span&gt;&lt;/h1&gt;(.*?)&lt;/div&gt;</expression>
                        </RegExp>
-                       <RegExp input="$$6" 
output="&lt;thumb&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 input="$$6" 
output="&lt;thumb&gt;\1\2&lt;/thumb&gt;" dest="10+">
+                               <expression repeat="yes">&lt;img 
src=&quot;(http://image.*?)thumb_\d_\d+_\d+_(\d+.jpg)&quot;</expression>
                        </RegExp>
                        <expression noclean="1"/>
                </RegExp>

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

Summary of changes:
 metadata.m1905.com/addon.xml |    2 +-
 metadata.m1905.com/icon.png  |  Bin 22591 -> 47013 bytes
 metadata.m1905.com/m1905.xml |   83 ++++++++++++++++++------------------------
 3 files changed, 37 insertions(+), 48 deletions(-)


hooks/post-receive
-- 
Scrapers


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons