The branch, dharma-pre has been updated
via 8704e0a892a72db3b351cb30b385f322eea3c5dd (commit)
from 57be0a8e6ceb0871650a51b18139f4966c1eac45 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=8704e0a892a72db3b351cb30b385f322eea3c5dd
commit 8704e0a892a72db3b351cb30b385f322eea3c5dd
Author: olympia <[email protected]>
Date: Mon Oct 11 07:52:01 2010 +0200
[metadata.sratim.co.il] fixed sratim scraper
diff --git a/metadata.sratim.co.il/addon.xml b/metadata.sratim.co.il/addon.xml
index a549ba0..567c777 100644
--- a/metadata.sratim.co.il/addon.xml
+++ b/metadata.sratim.co.il/addon.xml
@@ -1,27 +1,30 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.sratim.co.il"
name="Sratim"
- version="1.0.5"
- provider-name="leo2">
+ version="1.0.8"
+ provider-name="G.Vago">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.themoviedb.org" version="1.0"/>
- <import addon="metadata.common.imdb.com" version="1.0"/>
+ <import addon="metadata.common.themoviedb.org" version="1.0.7"/>
+ <import addon="metadata.common.imdb.com" version="2.0.4"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="he"
library="sratim.xml"/>
<extension point="xbmc.addon.metadata">
<summary lang="en">Sratim Movie Scraper</summary>
+ <summary lang="he">סקר××פר סר××× ××תר סר×××</summary>
<summary lang="hu">Sratim filmadat leolvasó</summary>
<summary lang="kr">Sratim ìí ì¤í¬ëí¼</summary>
- <summary lang="pl">Scraper filmów Sratim</summary>
<summary lang="pt">Scraper de filmes Sratim</summary>
- <description lang="en">Download Movie information from
www.sratim.co.il</description>
+ <summary lang="nl">Sratim film Scraper</summary>
+ <summary lang="pl">Scraper filmów Sratim</summary>
+ <description lang="he">www.sratim.co.il ××ר×ת ××××¢ סר×××
××תר</description>
+ <description lang="en">Download Movie information from
www.sratim.co.il</description>
+ <description lang="nl">Download film informatie van
www.sratim.co.il</description>
+ <description lang="pl">Pobieraj informacje o filmach z
www.sratim.co.il</description>
<description lang="hu">Film információk letöltése a www.sratim.co.il
webhelyrÅl</description>
<description lang="kr">www.sratim.co.ilìì ìí ì ë³´
ë¤ì´ë¡ë</description>
- <description lang="pl">Pobieraj informacje o filmach z
www.sratim.co.il</description>
<description lang="pt">Descarregar informação de filmes de
www.sratim.co.il</description>
- <broken>Unable to connect server</broken>
</extension>
</addon>
diff --git a/metadata.sratim.co.il/resources/language/English/strings.xml
b/metadata.sratim.co.il/resources/language/English/strings.xml
index e526553..bf68d1b 100644
--- a/metadata.sratim.co.il/resources/language/English/strings.xml
+++ b/metadata.sratim.co.il/resources/language/English/strings.xml
@@ -3,5 +3,5 @@
<string id="30000">Enable full cast credits</string>
<string id="30001">Enable trailer</string>
<string id="30002">Enable fanart</string>
- <string id="30003">Get rank from IMDB</string>
+ <string id="30003">Get rating from IMDb</string>
</strings>
diff --git a/metadata.sratim.co.il/resources/settings.xml
b/metadata.sratim.co.il/resources/settings.xml
index 8d75012..2809dac 100644
--- a/metadata.sratim.co.il/resources/settings.xml
+++ b/metadata.sratim.co.il/resources/settings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
<setting label="30000" type="bool" id="fullcredits" default="false"/>
- <setting label="30001" type="bool" id="trailer" default="true"/>
- <setting label="30002" type="bool" id="fanart" default="false"/>
- <setting label="" type="bool" id="imdbrank" default="false"/>
+ <setting label="30001" type="bool" id="imdbtrailer" default="true"/>
+ <setting label="30002" type="bool" id="fanart" default="true"/>
+ <setting label="30003" type="bool" id="imdbrating" default="false"/>
</settings>
diff --git a/metadata.sratim.co.il/sratim.xml b/metadata.sratim.co.il/sratim.xml
index 82ea07e..68a74b6 100644
--- a/metadata.sratim.co.il/sratim.xml
+++ b/metadata.sratim.co.il/sratim.xml
@@ -1,91 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.0" date="2009-10-04">
+<scraper framework="1.0" date="2010-10-10" >
<CreateSearchUrl dest="3">
- <RegExp input="$$1"
output="<url>http://www.sratim.co.il/movies/search.aspx?Keyword=\1</url>";
dest="3">
- <expression noclean="1"/>
+ <RegExp input="$$1"
output="<url>http://sratim.co.il/browse.php?q=\1|User-Agent=Mozilla%2F4.0%20(compatible%3B%20MSIE%207.0%3B%20Windows%20NT%206.0)</url>"
dest="3">
+ <expression noclean="1" />
</RegExp>
</CreateSearchUrl>
<GetSearchResults dest="8">
<RegExp input="$$5" output="<?xml version="1.0"
encoding="iso-8859-1"
standalone="yes"?><results>\1</results>" dest="8">
- <RegExp input="$$1"
output="<entity><title>\2</title><url>http://www.sratim.co.il/\1</url></entity>";
dest="5">
- <expression clear="yes" noclean="1"
repeat="yes"><table class="MovieViews".*?>.*?<a
href="(.[^"]*)">(.*?)<div>.*?</table></expression>
+ <RegExp input="$$1"
output="<entity><title>\2</title><url>http://www.sratim.co.il/\1|User-Agent=Mozilla%2F4.0%20(compatible%3B%20MSIE%207.0%3B%20Windows%20NT%206.0)</url></entity>"
dest="5">
+ <expression repeat="yes" clear="yes"
noclean="1"><a href="(view.php[^"]*)".title="([^"]*)"</expression>
</RegExp>
- <expression clear="yes" noclean="1"/>
+ <expression clear="yes" noclean="1" />
</RegExp>
</GetSearchResults>
<GetDetails dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
<RegExp input="$$1"
output="<title>\1</title>" dest="5+">
- <expression trim="1"
noclean="1"><div.*?class="Box_Header"><table.*?><tr><td.*?>(.*?)</td></expression>
+ <!--<expression trim="1"
noclean="1">class="subtext.view".*?>.*?<b>(.*?)</b></expression>-->
+ <expression trim="1" noclean="1"><h1
class="subtext_view">([^<]*)</h1></expression>
</RegExp>
<RegExp input="$$1"
output="<plot>\1</plot>" dest="5+">
- <expression
trim="1"><u>תקצ×ר:</u></b><br
/>(.*?)</div></expression>
+ <expression trim="1"><div
style="font-size:14px;text-align:justify;">(.*)</div><br
/><div</expression>
</RegExp>
<RegExp input="$$1"
output="<genre>\1</genre>" dest="5+">
- <expression trim="1" repeat="yes"><a
href="/movies/search.aspx\?g=.*?">(.*?)</a></expression>
+ <expression repeat="yes" trim="1"><a
href="browse.php\?g=[^"]*">([^<]*)</a></expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="7">
- <expression repeat="no"
noclean="1"><b>ש××§× ××:</b>(.*?)<br /></expression>
+ <expression noclean="1"><td
class[^>]*>ש××§× ××:</td>[^<]*<td>(.*)</td></expression>
</RegExp>
<RegExp input="$$1"
output="<studio>\1</studio>" dest="5+">
- <expression trim="1" repeat="yes"><a
href="/movies/companies/view.aspx\?id=.*?">(.*?)</a></expression>
+ <!--<expression trim="1" repeat="yes"><a
href="/movies/companies/view.aspx\?id=.*?">(.*?)</a></expression>-->
+ <expression><td
class[^>]*>×פק×:</td>[^<]*<td>(.{1,100})</tr><tr><td
class="paramsub" valign="top" width="62"</expression>
</RegExp>
<RegExp input="$$7"
output="<actor><name>\1</name></actor>" dest="5+">
- <expression trim="1" repeat="yes"><a
href="/movies/actors/view.aspx\?id=.*?">(.*?)</a></expression>
+ <expression repeat="yes" trim="1"><a
href="profileview.php\?id=[^"]*">([^<]*)</a></expression>
</RegExp>
- <RegExp conditional="fullcredits" input="$$7"
output="<url
function="GetActorDetails">http://www.sratim.co.il/movies/actors/view.aspx?id=\1</url>";
dest="5+">
- <expression repeat="yes"><a
href="/movies/actors/view.aspx\?id=(.*?)"></expression>
+ <RegExp conditional="fullcredits" input="$$7"
output="<url
function="GetActorDetails">http://www.sratim.co.il/profileview.php?id=\1</url>";
dest="5+">
+ <expression repeat="yes"><a
href="profileview.php\?id=([^"]*)"></expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="7">
- <expression repeat="no"
noclean="1"><b>××××:</b>(.*?)<br /></expression>
+ <expression noclean="1"><td
class[^>]*>×××××:</td><td>(.*)</td></expression>
</RegExp>
<RegExp input="$$7"
output="<director>\1</director>" dest="5+">
- <expression trim="1" repeat="yes"><a
href="/movies/actors/view.aspx\?id=.*?">(.*?)</a></expression>
+ <expression repeat="yes" trim="1"><a
href="profileview.php\?id=[^"]*">([^<]*)</a></expression>
</RegExp>
<RegExp input="$$1"
output="<year>\1</year>" dest="5+">
- <expression trim="1"><span
id="ctl00_ctl00_Body_Body_Box_ProductionYear">(.*?)</span></expression>
+ <expression trim="1"><td
class="prod_year"[^>]*>([^<]*)</td></expression>
</RegExp>
- <RegExp input="$$1"
output="<rating>\1</rating>" dest="5+" conditional="!imdbrank">
- <expression trim="1" repeat="no"><img
alt="(.*?)/10" src="/Images/Star_Big_.*?.gif" /></expression>
+ <RegExp conditional="!imdbrating" input="$$1"
output="<rating>\1</rating>" dest="5+">
+ <expression trim="1"><img
src="images/star(.*)lv.gif"</expression>
</RegExp>
- <RegExp input="$$1"
output="<votes>\1</votes>" dest="5+" conditional="!imdbrank">
- <expression trim="1"
repeat="no"><span.*?>([0-9]+?) ××ר×××</span></expression>
+ <RegExp conditional="!imdbrating" input="$$1"
output="<votes>0</votes>" dest="5+">
+ <!--<expression trim="1"
repeat="no"><span.*?>([0-9]+?) ××ר×××</span></expression>-->
+ <expression />
</RegExp>
<RegExp input="$$1"
output="<runtime>\1</runtime>" dest="5+">
- <expression trim="1"
repeat="no"><b>××ר×:</b> ([0-9]+?) ×ק×ת.</expression>
+ <expression trim="1">>××ר×
×××:</td><td>([0-9]+) ×ק'</td></expression>
</RegExp>
- <RegExp input="$$1"
output="<thumb>http://www.sratim.co.il\1</thumb>"; dest="5+">
- <expression trim="1" repeat="no"><img
src="(/movies/images/.*?)"
id="ctl00_ctl00_Body_Body_Box_MainPicture"</expression>
+ <RegExp input="$$1"
output="<thumb>http://www.sratim.co.il/\1</thumb>"; dest="5+">
+ <expression trim="1"><img class="lrg_cover"
src="([^"]*)" border="</expression>
</RegExp>
- <RegExp input="$$1" output="<url
function="GetIMDBDetails">http://www.imdb.com/title/\1/</url>";
dest="5+">
- <expression trim="1"
repeat="no">http://www\.imdb\.com/title/(tt\d+?)'</expression>
+ <RegExp conditional="imdbrating" input="$$1"
output="<url cache="tt\1-main.html"
function="GetIMDBDetails">http://akas.imdb.com/title/\1/</url>";
dest="5+">
+ <expression
trim="1">http://www.imdb.com/title/(tt[^"]+)"</expression>
</RegExp>
- <RegExp conditional="imdbrank" input="$$1"
output="<rating>\1</rating>" dest="5+">
- <expression trim="1" repeat="no"><img
alt="([0-9]+\.[0-9]*)/10" src="/Images/Star_IMDB</expression>
+ <RegExp input="$$1"
output="<votes>\1</votes>" dest="5+">
+ <expression
trim="1">Star_IMDB.*?<span.*?>([0-9]+?)
××ר×××</span></expression>
</RegExp>
- <RegExp conditional="imdbrank" input="$$1"
output="<votes>\1</votes>" dest="5+">
- <expression trim="1"
repeat="no">Star_IMDB.*?<span.*?>([0-9]+?)
××ר×××</span></expression>
+ <RegExp conditional="fanart" input="$$1"
output="<chain
function="GetTMDBFanartByIdChain">\1</chain>" dest="5+">
+ <expression
trim="1">http://www.imdb.com/title/(tt[^"]+)</expression>
</RegExp>
- <RegExp conditional="fanart" input="$$1"
output="<url
function="GetTMDBFanartById">http://www.imdb.com/title/\1</url>";
dest="5+">
- <expression trim="1"
repeat="no">http://www\.imdb\.com/title/(tt\d+?)'</expression>
+ <RegExp conditional="imdbtrailer" input="$$1"
output="<chain function="GetIMDBTrailerById">\1</chain>"
dest="5+">
+ <expression
trim="1">http://www.imdb.com/title/(tt[^"]+)</expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</GetDetails>
- <GetActorDetails dest="5">
- <RegExp input="$$2" output="<details>\1</details>"
dest="5+">
- <RegExp input="$$1"
output="<actor><name>\1</name><thumb>http://www.sratim.co.il\2</thumb></actor>";
dest="2+">
- <expression clear="yes" repeat="no"><div
class="Box_Header">.*?<span.*?>(.*?)</span>.*?<div
class="Box_Body">.*?<img.*?src="(/movies/Actors/Images/.*?)"
/></expression>
+ <GetActorDetails dest="3">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="3">
+ <RegExp input="$$1"
output="<actor><name>\2</name><thumb>http://www.sratim.co.il\1</thumb></actor>";
dest="2">
+ <expression clear="yes"><img
src="(/contents/Actors/Images/[^"]*)"[^>]*>.*<span
class="subtext_view"><b?>([^<]*)</b></expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</GetActorDetails>
- <GetIMDBDetails dest="5">
- <RegExp input="$$3" output="<?xml version="1.0"
encoding="utf-8"
standalone="yes"?><details>\1</details>" dest="5+">
- <RegExp conditional="trailer" input="$$1"
output="<url
function="GetIMDBTrailer">http://akas.imdb.com/video/imdb/vi\1/player</url>";
dest="3+">
- <expression>/vi([0-9]*)/"</expression>
+ <GetIMDBDetails dest="3">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="3">
+ <!--Get rating from imdb.com-->
+ <RegExp input="$$1"
output="<rating>\1</rating><votes>\2</votes>" dest="5">
+ <expression><span
class="rating-rating">([0-9.]+).*?>([0-9,]+) votes</a></expression>
+ </RegExp>
+ <!--Get top250 from imdb.com-->
+ <RegExp input="$$1"
output="<top250>\1</top250>" dest="5+">
+ <expression>Top 250 #([0-9]*)</</expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</GetIMDBDetails>
-</scraper>
+</scraper>
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
metadata.sratim.co.il/LICENSE.txt | 282 ++++++++++++++++++++
metadata.sratim.co.il/addon.xml | 19 +-
.../resources/language/English/strings.xml | 2 +-
metadata.sratim.co.il/resources/settings.xml | 6 +-
metadata.sratim.co.il/sratim.xml | 96 ++++---
5 files changed, 349 insertions(+), 56 deletions(-)
create mode 100644 metadata.sratim.co.il/LICENSE.txt
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
