The branch, dharma has been updated
via 7f0494b360f389d97ca17a9a0b696e6e6492971c (commit)
from 5191bf0d6a816aac5e2070fff6c1bfabcda360ef (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=7f0494b360f389d97ca17a9a0b696e6e6492971c
commit 7f0494b360f389d97ca17a9a0b696e6e6492971c
Author: olympia <[email protected]>
Date: Wed Apr 20 23:17:37 2011 +0200
[metadata.sratim.co.il] updated to version 1.1.0
diff --git a/metadata.sratim.co.il/addon.xml b/metadata.sratim.co.il/addon.xml
index 9de7ee8..5313808 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.0.9"
- provider-name="G.Vago & sking">
+ version="1.1.0"
+ 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.0.4"/>
+ <import addon="metadata.common.imdb.com" version="2.1.0"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="he"
@@ -26,6 +26,5 @@
<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="pt">Descarregar informação de filmes de
www.sratim.co.il</description>
- <broken>will not download most of the details, nor artwork</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 bf68d1b..05534eb 100644
--- a/metadata.sratim.co.il/resources/language/English/strings.xml
+++ b/metadata.sratim.co.il/resources/language/English/strings.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<strings>
<string id="30000">Enable full cast credits</string>
- <string id="30001">Enable trailer</string>
<string id="30002">Enable fanart</string>
<string id="30003">Get rating from IMDb</string>
</strings>
diff --git a/metadata.sratim.co.il/resources/language/Hungarian/strings.xml
b/metadata.sratim.co.il/resources/language/Hungarian/strings.xml
index 26c9860..fada83e 100644
--- a/metadata.sratim.co.il/resources/language/Hungarian/strings.xml
+++ b/metadata.sratim.co.il/resources/language/Hungarian/strings.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<strings>
<string id="30000">Teljes szereposztás engedélyezése</string>
- <string id="30001">FilmelÅzetes engedélyezése</string>
<string id="30002">Fanartképek engedélyezése</string>
<string id="30003">IMDb besorolás letöltése</string>
</strings>
diff --git a/metadata.sratim.co.il/resources/language/Korean/strings.xml
b/metadata.sratim.co.il/resources/language/Korean/strings.xml
index ac85431..6384a18 100644
--- a/metadata.sratim.co.il/resources/language/Korean/strings.xml
+++ b/metadata.sratim.co.il/resources/language/Korean/strings.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<strings>
<string id="30000">ì ì²´ ì¶ì°ì§ ê°ì ¸ì¤ê¸°</string>
- <string id="30001">ìê³ í¸ ê°ì ¸ì¤ê¸°</string>
<string id="30002">í¬ìí¸ ê°ì ¸ì¤ê¸°</string>
<string id="30003">IMDBë¡ ë¶í° íì ê°ì ¸ì¤ê¸°</string>
</strings>
diff --git a/metadata.sratim.co.il/resources/language/Polish/strings.xml
b/metadata.sratim.co.il/resources/language/Polish/strings.xml
index 8a8d6ad..2d6f4db 100644
--- a/metadata.sratim.co.il/resources/language/Polish/strings.xml
+++ b/metadata.sratim.co.il/resources/language/Polish/strings.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<strings>
<string id="30000">WÅÄ
cz peÅnÄ
obsadÄ</string>
- <string id="30001">WÅÄ
cz zwiastuny</string>
<string id="30002">WÅÄ
cz fanarat</string>
<string id="30003">Pobieraj ocenÄ z IMDB</string>
</strings>
diff --git a/metadata.sratim.co.il/resources/language/Portuguese/strings.xml
b/metadata.sratim.co.il/resources/language/Portuguese/strings.xml
index 9f883fa..20d161e 100644
--- a/metadata.sratim.co.il/resources/language/Portuguese/strings.xml
+++ b/metadata.sratim.co.il/resources/language/Portuguese/strings.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<strings>
<string id="30000">Ligar créditos completos do elenco</string>
- <string id="30001">Ligar trailer</string>
<string id="30002">Ligar fanart</string>
<string id="30003">Obter classificação do IMDb</string>
</strings>
diff --git a/metadata.sratim.co.il/resources/settings.xml
b/metadata.sratim.co.il/resources/settings.xml
index 2809dac..52fc712 100644
--- a/metadata.sratim.co.il/resources/settings.xml
+++ b/metadata.sratim.co.il/resources/settings.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
<setting label="30000" type="bool" id="fullcredits" 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 490dbc3..9ee3691 100644
--- a/metadata.sratim.co.il/sratim.xml
+++ b/metadata.sratim.co.il/sratim.xml
@@ -1,28 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.0" date="2010-10-10" >
+<scraper framework="1.0" date="2010-04-20" >
<CreateSearchUrl dest="3">
- <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">
+ <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" />
</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|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 input="$$1"
output="<entity><title>\2</title><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></entity>"
dest="5">
+ <expression repeat="yes" clear="yes"
noclean="1"><a href="view.php\?q=[^=]+=([^"]*)".title="([^"]*)"</expression>
</RegExp>
<expression clear="yes" noclean="1" />
</RegExp>
</GetSearchResults>
<GetDetails dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
+ <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">class="subtext.view".*?>.*?<b>(.*?)</b></expression>-->
- <expression trim="1" noclean="1"><h1
class="subtext_view">([^<]*)<</expression>
+ <expression trim="1" noclean="1"><h1
class="subtext_view">[^<]*<div[^>]*>[^<]*<a
href[^>]*>[^<]*</a[^>]*>[^<]*</div[^>]*>"?([^<]*)"?</h1</expression>
</RegExp>
<RegExp input="$$1"
output="<plot>\1</plot>" dest="5+">
- <expression trim="1"><div
style="font-size:14px;text-align:justify;">(.*?)</div><br
/><div</expression>
+ <expression trim="1"><div id="profilememo"
style="font-size:14px;[^;]*;?text-align:justify;">(([^<]*(<br\s*/?>)?[^<]*)*)</div></expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression noclean="1">title="[0-9]+
××××××(.*?)<table</expression>
</RegExp>
- <RegExp input="$$1"
output="<genre>\1</genre>" dest="5+">
+ <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="\1" dest="7">
@@ -55,10 +61,10 @@
<expression />
</RegExp>
<RegExp input="$$1"
output="<runtime>\1</runtime>" dest="5+">
- <expression trim="1">>××ר×
×××:</td><td>([0-9]+) ×ק'</td></expression>
+ <expression trim="1"></div>([0-9]+?)
×ק'</expression>
</RegExp>
<RegExp input="$$1"
output="<thumb>http://www.sratim.co.il/\1</thumb>"; dest="5+">
- <expression trim="1"><img class="lrg_cover"
src="([^"]*)" border="</expression>
+ <expression trim="1"><img class="lrg_cover"
src="([^"]*)" alt="</expression>
</RegExp>
<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>
@@ -69,9 +75,6 @@
<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="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" />
</RegExp>
</GetDetails>
-----------------------------------------------------------------------
Summary of changes:
metadata.sratim.co.il/addon.xml | 7 ++---
metadata.sratim.co.il/changelog.txt | 2 +
.../resources/language/English/strings.xml | 1 -
.../resources/language/Hungarian/strings.xml | 1 -
.../resources/language/Korean/strings.xml | 1 -
.../resources/language/Polish/strings.xml | 1 -
.../resources/language/Portuguese/strings.xml | 1 -
metadata.sratim.co.il/resources/settings.xml | 1 -
metadata.sratim.co.il/sratim.xml | 27 +++++++++++---------
9 files changed, 20 insertions(+), 22 deletions(-)
create mode 100644 metadata.sratim.co.il/changelog.txt
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
