The branch, dharma has been updated
via bea2dec9fa41a2e2d50669267b2b5f25056faf6b (commit)
from ac9b1aff3148c511bb8eb190a1756b642ca015ca (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=bea2dec9fa41a2e2d50669267b2b5f25056faf6b
commit bea2dec9fa41a2e2d50669267b2b5f25056faf6b
Author: olympia <[email protected]>
Date: Sun Jan 30 15:14:49 2011 +0100
[metadata.filmweb.pl] updated to version 1.1.6
diff --git a/metadata.filmweb.pl/addon.xml b/metadata.filmweb.pl/addon.xml
index cf459cf..7726252 100644
--- a/metadata.filmweb.pl/addon.xml
+++ b/metadata.filmweb.pl/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.filmweb.pl"
name="Filmweb"
- version="1.1.5"
+ version="1.1.6"
provider-name="smuto">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.filmweb.pl/filmweb.xml b/metadata.filmweb.pl/filmweb.xml
index 0972112..e9bb342 100644
--- a/metadata.filmweb.pl/filmweb.xml
+++ b/metadata.filmweb.pl/filmweb.xml
@@ -55,13 +55,28 @@
<RegExp input="$$1" output="\1" dest="6">
<expression
fixchars="1"><h1[^>]+>(.*?)</h1</expression>
</RegExp>
+ <RegExp conditional="UseOriginalTitle"
input="$$8" output="\1" dest="6">
+ <RegExp input="$$1" output="\1"
dest="8">
+ <expression
fixchars="1">class=filmYear>[^>]+>([^<]+)</h2</expression>
+ </RegExp>
+ <expression>(.+)</expression>
+ </RegExp>
<RegExp input="$$6" output="\3 \1" dest="6">
<expression>(.*)(,
(A|An|The|Das|Der|Des|Die|De|L'|Le|Les|La|Un|Une|El|Il|Las|Los|Una|Unos|Unas))$</expression>
</RegExp>
<expression/>
</RegExp>
- <RegExp input="$$1"
output="<originaltitle>\1</originaltitle>" dest="5+">
- <expression
fixchars="1">class=filmYear>[^>]+>(.*?)</h2</expression>
+ <RegExp input="$$6"
output="<originaltitle>\1</originaltitle>" dest="5+">
+ <RegExp input="$$1" output="\1" dest="6">
+ <expression
fixchars="1">class=filmYear>[^>]+>([^<]+)</h2</expression>
+ </RegExp>
+ <RegExp conditional="UseOriginalTitle"
input="$$1" output="\1" dest="6">
+ <expression
fixchars="1"><h1[^>]+>(.*?)</h1</expression>
+ </RegExp>
+ <RegExp input="$$6" output="\3 \1" dest="6">
+ <expression>(.*)(,
(A|An|The|Das|Der|Des|Die|De|L'|Le|Les|La|Un|Une|El|Il|Las|Los|Una|Unos|Unas))$</expression>
+ </RegExp>
+ <expression/>
</RegExp>
<RegExp input="$$1" output="\1" dest="9">
<expression
noclean="1">filmId[^>]+>([0-9]*)</expression>
@@ -73,10 +88,10 @@
<expression
noclean="1">title>.[^<]*\(([0-9]*)</expression>
</RegExp>
<RegExp conditional="!iMDBRatings" input="$$1"
output="<votes>\1</votes>" dest="5+">
- <expression
noclean="1">class="votes">([0-9]*)</expression>
+ <expression noclean="1"
trim="1">v:votes">([^<]+)</expression>
</RegExp>
<RegExp conditional="!iMDBRatings" input="$$1"
output="<rating>\1.\2</rating>" dest="5+">
- <expression
noclean="1">class="rating"[^,]+>([0-9]*),([0-9]*)</expression>
+ <expression
noclean="1">v:average[^,]+>([0-9]*),([0-9]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<tagline>"\1"</tagline>" dest="5+">
<expression
fixchars="1">icoBigReview".*?<h3>(.*?)</h3></expression>
@@ -87,8 +102,8 @@
<RegExp input="$$1"
output="<thumb>\1</thumb>" dest="5+">
<expression
noclean="1">posterLightbox.+?href="([^"]*)\?</expression>
</RegExp>
- <RegExp input="$$1"
output="<outline>\1\2...</outline>" dest="5+">
- <expression
fixchars="1,2">icoBigReview".*?<p>([^\n]+)|icoBigReview".*?<p>\n([^\n]+)</expression>
+ <RegExp input="$$1"
output="<outline>\1</outline>" dest="5+">
+ <expression
fixchars="1"></h3><p>([^<]+)<a</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="6">
<expression
noclean="1">gatunek(.*?)</td></expression>
@@ -121,8 +136,8 @@
<expression
noclean="1">gatunek(.*?)</td></expression>
</RegExp>
<RegExp input="$$10" output="\1" dest="5+">
- <RegExp conditional="!EnableFullCast"
input="$$6"
output="<actor><thumb>\11\2</thumb><name>\3</name><role>\4
\5</role></actor>" dest="10">
- <expression repeat="yes"
fixchars="3,4,5">src="(?:([^"]*\.)[^"]*(\.jpg))?[^\/]+\/span>([^<]+)[^v]+v>\n(.*?)\n(.*?)</div></expression>
+ <RegExp conditional="!EnableFullCast"
input="$$6"
output="<actor><thumb>\11\2</thumb><name>\3</name><role>\4</role></actor>"
dest="10">
+ <expression repeat="yes"
fixchars="3,4">src="(?:([^"]*\.)[^"]*(\.jpg))?[^\/]+\/span>([^<]+)[^v]+v>([^<]+)</expression>
</RegExp>
<RegExp input="$$8" output="<url
function="Obsada">http://www.filmweb.pl/film/xbmc-2009-$$9/cast</url>";
dest="10">
<expression>.+?Animacja.+</expression>
@@ -187,22 +202,34 @@
</GoogleToIMDB>
<Opisy dest="5">
<RegExp input="$$8" output="<?xml version="1.0"
encoding="utf-8"
standalone="yes"?><details><plot>\1</plot></details>"
dest="5">
- <RegExp input="$$1" output="\1" dest="8">
- <expression noclean="1"
fixchars="1">class="desc.*?<p>(.*?)</p></expression>
+ <RegExp input="" output="Na razie nikt nie dodaÅ
streszczenia fabuÅy tego filmu. Możesz byÄ pierwszy! ZamieÅÄ swój opis."
dest="8">
+ <expression />
</RegExp>
- <RegExp input="$$10" output="\1 [opis dystrybutora]"
dest="8">
+ <RegExp input="$$10" output="\1" dest="8">
<RegExp input="$$1" output="\1" dest="10">
- <expression noclean="1"
fixchars="1">class="desc[^~]+<p>([^\[]+)\[opis</expression>
+ <expression noclean="1" fixchars="1">li
class="?desc[^>]+><p>(.*?)</p></expression>
+ </RegExp>
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ <RegExp conditional="opis" input="$$12" output="\1
[opis dystrybutora kino]" dest="8">
+ <RegExp input="$$1" output="\1" dest="12">
+ <expression noclean="1"
fixchars="1">class="desc[^~]+<p>(.*?)</p>[^\[]+\[opis dystrybutora
kino</expression>
+ </RegExp>
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ <RegExp conditional="opis" input="$$11" output="\1
[opis dystrybutora dvd]" dest="8">
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression noclean="1"
fixchars="1">class="desc[^~]+<p>(.*?)</p>[^\[]+\[opis dystrybutora
dvd</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
- <RegExp input="$$11" output="\1 [opis dystrybutora
dvd]" dest="8">
+ <RegExp conditional="!opis" input="$$11" output="\1
[opis dystrybutora dvd]" dest="8">
<RegExp input="$$1" output="\1" dest="11">
<expression noclean="1"
fixchars="1">class="desc[^~]+<p>(.*?)</p>[^\[]+\[opis dystrybutora
dvd</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
- <RegExp input="$$12" output="\1 [opis dystrybutora
kino]" dest="8">
+ <RegExp conditional="!opis" input="$$12" output="\1
[opis dystrybutora kino]" dest="8">
<RegExp input="$$1" output="\1" dest="12">
<expression noclean="1"
fixchars="1">class="desc[^~]+<p>(.*?)</p>[^\[]+\[opis dystrybutora
kino</expression>
</RegExp>
@@ -248,11 +275,11 @@
<Zwiastuny dest="5">
<RegExp input="$$8" output="<details><url
function="GetTrailerLink">http://www.filmweb.pl/video/trailer/\1</url></details>";
dest="5">
<RegExp input="$$1" output="\1" dest="8">
-
<expression>class="image[^=]+="/video/trailer/([^"]+)</expression>
+
<expression>class=image[^=]+="/video/trailer/([^"]+)</expression>
</RegExp>
<RegExp input="$$11" output="\1" dest="8">
<RegExp input="$$1" output="\1" dest="11">
-
<expression>class="image[^=]+="/video/trailer/([^"]+polski[^"]+)</expression>
+
<expression>class=image[^=]+="/video/trailer/([^"]+polski[^"]+)</expression>
</RegExp>
<expression>(.+)</expression>
</RegExp>
@@ -298,7 +325,7 @@
<RegExp input="$$1"
output="<studio>\1</studio>" dest="6+">
<expression>"/company/[^/]*/">([^<]*)</a></expression>
</RegExp>
- <RegExp input="$$7"
output="<originaltitle>\1</originaltitle>" dest="6+">
+ <RegExp conditional="!UseOriginalTitle" input="$$7"
output="<originaltitle>\1</originaltitle>" dest="6+">
<RegExp input="$$1" output="\1" dest="7">
<expression>title-extra">([^<]*)</expression>
</RegExp>
diff --git a/metadata.filmweb.pl/resources/language/English/strings.xml
b/metadata.filmweb.pl/resources/language/English/strings.xml
index d5d79fe..71c2be3 100644
--- a/metadata.filmweb.pl/resources/language/English/strings.xml
+++ b/metadata.filmweb.pl/resources/language/English/strings.xml
@@ -3,5 +3,7 @@
<string id="30000">Cover Quality</string>
<string id="30001">Full cast</string>
<string id="30002">Use iMDB rating</string>
+ <string id="30003">Prefer DVD Plot</string>
<string id="30007">IMDb Actor Thumb(s) Size</string>
+ <string id="30008">Use original title</string>
</strings>
\ No newline at end of file
diff --git a/metadata.filmweb.pl/resources/language/Polish/strings.xml
b/metadata.filmweb.pl/resources/language/Polish/strings.xml
index 71a1c25..05d5609 100644
--- a/metadata.filmweb.pl/resources/language/Polish/strings.xml
+++ b/metadata.filmweb.pl/resources/language/Polish/strings.xml
@@ -3,6 +3,7 @@
<string id="30000">Pobieraj wszystkie dostÄpne okÅadki</string>
<string id="30001">PeÅna obsada z IMDb</string>
<string id="30002">Ocena z IMDb</string>
- <string id="30003">Szukaj imdb.id tylko na bazie tytuÅu</string>
+ <string id="30003">Preferuj opis dla wydania DVD</string>
<string id="30007">WielkoÅÄ zdjÄÄ aktorów z IMDb</string>
+ <string id="30008">Użyj tytuÅu oryginalnego</string>
</strings>
\ No newline at end of file
diff --git a/metadata.filmweb.pl/resources/settings.xml
b/metadata.filmweb.pl/resources/settings.xml
index 386529b..d32bc79 100644
--- a/metadata.filmweb.pl/resources/settings.xml
+++ b/metadata.filmweb.pl/resources/settings.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<settings>
<setting label="30000" type="bool" id="poster" default="true"/>
+ <setting label="30003" type="bool" id="opis" default="false"/>
+ <setting label="30008" type="bool" id="UseOriginalTitle" default="false"/>
+ <setting type="sep" />
<setting label="30002" type="bool" id="iMDBRatings" default="false"/>
<setting label="30001" type="bool" id="EnableFullCast" default="false"/>
<setting label="30007" type="labelenum" values="192|256|384|512|1024"
id="imdbscale" default="512"/>
-----------------------------------------------------------------------
Summary of changes:
metadata.filmweb.pl/addon.xml | 2 +-
metadata.filmweb.pl/filmweb.xml | 61 ++++++++++++++------
.../resources/language/English/strings.xml | 2 +
.../resources/language/Polish/strings.xml | 3 +-
metadata.filmweb.pl/resources/settings.xml | 3 +
5 files changed, 52 insertions(+), 19 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
