The branch, dharma-pre has been updated
       via  650c2554017e6b1d49d91ab3a6212627cc76dbd4 (commit)
      from  e030f0a710d8b8a7cf7343213a3cec44679468c7 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=650c2554017e6b1d49d91ab3a6212627cc76dbd4

commit 650c2554017e6b1d49d91ab3a6212627cc76dbd4
Author: olympia <[email protected]>
Date:   Fri Nov 19 12:37:47 2010 +0100

    [metadata.common.imdb.com] Fixed artists due to IMDb changes

diff --git a/metadata.common.imdb.com/addon.xml 
b/metadata.common.imdb.com/addon.xml
index 419ab4d..9c50745 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.6"
+       version="2.0.7"
        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 4333389..db5d118 100644
--- a/metadata.common.imdb.com/changelog.txt
+++ b/metadata.common.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.0.7[/B]
+- changed: fix actors due to IMDb changes
+
 [B]2.0.6[/B]
 - changed: re-added fixchars
 
diff --git a/metadata.common.imdb.com/imdb.xml 
b/metadata.common.imdb.com/imdb.xml
index dd3545a..b112aa6 100644
--- a/metadata.common.imdb.com/imdb.xml
+++ b/metadata.common.imdb.com/imdb.xml
@@ -62,7 +62,7 @@
        <ParseIMDBRating dest="5">
                <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
                        <RegExp input="$$1" 
output="&lt;rating&gt;\1&lt;/rating&gt;&lt;votes&gt;\2&lt;/votes&gt;" dest="2">
-                               <expression>&lt;span 
class="rating-rating"&gt;([0-9.]+).*?&gt;([0-9,]+) votes&lt;/a&gt;</expression>
+                               <expression>&lt;span 
class=&quot;rating-rating&quot;&gt;([0-9.]+).*?&gt;([0-9,]+) 
votes&lt;/a&gt;</expression>
                        </RegExp>
                        <expression noclean="1" />
                </RegExp>
@@ -78,10 +78,10 @@
        <ParseIMDBCast dest="5">
                <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
                        <RegExp input="$$1" output="\1" dest="6">
-                               <expression noclean="1">&lt;table 
class="cast_list"&gt;(.*?)&lt;/table&gt;</expression>
+                               <expression noclean="1">&lt;table 
class=&quot;cast_list&quot;&gt;(.*?)&lt;/table&gt;</expression>
                        </RegExp>
-                       <RegExp input="$$6" 
output="&lt;actor&gt;&lt;thumb&gt;\1_SX512_SY512_\2&lt;/thumb&gt;&lt;name&gt;\3&lt;/name&gt;&lt;role&gt;\4&lt;/role&gt;&lt;/actor&gt;"
 dest="7">
-                               <expression repeat="yes" clear="yes" 
fixchars="3,4" trim="3,4" 
noclean="1,2">&lt;img\n[^\n]*\n[^\n]*\n\s+src="(?:([^"]*\.)[^"]*(\.jpg))?[^&gt;]*[^"]*"[^"]*"&gt;[^&gt;]*&gt;([^&lt;]*).*?&lt;td
 class="character"&gt;[^&gt;]*&gt;[^&gt;]*&gt;([^&lt;]*)?</expression>
+                       <RegExp input="$$6" 
output="&lt;actor&gt;&lt;thumb&gt;\2_SX512_SY512_\3&lt;/thumb&gt;&lt;name&gt;\1&lt;/name&gt;&lt;role&gt;\4&lt;/role&gt;&lt;/actor&gt;"
 dest="7">
+                               <expression repeat="yes" clear="yes" trim="3,4" 
noclean="1,2">&lt;img 
\n[^a]*alt=&quot;([^&quot;]*)&quot;[^&quot;]*&quot;[^&quot;]*&quot;[^s]*src=&quot;(?:([^&quot;]*\.)[^&quot;]*(\.jpg))?[^&gt;]*.*?ter&quot;&gt;[^&gt;]*&gt;[^&gt;]*&gt;([^&lt;]*)?</expression>
                        </RegExp>
                        <RegExp input="$$7" 
