The branch, dharma has been updated
via be34fe2773a41131f0bac54b96531953c6e1b7ce (commit)
from e906df48d7fa47d7bbfbae0ec8e604520c4af01b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=be34fe2773a41131f0bac54b96531953c6e1b7ce
commit be34fe2773a41131f0bac54b96531953c6e1b7ce
Author: olympia <[email protected]>
Date: Wed Apr 20 18:24:11 2011 +0200
[metadata.imdb.com] fixed actor roles and remove scraping of imdb trailers
diff --git a/metadata.common.imdb.com/addon.xml
b/metadata.common.imdb.com/addon.xml
index 7a4bb34..9c1f6bc 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.8"
+ version="2.1.0"
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 c4c4e34..8ebc7ac 100644
--- a/metadata.common.imdb.com/changelog.txt
+++ b/metadata.common.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.1.0[/B]
+- fixed: actor roles and remove scraping of imdb trailers
+
[B]2.0.8[/B]
- fixed: actor images
diff --git a/metadata.common.imdb.com/imdb.xml
b/metadata.common.imdb.com/imdb.xml
index d873943..1919ae7 100644
--- a/metadata.common.imdb.com/imdb.xml
+++ b/metadata.common.imdb.com/imdb.xml
@@ -80,11 +80,11 @@
<RegExp input="$$1" output="\1" dest="6">
<expression noclean="1"><table
class="cast_list">(.*?)</table></expression>
</RegExp>
- <RegExp input="$$6"
output="<actor><thumb>\2_SX512_SY512_\3</thumb><name>\1</name><role>\4</role></actor>"
dest="7">
- <expression repeat="yes" clear="yes" trim="3,4"
noclean="1,2"><noscript><img
\n[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:([^"]*\.)[^"]*(\.jpg))[^>]*.*?ter">[^>]*>[^>]*>([^<]*)?</expression>
+ <RegExp input="$$6"
output="<actor><thumb>\2_SX512_SY512_\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>\2</role></actor>"
dest="7+">
- <expression repeat="yes" trim="1,2"
noclean="1,2"><img
\n[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:[^"]*\.[^"]*\.png)"
class=""
/>*.*?ter">[^>]*>[^>]*>([^<]*)?</expression>
+ <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>
@@ -97,11 +97,11 @@
<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>\4</role></actor>"
dest="7">
- <expression repeat="yes" clear="yes" trim="3,4"
noclean="1,2"><noscript><img
\n[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:([^"]*\.)[^"]*(\.jpg))[^>]*.*?ter">[^>]*>[^>]*>([^<]*)?</expression>
+ <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>\2</role></actor>"
dest="7+">
- <expression repeat="yes" trim="1,2"
noclean="1,2"><img
\n[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:[^"]*\.[^"]*\.png)"
class=""
/>*.*?ter">[^>]*>[^>]*>([^<]*)?</expression>
+ <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>
@@ -192,20 +192,4 @@
<expression noclean="1" />
</RegExp>
</ParseIMDBThumbs>
- <GetIMDBTrailerPage dest="5">
- <RegExp input="$$1" output="<details><url
function="ParseIMDBTrailer">http://akas.imdb.com/video/imdb/vi\1/player</url></details>";
dest="5">
- <expression>/vi([0-9]*)/</expression>
- </RegExp>
- </GetIMDBTrailerPage>
- <ParseIMDBTrailer dest="5">
- <RegExp input="$$2" output="<details><trailer
urlencoded="yes">\1</trailer></details>" dest="5">
- <RegExp input="$$1" output="\1" dest="2">
- <expression
noclean="1">"file"[^"]*"([^"]*)</expression>
- </RegExp>
- <RegExp input="$$1" output="$$2/\1" dest="2">
- <expression
noclean="1">"id"[^"]*"([^"]*)</expression>
- </RegExp>
- <expression noclean="1" />
- </RegExp>
- </ParseIMDBTrailer>
</scraperfunctions>
diff --git a/metadata.imdb.com/addon.xml b/metadata.imdb.com/addon.xml
index ac800d5..5c1bda0 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.1.8"
+ version="2.1.9"
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.8"/>
+ <import addon="metadata.common.imdb.com" version="2.1.0"/>
<import addon="metadata.common.impa.com" version="1.0.3"/>
<import addon="metadata.common.hdtrailers.net" version="1.0.6"/>
</requires>
diff --git a/metadata.imdb.com/changelog.txt b/metadata.imdb.com/changelog.txt
index 78af12a..1088731 100644
--- a/metadata.imdb.com/changelog.txt
+++ b/metadata.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.1.9[/B]
+- fixed: actor roles and remove scraping of imdb trailers
+
[B]2.1.8[/B]
- fixed: some movies won't scrape at all
diff --git a/metadata.imdb.com/imdb.xml b/metadata.imdb.com/imdb.xml
index 7c4d6f1..02d3011 100644
--- a/metadata.imdb.com/imdb.xml
+++ b/metadata.imdb.com/imdb.xml
@@ -113,9 +113,6 @@
<RegExp conditional="fanart" input="$$2"
output="<chain function="GetTMDBFanartByIdC ailer></details>"
dest="5"> yer</url></details>" dest="5"> ot; class=""
/>*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)?</expression> ssion> [+ 6
è è ! è ! À\Ûrÿ 0]Ûrÿ xd¦Ñ[+ @SÛrÿ "±Ð[+ ÎÐ[+ À\Ûrÿ ð°Ð[+ ÿ\Ûrÿ À_
Ò[+ ó¸Ð[+ P
Ò[+ ØT
Ò[+ ¨Y
Ò[+ È4Ð[+ xd¦Ñ[+ @SÛrÿ RÛrÿ ëÍÐ[+ à! à! À\Ûrÿ 0]Ûrÿ È-Ñ[+
TÛrÿ "±Ð[+ ÎÐ[+ À\Ûrÿ ð°Ð[+ ÿ\Ûrÿ ð\Ûrÿ è\Ûrÿ ˪Ð[+ p 0]Ûrÿ ó¸Ð[+ È4Ð[+
TÛrÿ ðRÛrÿ ëÍÐ[+ G H I J K M N O P À\Ûrÿ 0]Ûrÿ Hå\Ñ[+ ÀUÛrÿ "±Ð[+ ÎÐ[+ À\Ûrÿ 0_
Ò[+ ó¸Ð[+ p¦Ñ[+ :Ñ[+ P
Ò[+ ØT
Ò[+ ¨Y
Ò[+ È4Ð[+ Hå\Ñ[+ ÀUÛrÿ TÛrÿ ëÍÐ[+ 8å\Ñ[+ ÀUÛrÿ 0TÛrÿ ëÍÐ[+ (å\Ñ[+ ÀUÛrÿ `TÛrÿ ëÍÐ[+ å\Ñ[+ ÀUÛrÿ TÛrÿ ëÍÐ[+
¨^
Ò[+ ó¸Ð[+ ¨Y
Ò[+ OÛrÿ h:Ñ[+ æ·Ð[+ ØT
Ò[+ 0UÛrÿ yh:Ñ[+ æ·Ð[+ P
Ò[+ `UÛrÿ Zh:Ñ[+ æ·Ð[+ Ø:Ñ[+ p¦Ñ[+ :Ñ[+ P
Ò[+ Øt¦Ñ[+ ØT
Ò[+ ¨Y
Ò[+ È4Ð[+ à]8Ñ[+ àVÛrÿ °UÛrÿ ëÍÐ[+ # % ' ) * - . 0 3 5 6 7 8 : < = À\Ûrÿ 0]Ûrÿ pÑ[+ XÛrÿ "±Ð[+ 8¦Ñ[+ ó¸Ð[+ Øt¦Ñ[+ y¦Ñ[+ È4Ð[+ c f ÝÐÐ[+ 0]Ûrÿ pÑ[+ XÛrÿ ÐVÛrÿ ëÍÐ[+ Ó%° æ§ìwqÒ-øÒ êÓïs¨Ó,~9×u]ÞÓ
4Q ÷U^Qʧ ¶uª¹ñìò*Äv´rÖÐ[+ p^Ûrÿ FmÒ[+ FmÒ[+ ?ÅÓÐ[+ 0^Ûrÿ UÛrÿ PYÛrÿ ÝÐÐ[+ æ·Ð[+ èĪÐ[+ °_Ûrÿ BmÒ[+ ^Ûrÿ ÿ\Ûrÿ õ\«Ð[+ 0]Ûrÿ ÿÿÿÿÿÿÿÿBmÒ[+ 8]Ûrÿ ëÍÐ hain">$$2</chain>"
dest="5+">
<expression/>
</RegExp>
- <RegExp conditional="imdbtrailer" input="$$2"
output="<chain function="GetIMDBTrailerById">$$2</chain>"
dest="5+">
- <expression/>
- </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;)?
\([^\(]*?([0-9]{4})\)</expression>
diff --git a/metadata.imdb.com/resources/language/Dutch/strings.xml
b/metadata.imdb.com/resources/language/Dutch/strings.xml
index e7e4383..e9ba91a 100644
--- a/metadata.imdb.com/resources/language/Dutch/strings.xml
+++ b/metadata.imdb.com/resources/language/Dutch/strings.xml
@@ -7,7 +7,6 @@
<string id="30003">IMPAwards inschakelen</string>
<string id="30004">MoviePosterDB inschakelen</string>
<string id="30006">HD-Trailers.net Trailers ophalen</string>
- <string id="30005">IMDb Trailers ophalen</string>
<string id="30007">IMDB poster & Acteur foto formaat</string>
</strings>
diff --git a/metadata.imdb.com/resources/language/English/strings.xml
b/metadata.imdb.com/resources/language/English/strings.xml
index 6697dc1..29aeacd 100644
--- a/metadata.imdb.com/resources/language/English/strings.xml
+++ b/metadata.imdb.com/resources/language/English/strings.xml
@@ -7,7 +7,6 @@
<string id="30003">Enable posters from IMPAwards</string>
<string id="30004">Enable posters from MoviePosterDB</string>
<string id="30006">Enable trailers from HD-Trailers.net</string>
- <string id="30005">Fall back on IMDb trailers</string>
<string id="30007">IMDb Poster & Actor Thumb(s) Size</string>
<string id="30008">Preferred Title Language from</string>
</strings>
diff --git a/metadata.imdb.com/resources/language/Hungarian/strings.xml
b/metadata.imdb.com/resources/language/Hungarian/strings.xml
index a3a7f97..258d439 100644
--- a/metadata.imdb.com/resources/language/Hungarian/strings.xml
+++ b/metadata.imdb.com/resources/language/Hungarian/strings.xml
@@ -7,7 +7,6 @@
<string id="30003">Poszter letöltés az IMPAwards-ról</string>
<string id="30004">Poszter letöltés a MoviePosterDB-ról</string>
<string id="30006">FilmelÅzetes a HD-Trailers.net-rÅl</string>
- <string id="30005">IMDb filmelÅzetes, ha nincs HD Trailer</string>
<string id="30007">IMDb poszter & szÃnész bélyegképek
mérete</string>
<string id="30008">FilmcÃm a következÅ országból:</string>
</strings>
diff --git a/metadata.imdb.com/resources/language/Korean/strings.xml
b/metadata.imdb.com/resources/language/Korean/strings.xml
index cdf0127..56302ec 100644
--- a/metadata.imdb.com/resources/language/Korean/strings.xml
+++ b/metadata.imdb.com/resources/language/Korean/strings.xml
@@ -7,7 +7,6 @@
<string id="30003">IMPAwards ìì í¬ì¤í° ê°ì ¸ì¤ê¸°</string>
<string id="30004">MoviePosterDB ìì í¬ì¤í° ê°ì ¸ì¤ê¸°</string>
<string id="30006">HD-Trailers.net ìì ìê³ í¸ ê°ì ¸ì¤ê¸°</string>
- <string id="30005">IMDb ìê³ í¸ ê°ì ¸ì¤ê¸°</string>
<string id="30007">IMDb í¬ì¤í° & ë°°ì° ë¯¸ë¦¬ë³´ê¸° í¬ê¸°</string>
</strings>
diff --git a/metadata.imdb.com/resources/language/Polish/strings.xml
b/metadata.imdb.com/resources/language/Polish/strings.xml
index 45d6d9e..8e11acb 100644
--- a/metadata.imdb.com/resources/language/Polish/strings.xml
+++ b/metadata.imdb.com/resources/language/Polish/strings.xml
@@ -7,7 +7,6 @@
<string id="30003">WÅÄ
cz plakaty z IMPAwards</string>
<string id="30004">WÅÄ
cz plakaty z MoviePosterDB</string>
<string id="30006">WÅÄ
cz zwiastuny z HD-Trailers.net</string>
- <string id="30005">W przypadku niepowodzenia szukaj zwiastunów na
IMDb</string>
<string id="30007">Rozmiar plakatów i miniatur aktorów z IMDb</string>
<string id="30008">Preferowany jÄzyk tytuÅu</string>
</strings>
diff --git a/metadata.imdb.com/resources/language/Portuguese/strings.xml
b/metadata.imdb.com/resources/language/Portuguese/strings.xml
index e201a5f..e389c52 100644
--- a/metadata.imdb.com/resources/language/Portuguese/strings.xml
+++ b/metadata.imdb.com/resources/language/Portuguese/strings.xml
@@ -7,7 +7,6 @@
<string id="30003">Ligar posters de IMPAwards</string>
<string id="30004">Ligar posters de MoviePosterDB</string>
<string id="30006">Ligar trailers de HD-Trailers.net</string>
- <string id="30005">Ligar trailers IMDb</string>
<string id="30007">Poster IMDb & Tamanho de miniatura(s) do
actor</string>
</strings>
diff --git a/metadata.imdb.com/resources/settings.xml
b/metadata.imdb.com/resources/settings.xml
index ee792bc..297b010 100644
--- a/metadata.imdb.com/resources/settings.xml
+++ b/metadata.imdb.com/resources/settings.xml
@@ -7,7 +7,6 @@
<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 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"/>
-----------------------------------------------------------------------
Summary of changes:
metadata.common.imdb.com/addon.xml | 2 +-
metadata.common.imdb.com/changelog.txt | 3 ++
metadata.common.imdb.com/imdb.xml | 32 +++++---------------
metadata.imdb.com/addon.xml | 4 +-
metadata.imdb.com/changelog.txt | 3 ++
metadata.imdb.com/imdb.xml | 3 --
.../resources/language/Dutch/strings.xml | 1 -
.../resources/language/English/strings.xml | 1 -
.../resources/language/Hungarian/strings.xml | 1 -
.../resources/language/Korean/strings.xml | 1 -
.../resources/language/Polish/strings.xml | 1 -
.../resources/language/Portuguese/strings.xml | 1 -
metadata.imdb.com/resources/settings.xml | 1 -
13 files changed, 17 insertions(+), 37 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
