The branch, dharma has been updated
via 1cd6b17f36d4f8cc3498e779f68d9cc036af76d0 (commit)
from 7427cd7f7b0b46fa94a30aec9a0dff03ee209dc8 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=1cd6b17f36d4f8cc3498e779f68d9cc036af76d0
commit 1cd6b17f36d4f8cc3498e779f68d9cc036af76d0
Author: olympia <[email protected]>
Date: Thu Jun 23 08:48:49 2011 +0200
[metadata.filmweb.pl] updated to version 1.1.8
diff --git a/metadata.filmweb.pl/addon.xml b/metadata.filmweb.pl/addon.xml
index 9a59761..148fa7e 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.7"
+ version="1.1.8"
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 4956998..0ebec40 100644
--- a/metadata.filmweb.pl/filmweb.xml
+++ b/metadata.filmweb.pl/filmweb.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<scraper framework="1.0" date="2011-02-18">
+<scraper framework="1.0" date="2011-06-22">
<NfoUrl dest="3">
<RegExp input="$$1" output="<url
cache="filmweb-\1">http://www.filmweb.pl/Film?id=\1</url>";
dest="3">
<expression
noclean="1">filmweb.pl/f([0-9]*)/</expression>
@@ -34,14 +34,14 @@
</RegExp>
</FilmwebByIMDBId>
<CreateSearchUrl dest="3">
- <RegExp input="$$1"
output="<url>http://www.filmweb.pl/search/film?sort=COUNT&amp;q=\1&amp;startYear=$$2&amp;endYear=$$2</url>";
dest="3">
+ <RegExp input="$$1"
output="<url>http://www.filmweb.pl/search/film?q=\1&amp;startYear=$$2&amp;endYear=$$2</url>";
dest="3">
<expression noclean="1"/>
</RegExp>
</CreateSearchUrl>
<GetSearchResults dest="8">
<RegExp input="$$5" output="<?xml version="1.0"
encoding="utf-8"
standalone="yes"?><results>\1</results>" dest="8">
- <RegExp input="$$1"
output="<entity><title>\2</title><year>\3</year><url
cache="filmweb-\1">http://www.filmweb.pl/Film?id=\1</url></entity>";
dest="5">
- <expression repeat="yes"
fixchars="2">searchResult.*?src="http://1.fwcdn.pl/po/[^/]*/[^/]*/([0-9]*)/.*?searchResultTitle[^>]+>(.*?)</a></h3>.*?searchResultDetails[^0-9]+([0-9]*)</expression>
+ <RegExp input="$$1"
output="<entity><title>\1</title><year>\2</year><url
cache="filmweb-\3">http://www.filmweb.pl/Film?id=\3</url></entity>";
dest="5">
+ <expression repeat="yes"
fixchars="1">searchResult.*?searchResultTitle[^>]+>(.*?)</a></h3>.*?searchResultDetails[^0-9]+([0-9]*).*?src="http://1.fwcdn.pl/po/[^/]*/[^/]*/([0-9]*)/</expression>
</RegExp>
<RegExp input="$$5" output="\1 " dest="5">
<expression repeat="yes"
noclean="1">([^\t]*)\t?</expression>
@@ -66,6 +66,9 @@
</RegExp>
<expression/>
</RegExp>
+ <RegExp conditional="!UseOriginalTitle" input="$$6"
output="<url
function="TitletoASCII">http://www.remove-pl.yoyo.pl/smu4.php?text=\1</url>";
dest="5+">
+ <expression encode="1"/>
+ </RegExp>
<RegExp input="$$6"
output="<originaltitle>\1</originaltitle>" dest="5+">
<RegExp input="$$1" output="\1" dest="6">
<expression
fixchars="1">class=filmYear>[^>]+>([^<]+)</h2</expression>
@@ -201,43 +204,40 @@
</RegExp>
</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="" 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" dest="8">
+ <RegExp input="$$8" output="<?xml version="1.0"
encoding="utf-8"
standalone="yes"?><details>\1</details>" dest="5">
+ <RegExp input="$$10"
output="<plot>\1</plot>" dest="8">
<RegExp input="$$1" output="\1" dest="10">
- <expression noclean="1" fixchars="1">li
class="?desc[^>]+><p>(.*?)</p></expression>
+ <expression fixchars="1">li
class="?desc[^>]+><p>(.*?)</p></expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
- <RegExp input="$$13" output="\1 [opis dystrybutora]"
dest="8">
+ <RegExp input="$$13" output="<plot>\1 [opis
dystrybutora]</plot>" dest="8">
<RegExp input="$$1" output="\1" dest="13">
- <expression noclean="1"
fixchars="1">class="desc[^~]+<p>([^\[]+)\[opis</expression>
+ <expression
fixchars="1">class="desc[^~]+<p>([^\[]+)\[opis</expression>
</RegExp>
- <expression>(.+)</expression>
+ <expression noclean="1">(.+)</expression>
</RegExp>
- <RegExp conditional="opis" input="$$12" output="\1
[opis dystrybutora kino]" dest="8">
+ <RegExp conditional="opis" input="$$12"
output="<plot>\1 [opis dystrybutora kino]</plot>" dest="8">
<RegExp input="$$1" output="\1" dest="12">
- <expression noclean="1"
fixchars="1">class="desc[^~]+<p>(.*?)</p>[^\[]+\[opis dystrybutora
kino</expression>
+ <expression
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 conditional="opis" input="$$11"
output="<plot>\1 [opis dystrybutora dvd]</plot>" dest="8">
<RegExp input="$$1" output="\1" dest="11">
- <expression noclean="1"
fixchars="1">class="desc[^~]+<p>(.*?)</p>[^\[]+\[opis dystrybutora
dvd</expression>
+ <expression
fixchars="1">class="desc[^~]+<p>(.*?)</p>[^\[]+\[opis dystrybutora
dvd</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
- <RegExp conditional="!opis" input="$$11" output="\1
[opis dystrybutora dvd]" dest="8">
+ <RegExp conditional="!opis" input="$$11"
output="<plot>\1 [opis dystrybutora dvd]</plot>" dest="8">
<RegExp input="$$1" output="\1" dest="11">
- <expression noclean="1"
fixchars="1">class="desc[^~]+<p>(.*?)</p>[^\[]+\[opis dystrybutora
dvd</expression>
+ <expression
fixchars="1">class="desc[^~]+<p>(.*?)</p>[^\[]+\[opis dystrybutora
dvd</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
- <RegExp conditional="!opis" input="$$12" output="\1
[opis dystrybutora kino]" dest="8">
+ <RegExp conditional="!opis" input="$$12"
output="<plot>\1 [opis dystrybutora kino]</plot>" dest="8">
<RegExp input="$$1" output="\1" dest="12">
- <expression noclean="1"
fixchars="1">class="desc[^~]+<p>(.*?)</p>[^\[]+\[opis dystrybutora
kino</expression>
+ <expression
fixchars="1">class="desc[^~]+<p>(.*?)</p>[^\[]+\[opis dystrybutora
kino</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
@@ -247,7 +247,7 @@
<RegExp input="$$8" output="\1\2" dest="8">
<expression repeat="yes"
noclean="1,2">([^\s]*)(?:(\s)\2*)?</expression>
</RegExp>
- <expression/>
+ <expression noclean="1" />
</RegExp>
</Opisy>
<Plakaty dest="5">
@@ -279,21 +279,30 @@
</RegExp>
</Obsada>
<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>
+ <RegExp input="$$8$$13"
output="<details>\1</details>" dest="5">
+ <RegExp input="" output="<plot>Na razie nikt nie
dodaÅ streszczenia fabuÅy tego filmu. Możesz byÄ pierwszy! ZamieÅÄ swój
opis.</plot>" dest="13">
+ <expression />
</RegExp>
- <RegExp input="$$11" output="\1" dest="8">
+ <RegExp input="$$1" output="<url
function="GetTrailerLink">http://www.filmweb.pl/video/\1</url>";
dest="8">
+
<expression>class=image[^=]+="/video/([^"]+)</expression>
+ </RegExp>
+ <RegExp input="$$11" output="<url
function="GetTrailerLink">http://www.filmweb.pl/video/trailer/\1</url>";
dest="8">
+ <RegExp input="$$1" output="\1" dest="11">
+
<expression>class=image[^=]+="/video/trailer/([^"]+)</expression>
+ </RegExp>
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$11" output="<url
function="GetTrailerLink">http://www.filmweb.pl/video/trailer/\1</url>";
dest="8">
<RegExp input="$$1" output="\1" dest="11">
<expression>class=image[^=]+="/video/trailer/([^"]+polski[^"]+)</expression>
</RegExp>
<expression>(.+)</expression>
</RegExp>
- <expression noclean="1">(.+)</expression>
+ <expression noclean="1"/>
</RegExp>
</Zwiastuny>
<GetTrailerLink dest="5">
- <RegExp input="$$11" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$11$$13"
output="<details>\1</details>" dest="5">
<RegExp input="$$1" output="\1" dest="6">
<expression noclean="1">WiÄcej dla tego
filmu(.*?)<h2</expression>
</RegExp>
@@ -314,7 +323,13 @@
</RegExp>
<RegExp input="$$12"
output="<trailer>\1</trailer>" dest="11">
<RegExp input="$$1" output="\1\2" dest="12">
- <expression clear="yes"
noclean="1">src="([^"]+)(mp4|mpg|mov)</expression>
+ <expression clear="yes"
noclean="1">src="([^"]+)(mp4|mpg|mov|ogv)</expression>
+ </RegExp>
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$14"
output="<plot>\1</plot>" dest="13">
+ <RegExp input="$$1" output="\1" dest="14">
+ <expression fixchars="1"
noclean="1"><div class=trailerReport></div>(.*?)<div
class=recommendOthers</expression>
</RegExp>
<expression>(.+)</expression>
</RegExp>
@@ -322,8 +337,20 @@
</RegExp>
</GetTrailerLink>
<TryGetTrailer dest="5">
- <RegExp input="$$1"
output="<details><trailer>\1</trailer></details>"
dest="5">
- <expression clear="yes" noclean="1">source
src="([^"]+)</expression>
+ <RegExp input="$$11" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$12"
output="<trailer>plugin://plugin.video.youtube/?action=play_video&videoid=\1</trailer>"
dest="11">
+ <RegExp input="$$1" output="\1" dest="12">
+ <expression clear="yes"
noclean="1">youtube.com/v/(.{11})\??</expression>
+ </RegExp>
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$12"
output="<trailer>\1</trailer>" dest="11">
+ <RegExp input="$$1" output="\1\2" dest="12">
+ <expression clear="yes"
noclean="1">src="([^"]+)(mp4|mpg|mov|ogv)</expression>
+ </RegExp>
+ <expression>(.+)</expression>
+ </RegExp>
+ <expression noclean="1"/>
</RegExp>
</TryGetTrailer>
<IMDB-Details dest="5">
@@ -363,4 +390,12 @@
<expression noclean="1"/>
</RegExp>
</Fanarty>
+ <TitletoASCII dest="3">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="3">
+ <RegExp input="$$1"
output="<sorttitle>\1</sorttitle>" dest="5">
+ <expression
noclean="1"><textarea>(.*?)xbmc(.*?)</textarea></expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </TitletoASCII>
</scraper>
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
metadata.filmweb.pl/addon.xml | 2 +-
metadata.filmweb.pl/filmweb.xml | 97 ++++++++++++++++++++++++++------------
2 files changed, 67 insertions(+), 32 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