output="&lt;actor&gt;&lt;thumb&gt;\1&lt;/thumb&gt;\2&lt;/actor&gt;" dest="2+">
                                <expression repeat="yes" clear="yes" 
noclean="1,2,3">&lt;actor&gt;&lt;thumb&gt;(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)&lt;/thumb&gt;(.*?)&lt;/actor&gt;</expression>
@@ -92,10 +92,10 @@
        <ParseIMDBScaledCast dest="5">
                <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
                        <RegExp input="$$1" output="\1" dest="6">
-                               <expression noclean="1">&lt;table 
class="cast_list"&gt;(.*?)&lt;/table&gt;</expression>
+                               <expression noclean="1">&lt;table 
class=&quot;cast_list&quot;&gt;(.*?)&lt;/table&gt;</expression>
                        </RegExp>
-                       <RegExp input="$$6" 
output="&lt;actor&gt;&lt;thumb&gt;\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2&lt;/thumb&gt;&lt;name&gt;\3&lt;/name&gt;&lt;role&gt;\4&lt;/role&gt;&lt;/actor&gt;"
 dest="7">
-                               <expression repeat="yes" clear="yes" 
fixchars="3,4" trim="3,4" 
noclean="1,2">&lt;img\n[^\n]*\n[^\n]*\n\s+src="(?:([^"]*\.)[^"]*(\.jpg))?[^&gt;]*[^"]*"[^"]*"&gt;[^&gt;]*&gt;([^&lt;]*).*?&lt;td
 class="character"&gt;[^&gt;]*&gt;[^&gt;]*&gt;([^&lt;]*)?</expression>
+                       <RegExp input="$$6" 
output="&lt;actor&gt;&lt;thumb&gt;\2_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\3&lt;/thumb&gt;&lt;name&gt;\1&lt;/name&gt;&lt;role&gt;\4&lt;/role&gt;&lt;/actor&gt;"
 dest="7">
+                               <expression repeat="yes" clear="yes" trim="3,4" 
noclean="1,2">&lt;img 
\n[^a]*alt=&quot;([^&quot;]*)&quot;[^&quot;]*&quot;[^&quot;]*&quot;[^s]*src=&quot;(?:([^&quot;]*\.)[^&quot;]*(\.jpg))?[^&gt;]*.*?ter&quot;&gt;[^&gt;]*&gt;[^&gt;]*&gt;([^&lt;]*)?</expression>
                        </RegExp>
                        <RegExp input="$$7" 
output="&lt;actor&gt;&lt;thumb&gt;\1&lt;/thumb&gt;\2&lt;/actor&gt;" dest="2+">
                                <expression repeat="yes" clear="yes" 
noclean="1,2,3">&lt;actor&gt;&lt;thumb&gt;(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)&lt;/thumb&gt;(.*?)&lt;/actor&gt;</expression>
@@ -109,7 +109,7 @@
                                <expression clear="yes" 
noclean="1">Director[s]?.*?&lt;/h4&gt;(.*?)&lt;div class</expression>
                        </RegExp>
                        <RegExp input="$$6" 
