The branch, dharma-pre has been updated
via ae8d0df90be47ba9ba48f22a0ebbe2a8b264144a (commit)
from 338fe4b70ba0b2773857706d85a4d826d56e4d09 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=ae8d0df90be47ba9ba48f22a0ebbe2a8b264144a
commit ae8d0df90be47ba9ba48f22a0ebbe2a8b264144a
Author: olympia <[email protected]>
Date: Mon Oct 11 20:22:46 2010 +0200
[metadata.imdb.com] move scraping of IMDb rating out to IMDb scraper library
diff --git a/metadata.common.imdb.com/addon.xml
b/metadata.common.imdb.com/addon.xml
index 689eb35..4b08fd1 100644
--- a/metadata.common.imdb.com/addon.xml
+++ b/metadata.common.imdb.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.imdb.com"
name="IMDB common scraper functions"
- version="2.0.4"
+ version="2.0.5"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.imdb.com/changelog.txt
b/metadata.common.imdb.com/changelog.txt
index c8e8f9e..cd4bd77 100644
--- a/metadata.common.imdb.com/changelog.txt
+++ b/metadata.common.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.0.5[/B]
+- changed: move scraping of IMDb rating out to IMDb scraper library
+
[B]2.0.4[/B]
- reverted: purge fixchars from all functions, since it cause convert fails on
Beta2 and Linux
diff --git a/metadata.common.imdb.com/imdb.xml
b/metadata.common.imdb.com/imdb.xml
index dbef7b8..24a3a4f 100644
--- a/metadata.common.imdb.com/imdb.xml
+++ b/metadata.common.imdb.com/imdb.xml
@@ -1,4 +1,9 @@
<scraperfunctions>
+ <GetIMDBRatingById dest="5">
+ <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBRating">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBRatingById>
<GetIMDBPlotById dest="5">
<RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBPlot">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
<expression noclean="1" />
@@ -54,6 +59,14 @@
<expression noclean="1" />
</RegExp>
</GetIMDBTrailerById>
+ <ParseIMDBRating dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$1"
output="<rating>\1</rating><votes>\2</votes>" dest="2">
+ <expression><span
class="rating-rating">([0-9.]+).*?>([0-9,]+) votes</a></expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseIMDBRating>
<ParseIMDBPlot dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1"
output="<plot>\1</plot>" dest="2">
diff --git a/metadata.imdb.com/addon.xml b/metadata.imdb.com/addon.xml
index 044e36d..ae5fc6c 100644
--- a/metadata.imdb.com/addon.xml
+++ b/metadata.imdb.com/addon.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.imdb.com"
name="IMDb"
- version="2.0.10"
+ version="2.0.11"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
<import addon="metadata.common.themoviedb.org" version="1.0.7"/>
<import addon="metadata.common.movieposterdb.com" version="1.0.4"/>
- <import addon="metadata.common.imdb.com" version="2.0.4"/>
+ <import addon="metadata.common.imdb.com" version="2.0.5"/>
<import addon="metadata.common.impa.com" version="1.0.3"/>
<import addon="metadata.common.hdtrailers.net" version="1.0.4"/>
</requires>
diff --git a/metadata.imdb.com/changelog.txt b/metadata.imdb.com/changelog.txt
index 6d91db1..ef50700 100644
--- a/metadata.imdb.com/changelog.txt
+++ b/metadata.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.0.11[/B]
+- changed: move scraping of IMDb rating out to IMDb scraper library
+
[B]2.0.10[/B]
- fixed: year won't get scraped if title contains brackets
diff --git a/metadata.imdb.com/imdb.xml b/metadata.imdb.com/imdb.xml
index 40da1a8..73cebb1 100644
--- a/metadata.imdb.com/imdb.xml
+++ b/metadata.imdb.com/imdb.xml
@@ -22,7 +22,7 @@
<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;)?
\([^\(]*?([0-9]{4})\)</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>
@@ -59,8 +59,8 @@
<RegExp input="$$1"
output="<runtime>\1</runtime>" dest="5+">
<expression
trim="1"><h4[^>]*?>Runtime:</h4>[^0-9]*([0-9]+)</expression>
</RegExp>
- <RegExp input="$$1"
output="<rating>\1</rating><votes>\2</votes>" dest="5+">
- <expression><span
class="rating-rating">([0-9.]+).*?>([0-9,]+) votes</a></expression>
+ <RegExp input="$$2" output="<chain
function="GetIMDBRatingById">$$2</chain>" dest="5+">
+ <expression/>
</RegExp>
<RegExp input="$$1"
output="<genre>\1</genre>" dest="5+">
<expression repeat="yes"><a
href="/genre/([^"]+)</expression>
-----------------------------------------------------------------------
Summary of changes:
metadata.common.imdb.com/addon.xml | 2 +-
metadata.common.imdb.com/changelog.txt | 3 +++
metadata.common.imdb.com/imdb.xml | 13 +++++++++++++
metadata.imdb.com/addon.xml | 4 ++--
metadata.imdb.com/changelog.txt | 3 +++
metadata.imdb.com/imdb.xml | 6 +++---
6 files changed, 25 insertions(+), 6 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
