The branch, dharma has been updated
via 95102f7cd74c1fff810faff1c47fb2890d992476 (commit)
from 2829d2a36c2f0ed9fd764eb4cd1a5085b751c590 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=95102f7cd74c1fff810faff1c47fb2890d992476
commit 95102f7cd74c1fff810faff1c47fb2890d992476
Author: vdrfan <[email protected]>
Date: Tue Dec 20 15:00:30 2011 +0100
[metadata.sratim.co.il] updated to version 1.1.8
diff --git a/metadata.sratim.co.il/addon.xml b/metadata.sratim.co.il/addon.xml
index ad87e9e..1a4eeaa 100644
--- a/metadata.sratim.co.il/addon.xml
+++ b/metadata.sratim.co.il/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.sratim.co.il"
name="Sratim"
- version="1.1.7"
+ version="1.1.8"
provider-name="Lev Waisberg">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.sratim.co.il/changelog.txt
b/metadata.sratim.co.il/changelog.txt
index 446289d..5861bb6 100644
--- a/metadata.sratim.co.il/changelog.txt
+++ b/metadata.sratim.co.il/changelog.txt
@@ -1,3 +1,8 @@
+[B]1.1.8[/B]
+- fix plot scrapping
+- fix runtime scrapping
+- added option to choose language of title (eng/heb)
+
[B]1.1.7[/B]
- Added .Nfo file support (will take imdb url from .nfo file and fetch movie
with it) - done by [email protected]
diff --git a/metadata.sratim.co.il/resources/language/English/strings.xml
b/metadata.sratim.co.il/resources/language/English/strings.xml
index 1b1744f..36ad984 100644
--- a/metadata.sratim.co.il/resources/language/English/strings.xml
+++ b/metadata.sratim.co.il/resources/language/English/strings.xml
@@ -5,4 +5,5 @@
<string id="30002">Get fanart from</string>
<string id="30003">Get thumb (Movie Poster) from </string>
<string id="30004">Get rating from </string>
+ <string id="30005">Movie title language</string>
</strings>
diff --git a/metadata.sratim.co.il/resources/language/Hebrew/strings.xml
b/metadata.sratim.co.il/resources/language/Hebrew/strings.xml
index 34ad380..31af063 100644
--- a/metadata.sratim.co.il/resources/language/Hebrew/strings.xml
+++ b/metadata.sratim.co.il/resources/language/Hebrew/strings.xml
@@ -5,4 +5,5 @@
<string id="30002">××× ×¤×× ××¨× ×</string>
<string id="30003">××× ×¤×ס×ר ×</string>
<string id="30004">××× ×¦××× ×¡×¨× ×</string>
+ <string id="30004">שפת ×©× ×סר×</string>
</strings>
diff --git a/metadata.sratim.co.il/resources/settings.xml
b/metadata.sratim.co.il/resources/settings.xml
index 71dc92a..3a5a072 100644
--- a/metadata.sratim.co.il/resources/settings.xml
+++ b/metadata.sratim.co.il/resources/settings.xml
@@ -5,4 +5,5 @@
<setting label="30002" type="labelenum" values="MovieDB|Google|None"
id="fanart" default="MovieDB" />
<setting label="30003" type="labelenum" values="Sratim|TMDB"
id="thumbFrom" default="Sratim" />
<setting label="30004" type="labelenum" values="IMDB|Sratim"
id="ratingFrom" default="Sratim"/>
+ <setting label="30005" type="labelenum" values="Hebrew|English"
id="titleLang" default="Hebrew"/>
</settings>
diff --git a/metadata.sratim.co.il/sratim.xml b/metadata.sratim.co.il/sratim.xml
index 0c3052d..807e364 100644
--- a/metadata.sratim.co.il/sratim.xml
+++ b/metadata.sratim.co.il/sratim.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.0" date="2010-05-26" >
+<scraper framework="1.0" date="2010-12-16" >
<NfoUrl dest="3">
- <RegExp input="$$1" output="<details><url
function="ImdbNfoToSratimLink">http://sratim.co.il/browse.php?cs=movies&q=tt\1|User-Agent=Mozilla%2F4.0%20(compatible%3B%20MSIE%207.0%3B%20Windows%20NT%206.0)</url></details>"
dest="3">
- <expression
noclean="1">imdb....?/title/tt([0-9]*)</expression>
- </RegExp>
- </NfoUrl>
+ <RegExp input="$$1" output="<details><url
function="ImdbNfoToSratimLink">http://sratim.co.il/browse.php?cs=movies&q=tt\1|User-Agent=Mozilla%2F4.0%20(compatible%3B%20MSIE%207.0%3B%20Windows%20NT%206.0)</url></details>"
dest="3">
+ <expression
noclean="1">imdb....?/title/tt([0-9]*)</expression>
+ </RegExp>
+ </NfoUrl>
<ImdbNfoToSratimLink dest="3">
<RegExp input="$$1"
output="<details><url>http://www.sratim.co.il/view.php?id=\1|User-Agent=Mozilla%2F4.0%20(compatible%3B%20MSIE%207.0%3B%20Windows%20NT%206.0)</url><id>\1</id></details>"
dest="3">
<expression clear="yes" noclean="1"><a
href="view.php\?id=([0-9]+)[^"]*".title="([^"]*)"</expression>
@@ -28,11 +28,36 @@
<RegExp input="$$1" output="<id>\1</id>"
dest="5+">
<expression clear="yes"
noclean="1">http://www.imdb.com/title/(tt[^"]+)</expression>
</RegExp>
- <RegExp input="$$1"
output="<title>\1</title>" dest="5+">
- <expression trim="1"
noclean="1"><title>(.*?)\s*(\(\d*\))? â
סר×××</title></expression>
+
+ <!--title (14)-->
+ <RegExp input="$INFO[titleLang]" output="$$14"
dest="5+">
+ <RegExp input="$$1"
output="<title>\1</title>" dest="14">
+ <expression trim="1"
noclean="1"><title>(.*?)\s*(\(\d*\))? â
סר×××</title></expression>
+ </RegExp>
+ <expression>Hebrew</expression>
+ </RegExp>
+ <RegExp input="$INFO[titleLang]" output="$$14"
dest="5+">
+ <RegExp input="$$1"
output="<originaltitle>\1</originaltitle>" dest="14">
+ <expression trim="1"><div
class="smtext"
style="direction:ltr;text-align:right;">([^<]*)</span></expression>
+ </RegExp>
+ <expression>Hebrew</expression>
+ </RegExp>
+ <RegExp input="$INFO[titleLang]" output="$$14"
dest="5+">
+ <RegExp input="$$1"
output="<originaltitle>\1</originaltitle>" dest="14">
+ <expression trim="1"
noclean="1"><title>(.*?)\s*(\(\d*\))? â
סר×××</title></expression>
+ </RegExp>
+ <expression>English</expression>
+ </RegExp>
+ <RegExp input="$INFO[titleLang]" output="$$14"
dest="5+">
+ <RegExp input="$$1"
output="<title>\1</title>" dest="14">
+ <expression trim="1"><div
class="smtext"
style="direction:ltr;text-align:right;">([^<]*)</span></expression>
+ </RegExp>
+ <expression>English</expression>
</RegExp>
+
+ <!--plot-->
<RegExp input="$$1"
output="<plot>\1</plot>" dest="5+">
- <expression trim="1"><meta
name="description" content="(([^<]*(<br\s*/?>)?[^<]*)*)"
/></expression>
+ <expression trim="1"><meta
name="description"
content="(([^<]*(<br\s*/?>)?[^<]*)*)"</expression>
</RegExp>
<!--geners (7)-->
@@ -43,21 +68,12 @@
<expression repeat="yes" trim="1"><a
href="browse.php\?g=[^"]*">([^<]*)</a></expression>
</RegExp>
+ <!--studio -->
<RegExp input="$$1"
output="<studio>\1</studio>" dest="5+">
<expression><td
class[^>]*>×פק×:</td>[^<]*<td>([^<]*)</td></expression>
</RegExp>
- <!-- actors upper list
- <RegExp input="$$1" output="\1" dest="8">
- <expression noclean="1"><td
class[^>]*>ש××§× ××:</td>[^<]*<td>(.*?)</td></expression>
- </RegExp>
- <RegExp input="$$8"
output="<actor><name>\1</name></actor>" dest="5+">
- <expression repeat="yes" trim="1"><a
href="profileview.php\?id=[^"]*">([^<]*)</a></expression>
- </RegExp>
- <RegExp conditional="fullcredits" input="$$8"
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>
- -->
- <!-- actors lower list -->
+
+ <!-- actors lower list -->
<RegExp input="$$1" output="\1" dest="8">
<expression noclean="1"><td
class="actorlistbg"[^>]*>(.*?)</table></expression>
</RegExp>
@@ -67,6 +83,7 @@
<RegExp conditional="fullcredits" input="$$8"
output="<url
function="GetActorDetails">http://www.sratim.co.il/profileview.php?id=\1</url>";
dest="5+">
<expression repeat="yes"><a
href="profileview.php\?id=([^"]*)"><b>[^<]*</b></expression>
</RegExp>
+
<!--director (12)-->
<RegExp input="$$1" output="\1" dest="12">
<expression noclean="1"><td
class[^>]*>×××××:</td><td>(.*?)</td></expression>
@@ -77,10 +94,9 @@
<!--runtime-->
<RegExp input="$$1"
output="<runtime>\1</runtime>" dest="5+">
- <expression trim="1"></div>([0-9]+?)
×ק'</expression>
+ <expression trim="1">([0-9]+?)
×ק'</expression>
</RegExp>
-
<!--year-->
<RegExp input="$$1"
output="<year>\1</year>" dest="5+">
<expression trim="1"><a
href="browse.php\?uy=[^>]*>([^<]*)</a></expression>
@@ -135,11 +151,6 @@
<expression>Google</expression>
</RegExp>
- <!-- english title -->
- <RegExp input="$$1"
output="<originaltitle>\1</originaltitle>" dest="5+">
- <expression trim="1"><div class="smtext"
style="direction:ltr;text-align:right;">([^<]*)</span></expression>
- </RegExp>
-
<!-- Trailers (6) -->
<RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet480p">$$6</chain>" dest="5+">
<RegExp input="$$1" output="\1" dest="6">
-----------------------------------------------------------------------
Summary of changes:
metadata.sratim.co.il/addon.xml | 2 +-
metadata.sratim.co.il/changelog.txt | 5 ++
.../resources/language/English/strings.xml | 1 +
.../resources/language/Hebrew/strings.xml | 1 +
metadata.sratim.co.il/resources/settings.xml | 1 +
metadata.sratim.co.il/sratim.xml | 65 +++++++++++--------
6 files changed, 47 insertions(+), 28 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Write once. Port to many.
Get the SDK and tools to simplify cross-platform app development. Create
new or port existing apps to sell to consumers worldwide. Explore the
Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
http://p.sf.net/sfu/intel-appdev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
