[Xbmc4xbox-commits] SF.net SVN: xbmc4xbox:[30683] trunk/system/scrapers/video

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 30683
          http://xbmc4xbox.svn.sourceforge.net/xbmc4xbox/?rev=30683&view=rev
Author:   arnova
Date:     2010-10-07 17:06:56 +0000 (Thu, 07 Oct 2010)

Log Message:
-----------
fixed: imdb scraper (ticket #127). Thanks to Blued!

Modified Paths:
--------------
    trunk/system/scrapers/video/common/imdb.xml
    trunk/system/scrapers/video/imdb.xml

Modified: trunk/system/scrapers/video/common/imdb.xml
===================================================================

--- trunk/system/scrapers/video/common/imdb.xml	2010-10-06 18:00:57 UTC (rev 30682)
+++ trunk/system/scrapers/video/common/imdb.xml	2010-10-07 17:06:56 UTC (rev 30683)
@@ -24,41 +24,46 @@
 	<GetIMDBWriters dest="5">
 		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
 			<RegExp conditional="!fullcredits" input="$$1" output="\1" dest="6">
-				<expression noclean="1">&gt;Writer.*?:&lt;/h5&gt;(.*?)&lt;/div&gt;</expression>
+				<expression noclean="1">Writers?\:(.*?)&lt;/div&gt;</expression>
 			</RegExp>
 			<RegExp conditional="fullcredits" input="$$1" output="\1" dest="6">
 				<expression noclean="1">Writing credits(.*?)name=&quot;</expression>
 			</RegExp>
 			<RegExp input="$$6" output="&lt;credits&gt;\1&lt;/credits&gt;" dest="2+">
-				<expression repeat="yes">&lt;a href=&quot;/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
+				<expression fixchars="1" repeat="yes">/name/[^&gt;"]*"&gt;([^&lt;]*)&lt;</expression>
 			</RegExp>
 			<expression noclean="1"/>
 		</RegExp>
 	</GetIMDBWriters>
 	<GetIMDBCast dest="5">
 		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
-			<RegExp input="$$1" output="\1" dest="6">
-				<expression noclean="1">&lt;table class=&quot;cast&quot;&gt;(.*?)&lt;/table&gt;</expression>
+			<RegExp conditional="!fullcredits" input="$$1" output="\1" dest="6">
+				<expression noclean="1">&lt;table class="cast_list"&gt;(.*?)&lt;/table&gt;</expression>
 			</RegExp>
-			<RegExp input="$$6" output="&lt;actor&gt;&lt;thumb&gt;\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2&lt;/thumb&gt;&lt;name&gt;\3&lt;/name&gt;&lt;role&gt;\4&lt;/role&gt;&lt;/actor&gt;" dest="7">
-				<expression clear="yes" repeat="yes" noclean="1,2" trim="3,4">&lt;img src=&quot;(?:([^&quot;]*\.)[^&quot;]*(\.jpg))?[^&gt;]*[^&quot;]*&quot;nm&quot;&gt;&lt;a href=&quot;[^&quot;]*[^&gt;]*&gt;([^&lt;]*)&lt;[^&quot;]*&quot;ddd&quot;&gt; ... [^&quot;]*&quot;char&quot;&gt;(.*?)&lt;/td&gt;</expression>
+			<RegExp conditional="fullcredits" input="$$1" output="\1" dest="6">
+				<expression noclean="1">&lt;table class="cast"&gt;(.*?)&lt;/table&gt;</expression>
 			</RegExp>
+			<RegExp input="$$6" output="&lt;actor&gt;&lt;thumb&gt;\1&lt;/thumb&gt;&lt;name&gt;\2&lt;/name&gt;&lt;role&gt;\3 \4&lt;/role&gt;&lt;/actor&gt;" dest="2+">
+				<expression fixchars="2,3,4" clear="yes" repeat="yes" noclean="1" trim="2,3,4">src="([^"]*\.(?:jpg|png))".*?&lt;td class="name"&gt;(.*?)&lt;/td&gt;.*?&lt;td class="character"&gt;.*?&lt;div&gt;\n([^\n]*)\n(.*?)&lt;/div&gt;.*?&lt;/td&gt;</expression>
+			</RegExp>
+<!--
 			<RegExp input="$$7" output="&lt;actor&gt;&lt;thumb&gt;\1&lt;/thumb&gt;\2&lt;/actor&gt;" dest="2+">
 				<expression clear="yes" repeat="yes" noclean="1,2,3">&lt;actor&gt;&lt;thumb&gt;(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)&lt;/thumb&gt;(.*?)&lt;/actor&gt;</expression>
 			</RegExp>
+-->
 			<expression noclean="1"/>
 		</RegExp>
 	</GetIMDBCast>
 	<GetIMDBDirectors dest="5">
 		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
 			<RegExp conditional="!fullcredits" input="$$1" output="\1" dest="6">
