The branch, frodo has been updated
via b1ac1ad899b117e67239333da9376e78ffd1580d (commit)
from 24b521a2254650c092af1b3ed9e5c8889a7892cb (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=b1ac1ad899b117e67239333da9376e78ffd1580d
commit b1ac1ad899b117e67239333da9376e78ffd1580d
Author: olympia <[email protected]>
Date: Thu Nov 29 22:50:58 2012 +0100
[metadata.filmdelta.se] updated to version 1.1.0
diff --git a/metadata.filmdelta.se/addon.xml b/metadata.filmdelta.se/addon.xml
index da16d17..454cd65 100644
--- a/metadata.filmdelta.se/addon.xml
+++ b/metadata.filmdelta.se/addon.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.filmdelta.se"
name="FilmDelta"
- version="1.0.7"
+ version="1.1.0"
provider-name="Daniel Malmgren">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.themoviedb.org" version="1.0"/>
+ <import addon="metadata.common.themoviedb.org" version="2.7.0"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="se"
@@ -15,10 +15,12 @@
<summary lang="hu">FilmDelta filmadat leolvasó</summary>
<summary lang="kr">FilmDelta ìí ì¤í¬ëí¼</summary>
<summary lang="pt">Scraper de filmes FilmDelta</summary>
+ <summary lang="se">Filmskrapa för Filmdelta</summary>
<description lang="en">Download Movie information from
www.filmdelta.se</description>
<description lang="hu">Film információk letöltése a www.filmdelta.se
webhelyrÅl</description>
<description lang="kr">www.filmdelta.se ìì ìí ì ë³´
ë¤ì´ë¡ë</description>
<description lang="pt">Descarregar informação de filmes de
www.filmdelta.se</description>
+ <description lang="se">Hämta filminformation ifrån
www.filmdelta.se</description>
<platform>all</platform>
</extension>
</addon>
diff --git a/metadata.filmdelta.se/changelog.txt
b/metadata.filmdelta.se/changelog.txt
index 245f141..f6f2514 100644
--- a/metadata.filmdelta.se/changelog.txt
+++ b/metadata.filmdelta.se/changelog.txt
@@ -1,2 +1,6 @@
1.0.7
Added setting to use original title instead of swedish one
+
+1.1.0
+Fixed fetching of thumb (both from filmdelta and tmdb) and fanart (tmdb)
+Added fetching of trailer from tmdb (optional, default disabled)
diff --git a/metadata.filmdelta.se/filmdelta.xml
b/metadata.filmdelta.se/filmdelta.xml
old mode 100644
new mode 100755
index 4c7d6df..3ba26fa
--- a/metadata.filmdelta.se/filmdelta.xml
+++ b/metadata.filmdelta.se/filmdelta.xml
@@ -1,89 +1,97 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<scraper framework="1.1" date="2009-12-06">
- <CreateSearchUrl clearbuffers="no" dest="3">
- <RegExp input="$$1"
output="<url>http://www.filmdelta.se/search.php?string=\1&amp;type=movie&amp;more=1</url>";
dest="3">
- <RegExp input="$$1" output="\1" dest="9">
- <expression>%28(.*?)%29</expression>
- </RegExp>
- <expression trim="1"/>
- </RegExp>
- </CreateSearchUrl>
- <GetSearchResults dest="8">
- <RegExp input="$$5" output="<results>\1</results>"
dest="8">
- <RegExp input="$$1"
output="<entity><title>\2</title><year>\3</year><url
cache="filmdelta.html">http://www.filmdelta.se/filmer/\1</url></entity>";
dest="5">
- <expression repeat="yes" noclean="1"><a
href="/filmer/([^"]*)">([^<]*)</a> \(([0-9]*)\)</expression>
- </RegExp>
- <RegExp input="$$1"
output="<entity><title>\2</title><year>$$9</year><url
cache="filmdelta.html">http://www.filmdelta.se/filmer/\1</url></entity>";
dest="5">
- <expression repeat="yes" noclean="1"><a
href="/filmer/([^"]*)">([^<]*)</a> \($$9\)</expression>
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </GetSearchResults>
- <GetDetails dest="3">
- <RegExp input="$$5" output="<details>\1</details>"
dest="3">
- <RegExp conditional="swedishtitles" input="$$1"
output="<title>\1</title>" dest="5">
- <expression noclean="1"><title> (.*?) -
Filmdelta -</expression>
- </RegExp>
- <RegExp conditional="!swedishtitles" input="$$1"
output="<title>\1</title>" dest="5">
-
<expression><h4>Originaltitel</h4>[^<]*<h5>([^<]*)</h5>.*?/filmarkiv/([0-9]*)/</expression>
- </RegExp>
- <RegExp input="$$1"
output="<year>\1</year><runtime>\2</runtime>" dest="5+">
- <expression noclean="1">([0-9]*)</a>,
([0-9]*) min</expression>
- </RegExp>
- <RegExp input="$$1"
output="<plot>\1</plot><outline>\1</outline>" dest="5+">
- <expression trim="1"><div
class="text">[^<]*<p>(.*?)</p></expression>
- </RegExp>
- <RegExp input="$$7"
output="<actor><name>\1</name><role>\2</role></actor>"
dest="5+">
- <RegExp input="$$1" output="\1" dest="7">
- <expression noclean="1"><div
class="info" id="actors">(.*?)</div></expression>
- </RegExp>
- <expression repeat="yes"
trim="1,2">/'>([^<]*)</a> - ([^<]*)</h5></expression>
- </RegExp>
- <RegExp input="$$6"
output="<director>\1</director>" dest="5+">
- <RegExp input="$$1" output="\1" dest="6">
- <expression
noclean="1"><h4>Regiss&ouml;r</h4>(.*?)</div></expression>
- </RegExp>
- <expression repeat="yes"
trim="1">/'>([^<]*)</a></h5></expression>
- </RegExp>
- <RegExp input="$$6"
output="<credits>\1</credits>" dest="5+">
- <RegExp input="$$1" output="\1" dest="6+">
- <expression
noclean="1"><h4>Manus</h4>(.*?)</div></expression>
- </RegExp>
- <expression repeat="yes"
trim="1">/'>([^<]*)</a></h5></expression>
- </RegExp>
- <RegExp input="$$8"
output="<genre>\1</genre>" dest="5+">
- <RegExp input="$$1" output="\1" dest="8">
- <expression
noclean="1"><h4>Kategori</h4>(.*?)</div></expression>
- </RegExp>
- <expression repeat="yes"
trim="1">type=category'>([^<]*)</a></h5></expression>
- </RegExp>
- <RegExp input="$$9" output="<url
cache="filmdelta-trans.xml"
function="GetTMDBThumbsById">http://www.google.com/search?q=site:imdb.com\1</url>";
dest="5+">
- <RegExp input="$$1" output=""\1"+\2"
dest="4+">
-
<expression><h4>Originaltitel</h4>[^<]*<h5>([^<]*)</h5>.*?/filmarkiv/([0-9]*)/</expression>
- </RegExp>
- <RegExp input="$$4" output="+\1" dest="9+">
- <expression repeat="yes">([^
,]+)</expression>
- </RegExp>
- <expression/>
- </RegExp>
- <RegExp input="$$2" output="<url
cache="filmdelta.html"
function="GetFilmdeltaThumb">$$3</url>" dest="5+">
- <expression/>
- </RegExp>
- <RegExp conditional="fanart" input="$$9"
output="<url cache="filmdelta-trans.xml"
function="GetTMDBFanartById">http://www.google.com/search?q=site:imdb.com\1</url>";
dest="5+">
- <RegExp input="$$1" output=""\1"+\2"
dest="4+">
-
<expression><h4>Originaltitel</h4>[^<]*<h5>([^<]*)</h5>.*?/filmarkiv/([0-9]*)/</expression>
- </RegExp>
- <RegExp input="$$4" output="+\1" dest="9+">
- <expression repeat="yes">([^
,]+)</expression>
- </RegExp>
- <expression/>
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </GetDetails>
- <GetFilmdeltaThumb dest="5">
- <RegExp input="$$1"
output="<details><thumb>http://www.filmdelta.se\1</thumb></details>";
dest="5+">
- <expression noclean="1"><div class="box images"
id="title-images">[^<]*<div class="inner"><img style='width:px'
src='([^']*)</expression>
- </RegExp>
- </GetFilmdeltaThumb>
-</scraper>
+<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
+<scraper framework="1.1" date="2012-11-28">
+ <CreateSearchUrl clearbuffers="no" dest="3">
+ <RegExp input="$$1"
output="<url>http://www.filmdelta.se/search.php?string=\1&amp;type=movie&amp;more=1</url>";
dest="3">
+ <RegExp input="$$1" output="\1" dest="9">
+ <expression>%28(.*?)%29</expression>
+ </RegExp>
+ <expression trim="1"/>
+ </RegExp>
+ </CreateSearchUrl>
+ <GetSearchResults dest="8">
+ <RegExp input="$$5" output="<results>\1</results>"
dest="8">
+ <RegExp input="$$1"
output="<entity><title>\2</title><year>\3</year><url
cache="filmdelta.html">http://www.filmdelta.se/filmer/\1</url></entity>";
dest="5">
+ <expression repeat="yes" noclean="1"><a
href="/filmer/([^"]*)">([^<]*)</a> \(([0-9]*)\)</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<entity><title>\2</title><year>$$9</year><url
cache="filmdelta.html">http://www.filmdelta.se/filmer/\1</url></entity>";
dest="5">
+ <expression repeat="yes" noclean="1"><a
href="/filmer/([^"]*)">([^<]*)</a> \($$9\)</expression>
+ </RegExp>
+ <expression noclean="1"/>
+ </RegExp>
+ </GetSearchResults>
+ <GetDetails dest="3">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="3">
+ <RegExp conditional="swedishtitles" input="$$1"
output="<title>\1</title>" dest="5">
+ <expression noclean="1"><title> (.*?) -
Filmdelta -</expression>
+ </RegExp>
+ <RegExp conditional="!swedishtitles" input="$$1"
output="<title>\1</title>" dest="5">
+
<expression><h4>Originaltitel</h4>[^<]*<h5>([^<]*)</h5>.*?/filmarkiv/([0-9]*)/</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<year>\1</year><runtime>\2</runtime>" dest="5+">
+ <expression noclean="1">([0-9]*)</a>,
([0-9]*) min</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<plot>\1</plot><outline>\1</outline>" dest="5+">
+ <expression trim="1"><div
class="text">[^<]*<p>(.*?)</p></expression>
+ </RegExp>
+ <RegExp input="$$7"
output="<actor><name>\1</name><role>\2</role></actor>"
dest="5+">
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression noclean="1"><div
class="info" id="actors">(.*?)</div></expression>
+ </RegExp>
+ <expression repeat="yes"
trim="1,2">/'>([^<]*)</a> - ([^<]*)</h5></expression>
+ </RegExp>
+ <RegExp input="$$6"
output="<director>\1</director>" dest="5+">
+ <RegExp input="$$1" output="\1" dest="6">
+ <expression
noclean="1"><h4>Regiss&ouml;r</h4>(.*?)</div></expression>
+ </RegExp>
+ <expression repeat="yes"
trim="1">/'>([^<]*)</a></h5></expression>
+ </RegExp>
+ <RegExp input="$$6"
output="<credits>\1</credits>" dest="5+">
+ <RegExp input="$$1" output="\1" dest="6+">
+ <expression
noclean="1"><h4>Manus</h4>(.*?)</div></expression>
+ </RegExp>
+ <expression repeat="yes"
trim="1">/'>([^<]*)</a></h5></expression>
+ </RegExp>
+ <RegExp input="$$8"
output="<genre>\1</genre>" dest="5+">
+ <RegExp input="$$1" output="\1" dest="8">
+ <expression
noclean="1"><h4>Kategori</h4>(.*?)</div></expression>
+ </RegExp>
+ <expression repeat="yes"
trim="1">type=category'>([^<]*)</a></h5></expression>
+ </RegExp>
+ <RegExp input="$$2" output="<url
function="GetTMDBimages">http://www.google.se/search?q=site:imdb.com%20\1</url>";
dest="5+">
+ <RegExp input="$$1" output="\1+(\2)" dest="3">
+
<expression><h4>Originaltitel</h4>[^<]*<h5>([^<]*)</h5>.*?/filmarkiv/([0-9]*)/</expression>
+ </RegExp>
+ <RegExp input="$$3" output="\1%20" dest="2">
+ <expression repeat="yes"
noclean="1">([^ ]+)</expression>
+ </RegExp>
+ <expression/>
+ </RegExp>
+ <RegExp input="$$2" output="<url
cache="filmdelta.html"
function="GetFilmdeltaThumb">$$3</url>" dest="5+">
+ <expression/>
+ </RegExp>
+ <expression noclean="1"/>
+ </RegExp>
+ </GetDetails>
+ <GetFilmdeltaThumb dest="5">
+ <RegExp input="$$1"
output="<details><thumb>http://www.filmdelta.se\1</thumb></details>";
dest="5+">
+ <expression noclean="1"><div class="box images"
id="title-images">[^<]*<div class="inner"><img style='[^']*'
src='([^']*)</expression>
+ </RegExp>
+ </GetFilmdeltaThumb>
+ <GetTMDBimages dest="4">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="4">
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression>/title/(tt[t0-9]*)</expression>
+ </RegExp>
+ <RegExp input="$$7" output="<chain
function="GetTMDBThumbsByIdChain">\1</chain>" dest="5">
+ <expression/>
+ </RegExp>
+ <RegExp conditional="fanart" input="$$7"
output="<chain
function="GetTMDBFanartByIdChain">\1</chain>" dest="5+">
+ <expression/>
+ </RegExp>
+ <RegExp conditional="trailers" input="$$7"
output="<chain
function="GetTMDBTrailerByIdChain">\1</chain>" dest="5+">
+ <expression/>
+ </RegExp>
+ <expression noclean="1"/>
+ </RegExp>
+ </GetTMDBimages>
+</scraper>
diff --git a/metadata.filmdelta.se/resources/language/English/strings.xml
b/metadata.filmdelta.se/resources/language/English/strings.xml
index e9919ee..2eccc35 100644
--- a/metadata.filmdelta.se/resources/language/English/strings.xml
+++ b/metadata.filmdelta.se/resources/language/English/strings.xml
@@ -2,4 +2,5 @@
<strings>
<string id="30000">Fanart</string>
<string id="30001">Use swedish titles</string>
+ <string id="30002">Trailers</string>
</strings>
diff --git a/metadata.filmdelta.se/resources/language/Swedish/strings.xml
b/metadata.filmdelta.se/resources/language/Swedish/strings.xml
index 44c7faf..05c57a8 100644
--- a/metadata.filmdelta.se/resources/language/Swedish/strings.xml
+++ b/metadata.filmdelta.se/resources/language/Swedish/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
- <string id="30000">Fanart</string>
- <string id="30001">Använd svenska titlar</string>
+ <string id="30000">Hämta fanart</string>
+ <string id="30001">Använd svenska titlar</string>
+ <string id="30002">Hämta trailers</string>
</strings>
diff --git a/metadata.filmdelta.se/resources/settings.xml
b/metadata.filmdelta.se/resources/settings.xml
index 7bc1a45..9a12fc1 100644
--- a/metadata.filmdelta.se/resources/settings.xml
+++ b/metadata.filmdelta.se/resources/settings.xml
@@ -2,4 +2,6 @@
<settings>
<setting label="30000" type="bool" id="fanart" default="true" />
<setting label="30001" type="bool" id="swedishtitles" default="true" />
+ <setting label="30002" type="bool" id="trailers" default="false" />
</settings>
+
-----------------------------------------------------------------------
Summary of changes:
.../LICENSE.txt | 0
metadata.filmdelta.se/addon.xml | 6 +-
metadata.filmdelta.se/changelog.txt | 4 +
metadata.filmdelta.se/filmdelta.xml | 186 ++++++++++----------
.../resources/language/English/strings.xml | 1 +
.../resources/language/Swedish/strings.xml | 5 +-
metadata.filmdelta.se/resources/settings.xml | 2 +
7 files changed, 111 insertions(+), 93 deletions(-)
copy {metadata.albums.merlin.pl => metadata.filmdelta.se}/LICENSE.txt (100%)
mode change 100644 => 100755 metadata.filmdelta.se/filmdelta.xml
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Keep yourself connected to Go Parallel:
VERIFY Test and improve your parallel project with help from experts
and peers. http://goparallel.sourceforge.net
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
