The branch, dharma-pre has been updated
via 57be0a8e6ceb0871650a51b18139f4966c1eac45 (commit)
from 000ecc5adb320d0bc959b8c8bbe5a1edc38e53e3 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=57be0a8e6ceb0871650a51b18139f4966c1eac45
commit 57be0a8e6ceb0871650a51b18139f4966c1eac45
Author: olympia <[email protected]>
Date: Mon Oct 11 07:00:49 2010 +0200
[metadata.imdb.com] fixed: year won't get scraped if title contains
brackets and settings cosmetics
diff --git a/metadata.imdb.com/addon.xml b/metadata.imdb.com/addon.xml
index fe34419..044e36d 100644
--- a/metadata.imdb.com/addon.xml
+++ b/metadata.imdb.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.imdb.com"
name="IMDb"
- version="2.0.9"
+ version="2.0.10"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.imdb.com/changelog.txt b/metadata.imdb.com/changelog.txt
index 3de2d5b..6d91db1 100644
--- a/metadata.imdb.com/changelog.txt
+++ b/metadata.imdb.com/changelog.txt
@@ -1,3 +1,9 @@
+[B]2.0.10[/B]
+- fixed: year won't get scraped if title contains brackets
+
+[B]2.0.9[/B]
+- added: Polish language
+
[B]2.0.8[/B]
- reverted: purge fixchars from all functions, since it cause convert fails on
Beta2 and Linux
diff --git a/metadata.imdb.com/imdb.xml b/metadata.imdb.com/imdb.xml
index 3b2aa69..40da1a8 100644
--- a/metadata.imdb.com/imdb.xml
+++ b/metadata.imdb.com/imdb.xml
@@ -22,13 +22,13 @@
<expression
clear="yes">/title/([t0-9]*)/faq</expression>
</RegExp>
<RegExp input="$$1"
output="<entity><title>\1</title><year>\2</year><url
cache="$$7-main.html">http://akas.imdb.com/title/$$7/</url><id>$$7</id></entity>";
dest="5">
- <expression clear="yes" noclean="1"><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\d]*?([0-9]*)\)</expression>
+ <expression clear="yes" noclean="1"><meta
name="title" content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="4">
<expression noclean="1">(><a
href="/title.*)</expression>
</RegExp>
<RegExp input="$$4"
output="<entity><title>\2</title><year>\3</year><url
cache="\1-main.html">http://akas.imdb.com/title/\1/</url><id>\1</id></entity>";
dest="5+">
- <expression repeat="yes"
noclean="1,2">><a
href="/title/([t0-9]*)/[^>]*>(?:&#x22;)?([^<]*?)(?:&#x22;)?</a>
*\([^\d]*?([0-9]{4})</expression>
+ <expression repeat="yes"
noclean="1,2">><a
href="/title/([t0-9]*)/[^>]*>(?:&#x22;)?([^<]*?)(?:&#x22;)?</a>
*\([^\(]*?([0-9]{4})</expression>
</RegExp>
<expression clear="yes" noclean="1"/>
</RegExp>
@@ -39,13 +39,13 @@
<expression/>
</RegExp>
<RegExp input="$$1"
output="<originaltitle>\1</originaltitle>" dest="5+">
- <expression><meta name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\d]*?([0-9]*)\)</expression>
+ <expression><meta name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
</RegExp>
<RegExp input="$$2" output="<chain
function="GetIMDBAKATitlesById">\1</chain>" dest="5+">
<expression>(tt[t0-9]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<year>\2</year>" dest="5+">
- <expression><meta name="title"
content="([^"]*?) \([^\d]*?([0-9]*)\)</expression>
+ <expression><meta name="title"
content="([^"]*?) \([^\(]*?([0-9]{4})\)</expression>
</RegExp>
<RegExp input="$$1"
output="<top250>\1</top250>" dest="5+">
<expression>Top 250 #([0-9]*)</</expression>
@@ -112,19 +112,19 @@
</RegExp>
<RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet480p">$$6</chain>" dest="5+">
<RegExp input="$$1" output="\1" dest="6">
- <expression><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\d]*?([0-9]*)\)</expression>
+ <expression><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
</RegExp>
<expression>480p</expression>
</RegExp>
<RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet720p">$$6</chain>" dest="5+">
<RegExp input="$$1" output="\1" dest="6">
- <expression><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\d]*?([0-9]*)\)</expression>
+ <expression><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
</RegExp>
<expression>720p</expression>
</RegExp>
<RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet1080p">$$6</chain>" dest="5+">
<RegExp input="$$1" output="\1" dest="6">
- <expression><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\d]*?([0-9]*)\)</expression>
+ <expression><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
</RegExp>
<expression>1080p</expression>
</RegExp>
@@ -146,13 +146,13 @@
</RegExp>
<RegExp input="$$10" output="\1" dest="4">
<RegExp input="$$1" output="\1" dest="9">
- <expression><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\d]*?([0-9]*)\)</expression>
+ <expression><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
</RegExp>
<RegExp input="$$9" output="\1" dest="10">
<expression/>
</RegExp>
<RegExp input="$$1" output="\1" dest="11">
-
<expression>>\s*?"([^<]+)"[^<]+[<em>]?[^"]+(UK|USA|Canada\s(<em>)?\(English
title\))</expression>
+
<expression>>\s*?"([^<]+)"[^<]+[<em>]?[^"]+(UK|USA|Canada\s(<em>)?\(English
title\))</expression>
</RegExp>
<RegExp input="$$11" output="\1" dest="10">
<expression>(.+)</expression>
@@ -164,7 +164,7 @@
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="11">
- <expression>>\s*?"([^<]+)" -
International [<em>]?[^"]+English</expression>
+ <expression>>\s*?"([^<]+)" -
International [<em>]?[^"]+English</expression>
</RegExp>
<RegExp input="$$11" output="\1" dest="10">
<expression>(.+)</expression>
@@ -181,7 +181,7 @@
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="4">
-
<expression>>\s*?"([^<]+)"[^<]+[<em>]?[^"]+$INFO[akatitles]</expression>
+
<expression>>\s*?"([^<]+)"[^<]+[<em>]?[^"]+$INFO[akatitles]</expression>
</RegExp>
<RegExp input="$$4" output="\1" dest="2">
<expression>(.+)</expression>
diff --git a/metadata.imdb.com/resources/settings.xml
b/metadata.imdb.com/resources/settings.xml
index e5878b4..ee792bc 100644
--- a/metadata.imdb.com/resources/settings.xml
+++ b/metadata.imdb.com/resources/settings.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
- <setting label="30000" type="bool" id="fullcredits" default="false"/>
<setting label="30002" type="bool" id="tmdbthumbs" default="true"/>
- <setting label="30001" type="bool" id="fanart" default="true"/>
<setting label="30003" type="bool" id="impawards" default="false"/>
<setting label="30004" type="bool" id="movieposterdb" default="false"/>
+ <setting type="sep"/>
+ <setting label="30001" type="bool" id="fanart" default="true"/>
+ <setting type="sep"/>
<setting label="30006" type="labelenum" values="No|480p|720p|1080p"
id="TrailerQ" default="480p"/>
<setting label="30005" type="bool" id="imdbtrailer" default="false"/>
- <setting label="30007" type="labelenum" values="192|256|384|512|1024"
id="imdbscale" default="512"/>
+ <setting type="sep"/>
<setting label="30008" type="labelenum" values="Keep Original|USA /
International|Argentina|Austria|Belgium|Brazil|Bulgaria|Canada|China|Colombia|Chile|Croatia|Czech
Republic|Denmark|Finland|France|Germany|Greece|Hong
Kong|Hungary|Iceland|India|Israel|Italy|Japan|Mexico|Netherlands|Norway|Pakistan|Poland|Portugal|Romania|Russia|Serbia|Singapore|Slovenia|Spain|Sweden|Switzerland|Thailand|Turkey|Uruguay|Venezuela"
id="akatitles" default="Keep Original"/>
+ <setting label="30000" type="bool" id="fullcredits" default="false"/>
+ <setting label="30007" type="labelenum" values="192|256|384|512|1024"
id="imdbscale" default="512"/>
</settings>
-----------------------------------------------------------------------
Summary of changes:
metadata.imdb.com/addon.xml | 2 +-
metadata.imdb.com/changelog.txt | 6 ++++++
metadata.imdb.com/imdb.xml | 22 +++++++++++-----------
metadata.imdb.com/resources/settings.xml | 9 ++++++---
4 files changed, 24 insertions(+), 15 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
