fixed: Ticket #8657 - Excalibur Films Scraper Fix (thanks Nicezia)

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27297 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

1 files changed, 29 insertions, 13 deletions

diff --git a/system/scrapers/video/Excalibur.xml b/system/scrapers/video/Excalibur.xml
index 2cbad703ca..0f051af3f7 100644
--- a/system/scrapers/video/Excalibur.xml
+++ b/system/scrapers/video/Excalibur.xml
@@ -7,33 +7,45 @@
 	</NfoUrl>
 	<CreateSearchUrl dest="3">
 		<RegExp input="$$1" output="&lt;url&gt;http://search.excaliburfilms.com/excals.htm?searchString=\1&amp;amp;Search=AdultDVDMovies&amp;amp;SearchFor=Title.x&lt;/url&gt;" dest="3">
-			<expression noclean="1"/>
+			<expression noclean="1"></expression>
 		</RegExp>
 	</CreateSearchUrl>
 	<GetSearchResults dest="6">
 		<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="6">
-			<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;url&gt;http://www.excaliburfilms.com/AdultDVD/\1&lt;/url&gt;&lt;/entity&gt;" dest="5+">
-				<expression trim="1" repeat="yes">&lt;a href=&quot;http://www.ExcaliburFilms.com/AdultDVD/([^&quot;]*)&quot;.*?&lt;font class=&quot;searchTitle13&quot;&gt;([^&lt;]*)&lt;/font&gt;&lt;/a&gt;</expression>
+			<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\3&lt;/title&gt;&lt;id&gt;\2&lt;/id&gt;&lt;url&gt;http://www.excaliburfilms.com/AdultDVD/\1&lt;/url&gt;&lt;/entity&gt;" dest="5+">
+				<expression repeat="yes" trim="1">&lt;a href="http://www.ExcaliburFilms.com/AdultDVD/([^"]*)".*?window.status=\'([A-Z0-9]+) - [0-9]+.*?&lt;font class="searchTitle13"&gt;([^&lt;]*)&lt;/font&gt;&lt;/a&gt;</expression>
 			</RegExp>
-			<expression noclean="1"/>
+			<expression noclean="1"></expression>
 		</RegExp>
 	</GetSearchResults>
 	<GetDetails dest="3">
 		<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="3">
+			<RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
+				<expression>&lt;title&gt;(.*?)(?: DVD|  Blu-Ray DVD | VHS-NTSC | VHS-PAL)&lt;/title&gt;</expression>
+			</RegExp>
 			<RegExp input="$$1" output="&lt;thumb&gt;http://images.excaliburfilms.com/DVD/reviews/imagesBB020609/largemoviepic/\1.jpg&lt;/thumb&gt;" dest="5+">
 				<expression>imagesBB020609/([^\.]*)</expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;thumb&gt;http://images.excaliburfilms.com/DVD/reviews/imagesBB020609/largemoviepic/\1-b.jpg&lt;/thumb&gt;" dest="5+">
 				<expression>imagesBB020609/([^\.]*)</expression>
 			</RegExp>
-			<RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
-				<expression>&lt;h2&gt;(.*?) Movie&lt;/h2&gt;</expression>
+			<RegExp input="$$6" output="\1" dest="5+">
+				<RegExp input="$$1" output="\1" dest="7">
+					<expression noclean="1">Starring:&lt;/font&gt;.*&lt;font class="starLink1"&gt;(.*?)&lt;/font&gt;</expression>
+				</RegExp>
+				<RegExp input="$$7" output="&lt;actor&gt;&lt;name&gt;\1&lt;/name&gt;&lt;/actor&gt;" dest="6">
+					<expression repeat="yes">,([^&lt;|,]+)[\.|,]</expression>
+				</RegExp>
+				<RegExp input="$$7" output="&lt;actor&gt;&lt;name&gt;\2&lt;/name&gt;&lt;thumb&gt;http://images.excaliburfilms.com/pornlist/starpicsAA020309/\1.jpg&lt;/thumb&gt;&lt;/actor&gt;" dest="6+">
+					<expression repeat="yes" trim="1,2">&lt;a href="/pornlist/(?:starpgs|malepgs)/([^\.]+)[^&gt;]*&gt;([^&lt;]*)</expression>
+				</RegExp>
+				<expression noclean="1"></expression>
 			</RegExp>
-			<RegExp input="$$1" output="&lt;actor&gt;&lt;name&gt;\3&lt;/name&gt;&lt;thumb&gt;http://images.excaliburfilms.com/pornlist/starpicsAA020309/\2.jpg&lt;/thumb&gt;&lt;/actor&gt;" dest="5+">
-				<expression repeat="yes">&lt;a href=&quot;/pornlist/(starpgs|malepgs)/([^\.]*)[^&gt;]*&gt;([^&lt;]*)</expression>
+			<RegExp input="$$1" output="&lt;mpaa&gt;XXX&lt;/mpaa&gt;&lt;id&gt;$$2&lt;/id&gt;&lt;genre&gt;Adult&lt;/genre&gt;" dest="5+">
+				<expression></expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;genre&gt;\1&lt;/genre&gt;" dest="5+">
-				<expression>href=&apos;/DVD/[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;BR&gt;</expression>
+				<expression>href='/DVD/[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;BR&gt;</expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;year&gt;\1&lt;/year&gt;" dest="5+">
 				<expression>/excal/release[^&gt;]*&gt;[0-9]*/[0-9]*/([^&lt;]*)</expression>
@@ -42,10 +54,10 @@
 				<expression>Time: &lt;/font&gt;&lt;[^&gt;]*&gt;([0-9]*)</expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="5+">
-				<expression>Description:&lt;/font&gt;&lt;/a&gt;[^&gt;]*&gt;([^&lt;]*)</expression>
+				<expression>Description:&lt;/font&gt;&lt;/a&gt;[^&gt;]*&gt;&amp;quot;([^&lt;]*)&amp;quot;</expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;studio&gt;\1&lt;/studio&gt;" dest="5+">
-				<expression>href=&apos;/dvd/adultstudios/[^&gt;]*&gt;([^&lt;]*)</expression>
+				<expression>href='/dvd/adultstudios/[^&gt;]*&gt;([^&lt;]*)</expression>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;director&gt;\1&lt;/director&gt;" dest="5+">
 				<expression>&gt;Director: &lt;/font&gt;[^&gt;]*&gt;([^&lt;]*)</expression>
@@ -56,7 +68,11 @@
 			<RegExp input="$$1" output="&lt;rating&gt;\1&lt;/rating&gt;" dest="5+">
 				<expression>/Stars_([0-9]).gif</expression>
 			</RegExp>
-			<expression noclean="1"/>
+			<RegExp input="$$1" output="&lt;premiered&gt;\1&lt;/premiered&gt;" dest="5+">
+				<expression>/excal/release[^&gt;]*&gt;([0-9]*/[0-9]*/[0-9]*)[^&lt;]*?</expression>
+			</RegExp>
+			<expression noclean="1"></expression>
 		</RegExp>
 	</GetDetails>
-</scraper>
+<!--Created with ScraperXml Editor-->
+</scraper>
\ No newline at end of file