-				<expression clear="yes" noclean="1">&gt;Director.*?&lt;/h5&gt;(.*?)&lt;/div&gt;</expression>
+				<expression clear="yes" noclean="1">Directors?\:(.*?)&lt;/div&gt;</expression>
 			</RegExp>
 			<RegExp conditional="fullcredits" input="$$1" output="\1" dest="6">
-				<expression clear="yes" noclean="1">Directed by(.*?)name=&quot;</expression>
+				<expression clear="yes" noclean="1">Directed by(.*?)&lt;/table&gt;</expression>
 			</RegExp>
 			<RegExp input="$$6" output="&lt;director&gt;\1&lt;/director&gt;" dest="2+">
-				<expression clear="yes" repeat="yes">&lt;a href=&quot;/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
+				<expression clear="yes" repeat="yes" fixchars="1">/name/[^&gt;"]*"&gt;([^&lt;]*)&lt;</expression>
 			</RegExp>
 			<expression noclean="1"/>
 		</RegExp>

Modified: trunk/system/scrapers/video/imdb.xml
===================================================================
--- trunk/system/scrapers/video/imdb.xml	2010-10-06 18:00:57 UTC (rev 30682)
+++ trunk/system/scrapers/video/imdb.xml	2010-10-07 17:06:56 UTC (rev 30683)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2010-02-24" name="IMDb.com" content="movies" thumb="imdb.png" language="en">
+<scraper framework="1.12x" date="2010-10-05" name="IMDb.com" content="movies" thumb="imdb.png" language="en">
 	<include>common/imdb.xml</include>
 	<include>common/tmdb.xml</include>
 	<include>common/movieposterdb.xml</include>
@@ -53,18 +53,18 @@
 	<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="\1" dest="7">
-				<expression fixchars="1" clear="yes">/title/([t0-9]*)/faq</expression>
+				<expression clear="yes" noclean="1">/title/([t0-9]*)/faq</expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\1&lt;/title&gt;&lt;year&gt;\2&lt;/year&gt;&lt;url&gt;http://akas.imdb.com/title/$$7/&lt;/url&gt;&lt;id&gt;$$7&lt;/id&gt;&lt;/entity&gt;" dest="5">
-				<expression fixchars="1" clear="yes" noclean="1">&lt;meta name=&quot;title&quot; content=&quot;([^&quot;]*) \(([0-9]*)\)</expression>
+				<expression  clear="yes" noclean="1">&lt;meta name="title" content="([^"]*) \([^\)0-9]*([0-9]+)\)</expression>
 			</RegExp>
 			<RegExp input="$$1" output="\1" dest="4">
-				<expression fixchars="1" noclean="1">(&gt;&lt;a href=&quot;/title.*)</expression>
+				<expression noclean="1">(&gt;&lt;a href=&quot;/title.*)</expression>
 			</RegExp>
 			<RegExp input="$$4" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url&gt;http://akas.imdb.com/title/\1/&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/entity&gt;" dest="5+">
