The branch, eden-pre has been updated
via 0699d323017c29d8a62eab2062022602b4e49541 (commit)
from e9a426bf7c4383e681717b3dfd8cb41a961681f9 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=0699d323017c29d8a62eab2062022602b4e49541
commit 0699d323017c29d8a62eab2062022602b4e49541
Author: olympia <[email protected]>
Date: Mon Dec 12 13:18:45 2011 +0100
[metadata.sratim.co.il] updated to version 1.1.7
diff --git a/metadata.sratim.co.il/addon.xml b/metadata.sratim.co.il/addon.xml
index 407c2f8..ad87e9e 100644
--- a/metadata.sratim.co.il/addon.xml
+++ b/metadata.sratim.co.il/addon.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.sratim.co.il"
name="Sratim"
- version="1.1.6"
+ version="1.1.7"
provider-name="Lev Waisberg">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
<import addon="metadata.common.themoviedb.org" version="1.0.7"/>
- <import addon="metadata.common.imdb.com" version="2.1.0"/>
+ <import addon="metadata.common.imdb.com" version="2.1.3"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="he"
diff --git a/metadata.sratim.co.il/changelog.txt
b/metadata.sratim.co.il/changelog.txt
index 3f645fb..446289d 100644
--- a/metadata.sratim.co.il/changelog.txt
+++ b/metadata.sratim.co.il/changelog.txt
@@ -1,3 +1,10 @@
+[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]
+- Added option to get thumbs from TMDB / Sratim
+- changed settings format for rating
+- added options for fan art instead of true/false
+
[B]1.1.6[/B]
- fix thumb scrapping (due to changes in sratim.co.il format)
@@ -21,4 +28,4 @@
- add original title
[B]1.1.0[/B]
-- big pile of fixes, should work now after long time!
\ No newline at end of file
+- big pile of fixes, should work now after long time!
diff --git a/metadata.sratim.co.il/resources/language/English/strings.xml
b/metadata.sratim.co.il/resources/language/English/strings.xml
index 8248152..1b1744f 100644
--- a/metadata.sratim.co.il/resources/language/English/strings.xml
+++ b/metadata.sratim.co.il/resources/language/English/strings.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<strings>
<string id="30000">Enable full cast credits</string>
- <string id="30001">Enable Trailers from HD-Trailers.net</string>
- <string id="30002">Enable fanart</string>
- <string id="30003">Get rating from IMDb</string>
+ <string id="30001">Get Trailers from HD-Trailers.net in </string>
+ <string id="30002">Get fanart from</string>
+ <string id="30003">Get thumb (Movie Poster) from </string>
+ <string id="30004">Get rating from </string>
</strings>
diff --git a/metadata.sratim.co.il/resources/settings.xml
b/metadata.sratim.co.il/resources/settings.xml
index 84971c1..71dc92a 100644
--- a/metadata.sratim.co.il/resources/settings.xml
+++ b/metadata.sratim.co.il/resources/settings.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
- <setting label="30000" type="bool" id="fullcredits" default="false"/>
- <setting label="30001" type="labelenum" values="No|480p|720p|1080p"
id="TrailerQ" default="480p"/>
- <setting label="30002" type="bool" id="fanart" default="true"/>
- <setting label="30003" type="bool" id="imdbrating" default="false"/>
+ <setting label="30000" type="bool" id="fullcredits" default="false" />
+ <setting label="30001" type="labelenum" values="No|480p|720p|1080p"
id="TrailerQ" default="480p" />
+ <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"/>
</settings>
diff --git a/metadata.sratim.co.il/sratim.xml b/metadata.sratim.co.il/sratim.xml
index c52ff3d..0c3052d 100644
--- a/metadata.sratim.co.il/sratim.xml
+++ b/metadata.sratim.co.il/sratim.xml
@@ -1,5 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<scraper framework="1.0" date="2010-05-26" >
+ <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>
+ <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>
+ </RegExp>
+ </ImdbNfoToSratimLink>
<CreateSearchUrl dest="3">
<RegExp input="$$1"
output="<url>http://sratim.co.il/browse.php?cs=movies&q=\1|User-Agent=Mozilla%2F4.0%20(compatible%3B%20MSIE%207.0%3B%20Windows%20NT%206.0)</url>"
dest="3">
<expression noclean="1" />
@@ -24,12 +34,15 @@
<RegExp input="$$1"
output="<plot>\1</plot>" dest="5+">
<expression trim="1"><meta
name="description" content="(([^<]*(<br\s*/?>)?[^<]*)*)"
/></expression>
</RegExp>
+
+ <!--geners (7)-->
<RegExp input="$$1" output="\1" dest="7">
<expression
noclean="1">class="Box_Blue"(.*?)class="profilelrgstars"</expression>
</RegExp>
<RegExp input="$$7"
output="<genre>\1</genre>" dest="5+">
<expression repeat="yes" trim="1"><a
href="browse.php\?g=[^"]*">([^<]*)</a></expression>
</RegExp>
+
<RegExp input="$$1"
output="<studio>\1</studio>" dest="5+">
<expression><td
class[^>]*>×פק×:</td>[^<]*<td>([^<]*)</td></expression>
</RegExp>
@@ -54,37 +67,80 @@
<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>
- <RegExp input="$$1" output="\1" dest="9">
+ <!--director (12)-->
+ <RegExp input="$$1" output="\1" dest="12">
<expression noclean="1"><td
class[^>]*>×××××:</td><td>(.*?)</td></expression>
</RegExp>
- <RegExp input="$$9"
output="<director>\1</director>" dest="5+">
+ <RegExp input="$$12"
output="<director>\1</director>" dest="5+">
<expression repeat="yes" trim="1"><a
href="profileview.php\?id=[^"]*">([^<]*)</a></expression>
</RegExp>
+
+ <!--runtime-->
+ <RegExp input="$$1"
output="<runtime>\1</runtime>" dest="5+">
+ <expression trim="1"></div>([0-9]+?)
×ק'</expression>
+ </RegExp>
+
+
+ <!--year-->
<RegExp input="$$1"
output="<year>\1</year>" dest="5+">
<expression trim="1"><a
href="browse.php\?uy=[^>]*>([^<]*)</a></expression>
</RegExp>
- <RegExp conditional="!imdbrating" input="$$1"
output="<rating>\1</rating>" dest="5+">
- <expression trim="1"><span
class="rank_redtext"[^>]*>([^<]*)</span></expression>
+
+ <!--rating (10)-->
+ <RegExp input="$INFO[ratingFrom]" output="$$10"
dest="5+">
+ <RegExp input="$$1"
output="<rating>\1</rating>" dest="10">
+ <expression trim="1"><span
class="rank_redtext"[^>]*>([^<]*)</span></expression>
+ </RegExp>
+ <expression>Sratim</expression>
</RegExp>
- <RegExp conditional="!imdbrating" input="$$1"
output="<votes>0</votes>" dest="5+">
- <!--<expression trim="1"
repeat="no"><span.*?>([0-9]+?) ××ר×××</span></expression>-->
- <expression />
+ <RegExp input="$INFO[ratingFrom]" output="$$10"
dest="5+">
+ <RegExp input="$$1"
output="<votes>0</votes>" dest="10">
+ <!--<expression trim="1"
repeat="no"><span.*?>([0-9]+?) ××ר×××</span></expression>-->
+ <expression />
+ </RegExp>
+ <expression>Sratim</expression>
</RegExp>
- <RegExp input="$$1"
output="<runtime>\1</runtime>" dest="5+">
- <expression trim="1"></div>([0-9]+?)
×ק'</expression>
+ <RegExp input="$INFO[ratingFrom]" output="<chain
function="GetIMDBRatingById">$$10</chain>" dest="5+">
+ <RegExp input="$$1" output="\1" dest="10">
+ <expression
trim="1">http://www.imdb.com/title/(tt[^"]+)"</expression>
+ </RegExp>
+ <expression>IMDB</expression>
</RegExp>
- <RegExp input="$$1"
output="<thumb>http://www.sratim.co.il\1</thumb>"; dest="5+">
- <expression trim="1"><img src="([^"]*)"
class="lrg_cover" alt="</expression>
+
+ <!--thumb (9)-->
+ <RegExp input="$INFO[thumbFrom]" output="<chain
function="GetTMDBThumbsByIdChain">$$9</chain>" dest="5+">
+ <RegExp input="$$1" output="\1" dest="9">
+ <expression
trim="1">http://www.imdb.com/title/(tt[^"]+)</expression>
+ </RegExp>
+ <expression>IMDB</expression>
</RegExp>
- <RegExp input="$$1"
output="<originaltitle>\1</originaltitle>" dest="5+">
- <expression trim="1"><div class="smtext"
style="direction:ltr;text-align:right;">([^<]*)</span></expression>
+ <RegExp input="$INFO[thumbFrom]" output="$$9" dest="5+">
+ <RegExp input="$$1"
output="<thumb>http://www.sratim.co.il\1</thumb>"; dest="9">
+ <expression trim="1"><img
src="([^"]*)" class="lrg_cover"</expression>
+ </RegExp>
+ <expression>Sratim</expression>
</RegExp>
- <RegExp conditional="imdbrating" input="$$1"
output="<chain function="GetIMDBRatingById">\1</chain>"
dest="5+">
- <expression
trim="1">http://www.imdb.com/title/(tt[^"]+)"</expression>
+
+ <!-- Fan Art (13)-->
+ <RegExp input="$INFO[fanart]" output="<chain
function="GetTMDBFanartByIdChain">$$13</chain>" dest="5+">
+ <RegExp input="$$1" output="\1" dest="13">
+ <expression
trim="1">http://www.imdb.com/title/(tt[^"]+)</expression>
+ </RegExp>
+ <expression>MovieDB</expression>
</RegExp>
- <RegExp conditional="fanart" input="$$1"
output="<chain
function="GetTMDBFanartByIdChain">\1</chain>" dest="5+">
- <expression
trim="1">http://www.imdb.com/title/(tt[^"]+)</expression>
+ <RegExp input="$INFO[fanart]" output="<chain
function="GetGoogleFanart">$$13</chain>" dest="5+">
+ <RegExp input="$$1" output="\1" dest="13">
+ <expression
trim="1">class="smtext".+?right;">(.*?)<</expression>
+ </RegExp>
+ <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">
<expression noclean="1"><div
class="smtext"
style="direction:ltr;text-align:right;">([^<]*)</span></expression>
-----------------------------------------------------------------------
Summary of changes:
metadata.sratim.co.il/addon.xml | 4 +-
metadata.sratim.co.il/changelog.txt | 9 ++-
.../resources/language/English/strings.xml | 7 +-
.../resources/language/Hebrew/strings.xml | 8 ++
.../resources/language/Hungarian/strings.xml | 6 --
.../resources/language/Korean/strings.xml | 6 --
.../resources/language/Polish/strings.xml | 6 --
.../resources/language/Portuguese/strings.xml | 6 --
metadata.sratim.co.il/resources/settings.xml | 9 +-
metadata.sratim.co.il/sratim.xml | 96 ++++++++++++++++----
10 files changed, 103 insertions(+), 54 deletions(-)
create mode 100644 metadata.sratim.co.il/resources/language/Hebrew/strings.xml
delete mode 100644
metadata.sratim.co.il/resources/language/Hungarian/strings.xml
delete mode 100644 metadata.sratim.co.il/resources/language/Korean/strings.xml
delete mode 100644 metadata.sratim.co.il/resources/language/Polish/strings.xml
delete mode 100644
metadata.sratim.co.il/resources/language/Portuguese/strings.xml
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Learn Windows Azure Live! Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for
developers. It will provide a great way to learn Windows Azure and what it
provides. You can attend the event by watching it streamed LIVE online.
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