output="&lt;director&gt;\1&lt;/director&gt;" dest="2+">
-                               <expression repeat="yes" fixchars="1" 
clear="yes">&lt;a  href="/name[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
+                               <expression repeat="yes" fixchars="1" 
clear="yes">&lt;a  href=&quot;/name[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
                        </RegExp>
                        <expression noclean="1" />
                </RegExp>
@@ -120,7 +120,7 @@
                                <expression 
noclean="1">Writer[s]?.*?&lt;/h4&gt;(.*?)&lt;div class</expression>
                        </RegExp>
                        <RegExp input="$$6" 
output="&lt;credits&gt;\1&lt;/credits&gt;" dest="2+">
-                               <expression repeat="yes" fixchars="1">&lt;a  
href="/name[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
+                               <expression repeat="yes" fixchars="1">&lt;a  
href=&quot;/name[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
                        </RegExp>
                        <expression noclean="1" />
                </RegExp>
@@ -128,10 +128,10 @@
        <ParseIMDBFullCast dest="5">
                <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
                        <RegExp input="$$1" output="\1" dest="6">
-                               <expression noclean="1">&lt;table 
class="cast"&gt;(.*?)&lt;/table&gt;</expression>
+                               <expression noclean="1">&lt;table 
class=&quot;cast&quot;&gt;(.*?)&lt;/table&gt;</expression>
                        </RegExp>
                        <RegExp input="$$6" 
output="&lt;actor&gt;&lt;thumb&gt;\1_SX512_SY512_\2&lt;/thumb&gt;&lt;name&gt;\3&lt;/name&gt;&lt;role&gt;\5&lt;/role&gt;&lt;/actor&gt;"
 dest="7">
-                               <expression repeat="yes" clear="yes" 
fixchars="3,5" trim="3,5" noclean="1,2">&lt;img 
src="(?:([^"]*\.)[^"]*(\.jpg))?[^&gt;]*[^"]*"nm"&gt;&lt;a 
href="[^"]*[^&gt;]*&gt;([^&lt;]*)&lt;[^"]*"ddd"&gt;([^&lt;]&lt;)?[^"]*"char"&gt;(.*?)&lt;/td&gt;</expression>
+                               <expression repeat="yes" clear="yes" 
fixchars="3,5" trim="3,5" noclean="1,2">&lt;img 
src="(?:([^&quot;]*\.)[^&quot;]*(\.jpg))?[^&gt;]*[^&quot;]*&quot;nm&quot;&gt;&lt;a
 
href=&quot;[^&quot;]*[^&gt;]*&gt;([^&lt;]*)&lt;[^&quot;]*&quot;ddd&quot;&gt;([^&lt;]&lt;)?[^&quot;]*&quot;char&quot;&gt;(.*?)&lt;/td&gt;</expression>
                        </RegExp>
                        <RegExp input="$$7" 
output="&lt;actor&gt;&lt;thumb&gt;\1&lt;/thumb&gt;\2&lt;/actor&gt;" dest="2+">
                                <expression repeat="yes" clear="yes" 
noclean="1,2,3">&lt;actor&gt;&lt;thumb&gt;(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)&lt;/thumb&gt;(.*?)&lt;/actor&gt;</expression>
@@ -142,10 +142,10 @@
        <ParseIMDBScaledFullCast dest="5">
                <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
                        <RegExp input="$$1" output="\1" dest="6">
-                               <expression noclean="1">&lt;table 
class="cast"&gt;(.*?)&lt;/table&gt;</expression>
+                               <expression noclean="1">&lt;table 
class=&quot;cast&quot;&gt;(.*?)&lt;/table&gt;</expression>
                        </RegExp>
                        <RegExp input="$$6" 
output="&lt;actor&gt;&lt;thumb&gt;\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2&lt;/thumb&gt;&lt;name&gt;\3&lt;/name&gt;&lt;role&gt;\5&lt;/role&gt;&lt;/actor&gt;"
 dest="7">
-                               <expression repeat="yes" clear="yes" 
fixchars="3,5" trim="3,5" noclean="1,2">&lt;img 
src="(?:([^"]*\.)[^"]*(\.jpg))?[^&gt;]*[^"]*"nm"&gt;&lt;a 
href="[^"]*[^&gt;]*&gt;([^&lt;]*)&lt;[^"]*"ddd"&gt;([^&lt;]&lt;)?[^"]*"char"&gt;(.*?)&lt;/td&gt;</expression>
+                               <expression repeat="yes" clear="yes" 
fixchars="3,5" trim="3,5" noclean="1,2">&lt;img 
src=&quot;(?:([^&quot;]*\.)[^&quot;]*(\.jpg))?[^&gt;]*;a 
href="[^"]*[^&gt;]*&gt;([^&lt;]*)&lt;[^"]*"ddd"&gt;([^&lt;]&lt;)?[^"]*"char"&gt;(.*?)&lt;/td&gt;</expression>t;)?[^&quot;]*&quot;char&quot;&gt;(.*?)&lt;/td&gt;</expression> K¶ÝÿL¶ÝÿxíUö*
 B¶ÝÿíQÐTö* 