-				<expression fixchars="1" repeat="yes" noclean="1,2">&gt;&lt;a href=&quot;/title/([t0-9]*)/[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt; *\(([0-9]*)</expression>
+				<expression repeat="yes" noclean="1,2">&gt;&lt;a href=&quot;/title/([t0-9]*)/[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt; *\(([0-9]*)</expression>
 			</RegExp>
-			<expression fixchars="1" clear="yes" noclean="1"/>
+			<expression  clear="yes" noclean="1"/>
 		</RegExp>
 	</GetSearchResults>
 	<GetDetails dest="3">
@@ -73,38 +73,47 @@
 				<expression fixchars="1"/>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
-				<expression fixchars="1" trim="1" noclean="1">&lt;h1&gt;([^&lt;]*)</expression>
+				<expression fixchars="1" trim="1" noclean="1">&lt;h1 class="header"&gt;([^&lt;]*)</expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;year&gt;\1&lt;/year&gt;" dest="5+">
 				<expression fixchars="1">a href=&quot;/year/([0-9]*)</expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;top250&gt;\1&lt;/top250&gt;" dest="5+">
-				<expression fixchars="1">Top 250: #([0-9]*)&lt;/a&gt;</expression>
+				<expression fixchars="1">Top 250 #([0-9]*)&lt;/a&gt;</expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;mpaa&gt;\1&lt;/mpaa&gt;" dest="5+">
-				<expression fixchars="1">MPAA&lt;/a&gt;:&lt;/h5&gt;\n&lt;div class=&quot;info-content&quot;&gt;\n(.[^&lt;]*)</expression>
+				<expression fixchars="1">MPAA&lt;/a&gt;\)&lt;/h4&gt;\n([^&lt;]*)</expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;certification&gt;\1 \3&lt;/certification&gt;" dest="5+">
 				<expression fixchars="1" repeat="yes">&lt;a href=&quot;/search/title\?certificates=[^&quot;]*&quot;&gt;([^&lt;]*)&lt;/a&gt;[^&lt;]*(&lt;i&gt;([^&lt;]*)&lt;/i&gt;)?</expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;tagline&gt;\1&lt;/tagline&gt;" dest="5+">
-				<expression fixchars="1">&lt;h5&gt;Tagline:&lt;/h5&gt;\n&lt;div class="info-content"&gt;([^&lt;]*)</expression>
+				<expression fixchars="1">&gt;Taglines:&lt;/h4&gt;([^&lt;]*)</expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;runtime&gt;\1&lt;/runtime&gt;" dest="5+">
-				<expression fixchars="1" trim="1">&lt;h5&gt;Runtime:&lt;/h5&gt;[^0-9]*([^&lt;]*)</expression>
+				<expression noclean="1">&gt;Runtime:&lt;/h4&gt;[^0-9]*([,0-9]+) min</expression>
 			</RegExp>
-			<RegExp input="$$1" output="&lt;rating&gt;\1&lt;/rating&gt;&lt;votes&gt;\2&lt;/votes&gt;" dest="5+">
-				<expression fixchars="1">&lt;b&gt;([0-9.]+)/10&lt;/b&gt;[^&lt;]*&lt;a href=&quot;ratings&quot; class=&quot;tn15more&quot;&gt;([0-9,]+) votes&lt;/a&gt;</expression>
+			<RegExp input="$$1" output="&lt;rating&gt;\1&lt;/rating&gt;" dest="5+">
+				<expression fixchars="1">id="star-bar-user-rate"&gt;&lt;b&gt;([0-9.]+)&lt;/b&gt;</expression>
 			</RegExp>
+			<RegExp input="$$1" output="&lt;votes&gt;\1&lt;/votes&gt;" dest="5+">
+				<expression fixchars="1">&gt;([0-9,]+) votes&lt;/a&gt;</expression>
+			</RegExp>
 			<RegExp input="$$1" output="&lt;genre&gt;\1&lt;/genre&gt;" dest="5+">
-				<expression fixchars="1" repeat="yes">&quot;/Sections/Genres/[^/]*/&quot;&gt;([^&lt;]*)&lt;/a&gt;</expression>
+				<expression fixchars="1" repeat="yes">"/genre/[^/]*"&gt;([^&lt;]*)&lt;/a&gt;</expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;studio&gt;\1&lt;/studio&gt;" dest="5+">
 				<expression fixchars="1" repeat="yes">&quot;/company/[^/]*/&quot;&gt;([^&lt;]*)&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">Plot:&lt;/h5&gt;\n&lt;div class=&quot;info-content&quot;&gt;\n(.*?) \| &lt;a class=&quot;tn15more</expression>
+                           <RegExp input="$$9"  output="&lt;outline&gt;\1&lt;/outline&gt;&lt;plot&gt;\1&lt;/plot&gt;"dest="5+">
+			<RegExp input="$$1" output="\1" dest="8">
+				<expression >reviews&lt;/a&gt;&lt;/span&gt;(.*?)(?:&lt;a href="plotsummary"&gt;|&lt;/p&gt;)</expression>
 			</RegExp>
+			<RegExp input="$$8" output="\1 " dest="9+">
+				<expression repeat="yes">([^\n]+)</expression>
+			</RegExp>
+			<expression noclean="1"></expression>
+			</RegExp>
 			<RegExp input="$$2" output="&lt;url function=&quot;GetIMDBPlot&quot;&gt;$$3plotsummary&lt;/url&gt;" dest="5+">
 				<expression fixchars="1"/>
 			</RegExp>
@@ -117,7 +126,7 @@
 			<RegExp conditional="!fullcredits" input="$$2" output="&lt;url cache=&quot;$$2-credits.html&quot; function=&quot;GetIMDBWriters&quot;&gt;$$3&lt;/url&gt;" dest="5+">
 				<expression fixchars="1"/>
 			</RegExp>
-			<RegExp conditional="fullcredits" input="$$2" output="&lt;url cache=&quot;$$2-fullcredits.html&quot; function=&quot;GetIMDBCast&quot;&gt;$$3fullcredits&lt;/url&gt;" dest="5+">
+			<RegExp conditional="fullcredits" input="$$2" output="&lt;url cache=&quot;$$2-fullcredits.html&quot; function=&quot;GetIMDBCast&quot;&gt;$$3/fullcredits&lt;/url&gt;" dest="5+">
 				<expression fixchars="1"/>
 			</RegExp>
 			<RegExp conditional="fullcredits" input="$$2" output="&lt;url cache=&quot;$$2-fullcredits.html&quot; function=&quot;GetIMDBDirectors&quot;&gt;$$3fullcredits&lt;/url&gt;" dest="5+">
@@ -153,7 +162,7 @@
 			<RegExp conditional="fanart" input="$$2" output="&lt;url function=&quot;GetTMDBFanartById&quot;&gt;$$3&lt;/url&gt;" dest="5+">
 				<expression fixchars="1"/>
 			</RegExp>
-			<expression fixchars="1" noclean="1"/>
+			<expression noclean="1"/>
 		</RegExp>
 	</GetDetails>
 </scraper>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


