The branch, dharma-pre has been updated
       via  b1cf8b08a71cf5b1a29e69a4d1db5dc3d917a9e0 (commit)
      from  a16b4fc00a816b7ab01836327deca2f82f527a0f (commit)

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

commit b1cf8b08a71cf5b1a29e69a4d1db5dc3d917a9e0
Author: olympia <[email protected]>
Date:   Tue Oct 19 21:01:42 2010 +0200

    [metadata.imdb.com] [metadata.ofdb.de] re-added fixchars

diff --git a/metadata.common.imdb.com/addon.xml 
b/metadata.common.imdb.com/addon.xml
index 4b08fd1..419ab4d 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.5"
+       version="2.0.6"
        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 cd4bd77..4333389 100644
--- a/metadata.common.imdb.com/changelog.txt
+++ b/metadata.common.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.0.6[/B]
+- changed: re-added fixchars
+
 [B]2.0.5[/B]
 - changed: move scraping of IMDb rating out to IMDb scraper library
 
diff --git a/metadata.common.imdb.com/imdb.xml 
b/metadata.common.imdb.com/imdb.xml
index 24a3a4f..dd3545a 100644
--- a/metadata.common.imdb.com/imdb.xml
+++ b/metadata.common.imdb.com/imdb.xml
@@ -81,7 +81,7 @@
                                <expression noclean="1">&lt;table 
class="cast_list"&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" 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>
+                               <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>
                        <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>
@@ -95,7 +95,7 @@
                                <expression noclean="1">&lt;table 
class="cast_list"&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" 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>
+                               <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>
                        <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" clear="yes">&lt;a  
href="/name[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
+                               <expression repeat="yes" fixchars="1" 
clear="yes">&lt;a  href="/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">&lt;a  
href="/name[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
+                               <expression repeat="yes" fixchars="1">&lt;a  
href="/name[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
                        </RegExp>
                        <expression noclean="1" />
                </RegExp>
@@ -131,7 +131,7 @@
                                <expression noclean="1">&lt;table 
class="cast"&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" 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="(?:([^"]*\.)[^"]*(\.jpg))?[^&gt;]*[^"]*"nm"&gt;&lt;a 
href="[^"]*[^&gt;]*&gt;([^&lt;]*)&lt;[^"]*"ddd"&gt;([^&lt;]&lt;)?[^"]*"char"&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>
@@ -145,7 +145,7 @@
                                <expression noclean="1">&lt;table 
class="cast"&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" 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="(?:([^"]*\.)[^"]*(\.jpg))?[^&gt;]*[^"]*"nm"&gt;&lt;a 
href="[^"]*[^&gt;]*&gt;([^&lt;]*)&lt;[^"]*"ddd"&gt;([^&lt;]&lt;)?[^"]*"char"&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" clear="yes">&lt;a 
href="/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
+                               <expression repeat="yes" fixchars="1" 
clear="yes">&lt;a href="/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">&lt;a 
href="/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
+                               <expression repeat="yes" fixchars="1">&lt;a 
href="/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
                        </RegExp>
                        <expression noclean="1" />
                </RegExp>
diff --git a/metadata.imdb.com/addon.xml b/metadata.imdb.com/addon.xml
index 3771ee1..6e57eab 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.0"
+        version="2.1.1"
        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.5"/>
+    <import addon="metadata.common.imdb.com" version="2.0.6"/>
     <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 9bdabbf..abc10f9 100644
--- a/metadata.imdb.com/changelog.txt
+++ b/metadata.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.1.1[/B]
+- changed: re-added fixchars
+
 [B]2.1.0[/B]
 - changed: scrape only 1 studio
 
diff --git a/metadata.ofdb.de/addon.xml b/metadata.ofdb.de/addon.xml
index ae18e74..43af7ca 100644
--- a/metadata.ofdb.de/addon.xml
+++ b/metadata.ofdb.de/addon.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.ofdb.de"
        name="OFDB"
-       version="1.0.15"
+       version="1.0.16"
        provider-name="Team XBMC + morte0815">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
-    <import addon="metadata.common.imdb.com" version="2.0.3"/>
+    <import addon="metadata.common.imdb.com" version="2.0.6"/>
     <import addon="metadata.common.themoviedb.org" version="1.0.4"/>
     <import addon="metadata.common.movieposterdb.com" version="1.0.2"/>
   </requires>

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

Summary of changes:
 metadata.common.imdb.com/addon.xml     |    2 +-
 metadata.common.imdb.com/changelog.txt |    3 +++
 metadata.common.imdb.com/imdb.xml      |   16 ++++++++--------
 metadata.imdb.com/addon.xml            |    4 ++--
 metadata.imdb.com/changelog.txt        |    3 +++
 metadata.ofdb.de/addon.xml             |    4 ++--
 6 files changed, 19 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly 
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to