ÖnÐTö* K¶Ýÿ°QÐTö*ßK¶ÝÿÀÿPVö*ÃYÐTö*ðPVö*ØôPVö*¨ùPVö*ÈÔÑTö*xíUö*
 
b¶Ýÿ...@¶Ýÿ»nÐtö* k¶Ýÿl¶ÝÿÈÍÌuö*c¶ÝÿíqÐtö*
 
ÖnÐTö* K¶Ýÿ°QÐTö*ßK¶ÝÿÐK¶ÝÿÈK¶ÝÿkñTö*:L¶ÝÿÃYÐTö*ÈÔÑTö*C¶ÝÿÐA¶Ýÿ»nÐTö*HIJKMNOP K¶ÝÿL¶ÝÿH…£Uö* D¶ÝÿíQÐTö*8…£Uö*ÖnÐTö* K¶Ýÿ0ÿPVö*ÃYÐTö*íUö* ¹€Uö*ðPVö*ØôPVö*¨ùPVö*ÈÔÑTö*H…£Uö* D¶ÝÿàB¶Ýÿ»nÐTö*8…£Uö* D¶ÝÿC¶Ýÿ»nÐTö*(…£uö* d¶Ýÿ...@c¶Ýÿ»nÐtö*…£uö* d¶Ýÿpc¶Ýÿ»nÐtö*
     
¨þpvö*ÃyÐtö*¨ùpvö*ð=¶ÝÿЁuö*¶xÐtö*ÿØôpvö*d¶Ýÿyuö*¶xÐtö*ðpvö...@d¶Ýÿzuö*¶xÐtö*Ø´€uö*íuö* ¹€uö*ðpvö*Øíuö*Øôpvö*¨ùpvö*ÈÔÑtö*àý~uö*Àe¶Ýÿd¶Ýÿ»nÐtö*)*-.035678:<= K¶ÝÿL¶Ýÿp;kuö*àf¶ÝÿíqÐtö*st8íuö*ÃyÐtö*Øíuö* íuö*ÈÔÑtö*cf...@fÆs
 
}Uö*L¶Ýÿp;KUö*àF¶Ýÿ°E¶Ýÿ»nÐTö*øÒêÓïs¨Ó,~9„×u]ÞÓ
    
4Q ÷U^Qʉ§¶uª¹ñìò*ēv K¶ÝÿL¶ÝÿHÞUö*I¶ÝÿL¶ÝÿÃYÐTö*èdñTö*pD¶Ýÿ}Uö*¶XÐTö*èdñTö* K¶ÝÿßK¶ÝÿõüñTö*L¶ÝÿHÞUö*I¶ÝÿÀF¶Ýÿ»nÐTö*8ÞUö*[^&quot;]*&quot;nm&quot;&gt;&lt;a
 
href=&quot;[^&quot;]*[^&gt;]*&gt;([^&lt;]*)&lt;[^&quot;]*&quot;ddd&quot;&gt;([^&lt;]&lt;)?[^&quot;]*&quot;char&quot;&gt;(.*?)&lt;/td&gt;</expression>
                        </RegExp>
                        <RegExp input="$$7" 
output="&lt;actor&gt;&lt;thumb&gt;\1&lt;/thumb&gt;\2&lt;/actor&gt;" dest="2+">
                                <expression repeat="yes" clear="yes" 
noclean="1,2,3">&lt;actor&gt;&lt;thumb&gt;(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)&lt;/thumb&gt;(.*?)&lt;/actor&gt;</expression>
@@ -159,7 +159,7 @@
                                <expression clear="yes" 
