The branch, frodo has been updated
via 8439aa90d5c903dac5cca5e4d7ba4aec6d6c2fa8 (commit)
from 04f0247ac74fb85640b073b9f8b6c2f573b8f1b5 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=8439aa90d5c903dac5cca5e4d7ba4aec6d6c2fa8
commit 8439aa90d5c903dac5cca5e4d7ba4aec6d6c2fa8
Author: Lee Pollock <[email protected]>
Date: Thu Oct 10 10:39:00 2013 +0100
[metadata.filmweb.pl] updated to version 2.1.4
diff --git a/metadata.filmweb.pl/addon.xml b/metadata.filmweb.pl/addon.xml
index 5ae3c4b..88d757f 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="2.1.0"
+ version="2.1.4"
provider-name="Regss|smuto">
<requires>
<import addon="xbmc.metadata" version="2.1.0"/>
diff --git a/metadata.filmweb.pl/changelog.txt
b/metadata.filmweb.pl/changelog.txt
index 80b8acb..664b8a4 100644
--- a/metadata.filmweb.pl/changelog.txt
+++ b/metadata.filmweb.pl/changelog.txt
@@ -1,3 +1,13 @@
+[B]2.1.4[/B]
+- ulepszenie: powiÄ
zanie filmweb.id z tmdb.id
+[B]2.1.3[/B]
+- powrót: wyszukiwarka web
+[B]2.1.2[/B]
+- test: wyszukiwarka live
+[B]2.1.1[/B]
+- poprawka: wyszukiwarka, studio, opis
+[B]2.1.0[/B]
+- optymalizacja - scraper oparty tylko na filmweb.pl i themoviedb.org
[B]2.0.0[/B]
- caÅkowicie przepisany i zmodyfikowany scraper
[B]1.2.1[/B]
diff --git a/metadata.filmweb.pl/filmweb.xml b/metadata.filmweb.pl/filmweb.xml
index 97a2539..eb8966b 100644
--- a/metadata.filmweb.pl/filmweb.xml
+++ b/metadata.filmweb.pl/filmweb.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!--
GLOBALNE:
$$20 - TytuÅ originalny i przedrostkiem z przodu.
$$19 - Filmweb ID
$$18 - IMDb ID
!-->
-<scraper framework="1.0" date="2013-03-04">
+<scraper framework="1.0" date="2013-09-01">
<NfoUrl dest="3">
<RegExp conditional="!TryAllURL" 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>
@@ -47,10 +47,10 @@
<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>\1</title><year></year><url
cache="filmweb-\2">http://www.filmweb.pl/Film?id=\2</url></entity>";
dest="5">
- <expression repeat="yes"
fixchars="1">hitDescWrapper><h3>(.*?)</h3>.*?([0-9]*)_FILM_([0-9]*)</expression>
+ <expression repeat="yes"
fixchars="1">hitDescWrapper[^<]+<h3>(.*?)</h3>.*?([0-9]*)_FILM_([0-9]*)</expression>
</RegExp>
<RegExp input="$$5" output="\1 " dest="5">
- <expression repeat="yes" noclean="1">([^\t]*)\t?</expression>
+ <expression repeat="yes" noclean="1">([^\n]*)\n?</expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
@@ -120,14 +120,14 @@
<!-- TAGLINE !-->
<RegExp input="$$1" output="<tagline>\1</tagline>"
dest="5+">
- <expression
fixchars="1">class=hdr-bigger>[^>]+>([^<]+)</expression>
+ <expression fixchars="1">h3
class="hdr[^<]+(.*?)</h3></expression>
</RegExp>
<!-- TAG muzyka test !-->
- <RegExp input="$$1" output="\1" dest="15">
+ <RegExp input="$$1" output="\1" dest="6">
<expression
noclean="1">muzyka:</dt><dd>(.*?)</dd</expression>
</RegExp>
- <RegExp input="$$15" output="<tag>Muzyka: \1</tag>"
dest="5+">
+ <RegExp input="$$6" output="<tag>Muzyka: \1</tag>"
dest="5+">
<expression fixchars="1" repeat="yes">a
href[^>]+>([^<]+)<</expression>
</RegExp>
@@ -175,11 +175,22 @@
<RegExp input="$$6" output="<director>\1</director>"
dest="5+">
<expression repeat="yes" fixchars="1"
trim="1">v:directedBy">([^<]+)<</expression>
</RegExp>
-
+
+ <!-- TRAILER - sprawdzenie czy jest trailer na filmwebie!-->
+ <RegExp input="$$1" output="\1" dest="15">
+ <expression>videosList.*?a
href="(/video/trailer/[^"]+)</expression>
+ </RegExp>
+ <RegExp input="$$11" output="\1" dest="15">
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression>videosList.*?a
href="(/video/trailer/[^"]+polski[^"]+)</expression>
+ </RegExp>
+ <expression>(.+)</expression>
+ </RegExp>
+
<!-- STUDIO - sprawdzenie czy polska produkcja jeÅli tak pobiera
studio !-->
- <RegExp input="$$6" output="\1" dest="5+">
- <RegExp input="$$1" output="<studio>\1</studio>"
dest="6">
- <expression fixchars="1"
clear="yes">dystrybucja:[^>]+>[^>]+>[^>]+>([^<]+)<</expression>
+ <RegExp input="$$16" output="<studio>\1</studio>"
dest="5+">
+ <RegExp input="$$1" output="\1" dest="16">
+ <expression fixchars="1"
clear="yes">dystrybucja:</dt><dd>(.*?)</dd</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
@@ -231,14 +242,14 @@
<RegExp input="$$1" output="\1" dest="6">
<expression
clear="yes">"id":([0-9]+),"</expression>
</RegExp>
- <!-- ID filmu z identycznÄ
datÄ
wydania !-->
- <RegExp input="$$1" output="\1" dest="6">
-
<expression>"id":([0-9]+),"original_title":"[^"]+","release_date":"$$7</expression>
- </RegExp>
<!-- ID filmu z identycznym tytuÅem !-->
<RegExp input="$$1" output="\1" dest="6">
<expression>"id":([0-9]+),"original_title":"$$20"</expression>
</RegExp>
+ <!-- ID filmu z identycznÄ
datÄ
wydania !-->
+ <RegExp input="$$1" output="\1" dest="6">
+
<expression>"id":([0-9]+),"original_title":"[^"]+","release_date":"$$7</expression>
+ </RegExp>
<!-- ID filmu z identycznym tytuÅem i datÄ
wydania !-->
<RegExp input="$$1" output="\1" dest="6">
<expression>"id":([0-9]+),"original_title":"$$20","release_date":"$$7</expression>
@@ -304,6 +315,19 @@
<expression noclean="1" />
</RegExp>
+ <!-- TRAILER -->
+ <RegExp input="$$2" output="\1" dest="5+">
+ <!-- TRAILER - Fallback do TMDb !-->
+ <RegExp input="$$15" output="<chain
function="GetTMDBTrailerByIdChain">$$18</chain>" dest="2">
+ <expression>^$</expression>
+ </RegExp>
+ <!-- TRAILER - Filmweb -->
+ <RegExp input="$$15" output="<url
function="Trailer">http://www.filmweb.pl$$15</url>"; dest="2">
+ <expression>(.+)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+
<!-- ACTORS - FUN. GetTMDBFullCastById peÅna obsada z TMDb jeÅli
wybrano opcjÄ peÅnej obsady !-->
<RegExp conditional="EnableFullCast" input="" output="<chain
function="GetTMDBCastByIdChain">$$18</chain>" dest="5+">
<expression />
@@ -332,17 +356,7 @@
<!-- STUDIO - FUN. GetTMDBStudioByIdChain Studio z TMDb !-->
<RegExp input="$$16" output="<chain
function="GetTMDBStudioByIdChain">$$18</chain>" dest="5+">
<expression>^$</expression>
- </RegExp>
-
- <!-- TRAILER - FUN. GetTMDBTrailerByIdChain Trailer z TMDb !-->
- <RegExp input="$$16" output="<chain
function="GetTMDBTrailerByIdChain">$$18</chain>" dest="5+">
- <expression>^$</expression>
- </RegExp>
-
- <!-- TRAILER - FUN. ZWIASTUNY !-->
- <RegExp input="$$19" output="<url
function="Zwiastuny">http://www.filmweb.pl/film/xbmc-2009-$$19/video</url>";
dest="5+">
- <expression/>
- </RegExp>
+ </RegExp>
<expression clear="yes" noclean="1" />
</RegExp>
</FunctionByIMDbID>
@@ -352,7 +366,7 @@
<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 fixchars="1">hoverOpacity"
id=[^>]+><p[^>]+>(.*?)</p></expression>
+ <expression
fixchars="1">hoverOpacity[^\]]+<p[^>]+>(.*?)</p></expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
@@ -403,97 +417,29 @@
</RegExp>
</Obsada>
- <!-- Zwiastuny FUNCTION !-->
- <Zwiastuny dest="5">
- <RegExp input="$$8" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1" output="<url
function="GetTrailerLink">http://www.filmweb.pl/video/\1</url>";
dest="8">
-
<expression>class=videoImage[^"]+"/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=videoImage[^"]+"/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=videoImage[^"]+"/video/trailer/([^"]+polski[^"]+)</expression>
- </RegExp>
- <expression>(.+)</expression>
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </Zwiastuny>
-
- <!-- GetTrailerLink FUNCTION !-->
- <GetTrailerLink dest="5">
- <RegExp input="$$11$$13" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1">iÄcej dla tego
filmu(.*?)<h2</expression>
- </RegExp>
- <RegExp input="$$6" output="<url
function="TryGetTrailer">http://www.filmweb.pl/video/trailer/\1</url>";
dest="11">
- <expression
repeat="yes">"/video/trailer/([^"]+)" t</expression>
- </RegExp>
- <RegExp input="$$1" output="\1" dest="6">
- <expression
noclean="1">class=mainTrailerVideoBox(.*?)class=trailerFilmsRateBox</expression>
- </RegExp>
- <RegExp input="$$12"
output="<trailer>plugin://plugin.video.youtube/?action=play_video&videoid=\1</trailer>"
dest="11">
- <RegExp input="$$6" output="\1" dest="12">
- <expression clear="yes"
noclean="1">youtube.com/v/(.{11})\??</expression>
- </RegExp>
- <expression>(.+)</expression>
+ <!-- Trailer FUNCTION !-->
+ <Trailer dest="5">
+ <RegExp input="$$4"
output="<details><trailer>\1</trailer></details>"
dest="5">
+ <RegExp input="$$1" output="\1" dest="4">
+ <expression noclean="1">source
src="([^"]+)"</expression>
</RegExp>
- <RegExp input="$$12"
output="<trailer>plugin://plugin.video.youtube/?action=play_video&videoid=\1</trailer>"
dest="11">
- <RegExp input="$$6" output="\1" dest="12">
- <expression clear="yes"
noclean="1">youtube.com/watch\?v=(.{11})\??</expression>
- </RegExp>
- <expression>(.+)</expression>
+ <RegExp input="$$1" output="\1" dest="4">
+ <expression noclean="1">param name=movie
value="([^"]+)"</expression>
</RegExp>
- <RegExp input="$$12" output="<trailer>\1</trailer>"
dest="11">
- <RegExp input="$$6" output="\1\2" dest="12">
- <expression clear="yes"
noclean="1">src="([^"]+)(\.mp4|\.mpg|\.mov|\.ogv)</expression>
- </RegExp>
- <expression>(.+)</expression>
+ <RegExp input="$$1" output="\1" dest="4">
+ <expression noclean="1">param name=filename
value="([^"]+)"</expression>
</RegExp>
- <RegExp input="$$12" output="<trailer>\1</trailer>"
dest="11">
- <RegExp input="$$6" output="\1" dest="12">
- <expression clear="yes"
noclean="1">src:\["([^"]+)"\],width:1280,height:720</expression>
- </RegExp>
- <expression>(.+)</expression>
+ <RegExp input="$$1"
output="plugin://plugin.video.youtube/?action=play_video&videoid=\1"
dest="4">
+ <expression
noclean="1">"http://www.youtube.com/v/([^"]+)"</expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
- </GetTrailerLink>
+ </Trailer>
- <!-- TryGetTrailer FUNCTION !-->
- <TryGetTrailer dest="5">
- <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>
- <RegExp input="$$12" output="<trailer>\1</trailer>"
dest="11">
- <RegExp input="$$1" output="\1" dest="12">
- <expression clear="yes"
noclean="1">src:\["([^"]+)"\],width:1280,height:720</expression>
- </RegExp>
- <expression>(.+)</expression>
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </TryGetTrailer>
-
<!-- Fanarty FUNCTION !-->
<Fanarty dest="5">
<RegExp input="$$1" output="<details><fanart><thumb
preview="\13\2">\11\2</thumb></fanart></details>"
dest="5">
<expression noclean="1" >filmPhotos"><div
class=col><a
href="([^\.]+\.[^\.]+\.[^\.]+\.)1([^"]+)"</expression>
</RegExp>
</Fanarty>
-</scraper>
\ No newline at end of file
+</scraper>
-----------------------------------------------------------------------
Summary of changes:
metadata.filmweb.pl/addon.xml | 2 +-
metadata.filmweb.pl/changelog.txt | 10 +++
metadata.filmweb.pl/filmweb.xml | 162 ++++++++++++------------------------
3 files changed, 65 insertions(+), 109 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
