The branch, frodo has been updated
via 89a78ddc8f6afa0487cf63bbe5a187c52c6e244f (commit)
from e33d7e98822648f54f2f185bd84dde99dc7b5ac0 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=89a78ddc8f6afa0487cf63bbe5a187c52c6e244f
commit 89a78ddc8f6afa0487cf63bbe5a187c52c6e244f
Author: olympia <[email protected]>
Date: Wed Dec 26 07:48:41 2012 +0100
[metadata.common.imdb.com] updated to version 2.6.2
diff --git a/metadata.common.imdb.com/addon.xml
b/metadata.common.imdb.com/addon.xml
index 3b1f5a3..6bc71f8 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.6.1"
+ version="2.6.2"
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 e7a90fe..fc2a757 100644
--- a/metadata.common.imdb.com/changelog.txt
+++ b/metadata.common.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.6.2[/B]
+- fixed: director(s) and writer(s) scraping in case of IMDbFull is selected
+
[B]2.6.1[/B]
- fixed: will scrape director(s) as writer(s)
diff --git a/metadata.common.imdb.com/imdb.xml
b/metadata.common.imdb.com/imdb.xml
index 7d1bf54..6c321bf 100644
--- a/metadata.common.imdb.com/imdb.xml
+++ b/metadata.common.imdb.com/imdb.xml
@@ -139,7 +139,7 @@
<expression repeat="yes" clear="yes" trim="3,4"
noclean="1,2"><noscript><img
\n[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:([^"]*\.)[^"]*(\.jpg))[^>]*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)?</expression>
</RegExp>
<RegExp input="$$6"
output="<actor><thumb></thumb><name>\1</name><role>\3</role></actor>"
dest="7+">
- <expression repeat="yes" trim="1,2"
noclean="1,2"><img
\n[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:[^"]*\.[^"]*\.png)"
class=""
/>*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)?</expression>
+ <expression repeat="yes" trim="1,2,3"
fixchars="3" noclean="1,2"><img
\n[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:[^"]*\.[^"]*\.png)"
class=""
/>*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)?</expression>
</RegExp>
<RegExp input="$$7"
output="<actor><thumb>\1</thumb>\2</actor>" dest="2+">
<expression repeat="yes" clear="yes"
noclean="1,2,3"><actor><thumb>(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)?</thumb>(.*?)</actor></expression>
@@ -148,29 +148,6 @@
</RegExp>
</ParseIMDBCast>
- <GetIMDBScaledCastById dest="5">
- <RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBScaledCast">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
- <expression noclean="1" />
- </RegExp>
- </GetIMDBScaledCastById>
- <ParseIMDBScaledCast dest="5">
- <RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1"><table
class="cast_list">(.*?)</table></expression>
- </RegExp>
- <RegExp input="$$6"
output="<actor><thumb>\2_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\3</thumb><name>\1</name><role>\5</role></actor>"
dest="7">
- <expression repeat="yes" clear="yes" trim="3,4"
noclean="1,2"><noscript><img
\n[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:([^"]*\.)[^"]*(\.jpg))[^>]*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)?</expression>
- </RegExp>
- <RegExp input="$$6"
output="<actor><thumb></thumb><name>\1</name><role>\3</role></actor>"
dest="7+">
- <expression repeat="yes" trim="1,2"
noclean="1,2"><img
\n[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:[^"]*\.[^"]*\.png)"
class=""
/>*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)?</expression>
- </RegExp>
- <RegExp input="$$7"
output="<actor><thumb>\1</thumb>\2</actor>" dest="2+">
- <expression repeat="yes" clear="yes"
noclean="1,2,3"><actor><thumb>(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)?</thumb>(.*?)</actor></expression>
- </RegExp>
- <expression noclean="1" />
- </RegExp>
- </ParseIMDBScaledCast>
-
<GetIMDBDirectorsById dest="5">
<RegExp input="$$1" output="<details><url
cache="$$1-main.html"
function="ParseIMDBDirectors">http://akas.imdb.com/title/$$1/</url></details>";
dest="5">
<expression noclean="1" />
@@ -225,26 +202,6 @@
</RegExp>
</ParseIMDBFullCast>
- <GetIMDBScaledFullCastById dest="5">
- <RegExp input="$$1" output="<details><url
cache="$$1-combined.html"
function="ParseIMDBScaledFullCast">http://akas.imdb.com/title/$$1/combined</url></details>";
dest="5">
- <expression noclean="1" />
- </RegExp>
- </GetIMDBScaledFullCastById>
- <ParseIMDBScaledFullCast dest="5">
- <RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1"><table
class="cast">(.*?)</table></expression>
- </RegExp>
- <RegExp input="$$6"
output="<actor><thumb>\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2</thumb><name>\3</name><role>\5</role></actor>"
dest="7">
- <expression repeat="yes" clear="yes"
fixchars="3,5" trim="3,5" noclean="1,2"><img
src="(?:([^"]*\.)[^"]*(\.jpg))?[^>]*[^"]*"nm"><a
href="[^"]*[^>]*>([^<]*)<[^"]*"ddd">([^<]<)?[^"]*"char">(.*?)</td></expression>
- </RegExp>
- <RegExp input="$$7"
output="<actor><thumb>\1</thumb>\2</actor>" dest="2+">
- <expression repeat="yes" clear="yes"
noclean="1,2,3"><actor><thumb>(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)</thumb>(.*?)</actor></expression>
- </RegExp>
- <expression noclean="1" />
- </RegExp>
- </ParseIMDBScaledFullCast>
-
<GetIMDBFullDirectorsById dest="5">
<RegExp input="$$1" output="<details><url
cache="$$1-combined.html"
function="ParseIMDBFullDirectors">http://akas.imdb.com/title/$$1/combined</url></details>";
dest="5">
<expression noclean="1" />
@@ -252,11 +209,11 @@
</GetIMDBFullDirectorsById>
<ParseIMDBFullDirectors dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp conditional="fullcredits" input="$$1"
output="\1" dest="6">
- <expression clear="yes"
noclean="1">Director[s]?:</h5>[^>]*>(.*?)</div</expression>
+ <RegExp input="$$1" output="\1" dest="6">
+ <expression clear="yes"
noclean="1">Director(?:s)?:.*?</h5>[^>]*>(.*?)</div</expression>
</RegExp>
- <RegExp input="$$6"
output="<director>\1</director>" dest="2+">
- <expression repeat="yes" fixchars="1"
clear="yes"><a href="/name/[^>]*>([^<]*)<</expression>
+ <RegExp input="$$6"
output="<director>\1</director>" dest="2">
+ <expression repeat="yes" fixchars="1"><a
href="/name/[^>]*>([^<]*)<</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -269,10 +226,10 @@
</GetIMDBFullWritersById>
<ParseIMDBFullWriters dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp conditional="fullcredits" input="$$1"
output="\1" dest="6">
+ <RegExp input="$$1" output="\1" dest="6">
<expression noclean="1">Writing
credits(.*?)name="</expression>
</RegExp>
- <RegExp input="$$6"
output="<credits>\1</credits>" dest="2+">
+ <RegExp input="$$6"
output="<credits>\1</credits>" dest="2">
<expression repeat="yes" fixchars="1"><a
href="/name/[^>]*>([^<]*)<</expression>
</RegExp>
<expression noclean="1" />
@@ -286,7 +243,7 @@
</GetIMDBThumbsById>
<ParseIMDBThumbs dest="5">
<RegExp input="$$6" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2" dest="4">
+ <RegExp input="$$1" output="\1_SX1024_SY1024_\2"
dest="4">
<expression noclean="1,2"><a
name="poster".*?src="(.*?)_S.*?(.jpg)".*?</a></expression>
</RegExp>
<RegExp input="$$4" output="<thumb
aspect="poster">\1</thumb>" dest="6">
-----------------------------------------------------------------------
Summary of changes:
metadata.common.imdb.com/addon.xml | 2 +-
metadata.common.imdb.com/changelog.txt | 3 ++
metadata.common.imdb.com/imdb.xml | 59 ++++---------------------------
3 files changed, 12 insertions(+), 52 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