noclean="1">Director[s]?:&lt;/h5&gt;[^&gt;]*&gt;(.*?)&lt;/div</expression>
                        </RegExp>
                        <RegExp input="$$6" 
output="&lt;director&gt;\1&lt;/director&gt;" dest="2+">
-                               <expression repeat="yes" fixchars="1" 
clear="yes">&lt;a href="/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
+                               <expression repeat="yes" fixchars="1" 
clear="yes">&lt;a href=&quot;/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
                        </RegExp>
                        <expression noclean="1" />
                </RegExp>
@@ -170,7 +170,7 @@
                                <expression noclean="1">Writing 
credits(.*?)name="</expression>
                        </RegExp>
                        <RegExp input="$$6" 
output="&lt;credits&gt;\1&lt;/credits&gt;" dest="2+">
-                               <expression repeat="yes" fixchars="1">&lt;a 
href="/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
+                               <expression repeat="yes" fixchars="1">&lt;a 
href=&quot;/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
                        </RegExp>
                        <expression noclean="1" />
                </RegExp>
@@ -178,7 +178,7 @@
        <ParseIMDBThumbs dest="5">
                <RegExp input="$$6" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="5">
                        <RegExp input="$$1" 
output="\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2" dest="4">
-                               <expression noclean="1,2">&lt;a 
name="poster".*?src="(.*?)_S.*?(.jpg)".*?&lt;/a&gt;</expression>
+                               <expression noclean="1,2">&lt;a 
name=&quot;poster&quot;.*?src=&quot;(.*?)_S.*?(.jpg)&quot;.*?&lt;/a&gt;</expression>
                        </RegExp>
                        <RegExp input="$$4" 
output="&lt;thumb&gt;\1&lt;/thumb&gt;" dest="6">
                                <expression 
noclean="1">(.*?_SX[0-9]+_SY[0-9]+_.jpg)</expression>
@@ -194,10 +194,10 @@
        <ParseIMDBTrailer dest="5">
                <RegExp input="$$2" output="&lt;details&gt;&lt;trailer 
urlencoded=&quot;yes&quot;&gt;\1&lt;/trailer&gt;&lt;/details&gt;" dest="5">
                        <RegExp input="$$1" output="\1" dest="2">
-                               <expression 
noclean="1">"file"[^"]*"([^"]*)</expression>
+                               <expression 
noclean="1">&quot;file&quot;[^&quot;]*&quot;([^&quot;]*)</expression>
                        </RegExp>
                        <RegExp input="$$1" output="$$2/\1" dest="2">
-                               <expression 
noclean="1">"id"[^"]*"([^"]*)</expression>
+                               <expression 
noclean="1">&quot;id&quot;[^&quot;]*&quot;([^&quot;]*)</expression>
                        </RegExp>
                        <expression noclean="1" />
                </RegExp>
diff --git a/metadata.imdb.com/addon.xml b/metadata.imdb.com/addon.xml
index a6d7678..4d77c5d 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.3"
+        version="2.1.4"
        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.6"/>
+    <import addon="metadata.common.imdb.com" version="2.0.7"/>
     <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 4c3927d..358fce8 100644
--- a/metadata.imdb.com/changelog.txt
+++ b/metadata.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.1.4[/B]
+- fixed: fixed artists due to IMDb changes
+
 [B]2.1.3[/B]
 - fixed: fix previous commit
 

-----------------------------------------------------------------------

Summary of changes:
 metadata.common.imdb.com/addon.xml     |    2 +-
 metadata.common.imdb.com/changelog.txt |    3 ++
 metadata.common.imdb.com/imdb.xml      |   36 ++++++++++++++++----------------
 metadata.imdb.com/addon.xml            |    4 +-
 metadata.imdb.com/changelog.txt        |    3 ++
 5 files changed, 27 insertions(+), 21 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/msIE9-sfdev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to