Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

updated: sync scrapers with git b1cf8b08a

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@35325 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information...
commit 42300cc8cc836bfdaba45089892df0b2a101c60d 1 parent 2a0efb3
theuni authored
2  addons/metadata.common.imdb.com/addon.xml
... ... @@ -1,7 +1,7 @@
1 1 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2 2 <addon id="metadata.common.imdb.com"
3 3 name="IMDB common scraper functions"
4   - version="2.0.5"
  4 + version="2.0.6"
5 5 provider-name="Team XBMC">
6 6 <requires>
7 7 <import addon="xbmc.metadata" version="1.0"/>
3  addons/metadata.common.imdb.com/changelog.txt
... ... @@ -1,3 +1,6 @@
  1 +[B]2.0.6[/B]
  2 +- changed: re-added fixchars
  3 +
1 4 [B]2.0.5[/B]
2 5 - changed: move scraping of IMDb rating out to IMDb scraper library
3 6
16 addons/metadata.common.imdb.com/imdb.xml
@@ -81,7 +81,7 @@
81 81 <expression noclean="1">&lt;table class="cast_list"&gt;(.*?)&lt;/table&gt;</expression>
82 82 </RegExp>
83 83 <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">
84   - <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>
  84 + <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>
85 85 </RegExp>
86 86 <RegExp input="$$7" output="&lt;actor&gt;&lt;thumb&gt;\1&lt;/thumb&gt;\2&lt;/actor&gt;" dest="2+">
87 87 <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 @@
95 95 <expression noclean="1">&lt;table class="cast_list"&gt;(.*?)&lt;/table&gt;</expression>
96 96 </RegExp>
97 97 <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">
98   - <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>
  98 + <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>
99 99 </RegExp>
100 100 <RegExp input="$$7" output="&lt;actor&gt;&lt;thumb&gt;\1&lt;/thumb&gt;\2&lt;/actor&gt;" dest="2+">
101 101 <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 @@
109 109 <expression clear="yes" noclean="1">Director[s]?.*?&lt;/h4&gt;(.*?)&lt;div class</expression>
110 110 </RegExp>
111 111 <RegExp input="$$6" output="&lt;director&gt;\1&lt;/director&gt;" dest="2+">
112   - <expression repeat="yes" clear="yes">&lt;a href="/name[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
  112 + <expression repeat="yes" fixchars="1" clear="yes">&lt;a href="/name[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
113 113 </RegExp>
114 114 <expression noclean="1" />
115 115 </RegExp>
@@ -120,7 +120,7 @@
120 120 <expression noclean="1">Writer[s]?.*?&lt;/h4&gt;(.*?)&lt;div class</expression>
121 121 </RegExp>
122 122 <RegExp input="$$6" output="&lt;credits&gt;\1&lt;/credits&gt;" dest="2+">
123   - <expression repeat="yes">&lt;a href="/name[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
  123 + <expression repeat="yes" fixchars="1">&lt;a href="/name[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
124 124 </RegExp>
125 125 <expression noclean="1" />
126 126 </RegExp>
@@ -131,7 +131,7 @@
131 131 <expression noclean="1">&lt;table class="cast"&gt;(.*?)&lt;/table&gt;</expression>
132 132 </RegExp>
133 133 <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">
134   - <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>
  134 + <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>
135 135 </RegExp>
136 136 <RegExp input="$$7" output="&lt;actor&gt;&lt;thumb&gt;\1&lt;/thumb&gt;\2&lt;/actor&gt;" dest="2+">
137 137 <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 @@
145 145 <expression noclean="1">&lt;table class="cast"&gt;(.*?)&lt;/table&gt;</expression>
146 146 </RegExp>
147 147 <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">
148   - <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>
  148 + <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>
149 149 </RegExp>
150 150 <RegExp input="$$7" output="&lt;actor&gt;&lt;thumb&gt;\1&lt;/thumb&gt;\2&lt;/actor&gt;" dest="2+">
151 151 <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 @@
159 159 <expression clear="yes" noclean="1">Director[s]?:&lt;/h5&gt;[^&gt;]*&gt;(.*?)&lt;/div</expression>
160 160 </RegExp>
161 161 <RegExp input="$$6" output="&lt;director&gt;\1&lt;/director&gt;" dest="2+">
162   - <expression repeat="yes" clear="yes">&lt;a href="/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
  162 + <expression repeat="yes" fixchars="1" clear="yes">&lt;a href="/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
163 163 </RegExp>
164 164 <expression noclean="1" />
165 165 </RegExp>
@@ -170,7 +170,7 @@
170 170 <expression noclean="1">Writing credits(.*?)name="</expression>
171 171 </RegExp>
172 172 <RegExp input="$$6" output="&lt;credits&gt;\1&lt;/credits&gt;" dest="2+">
173   - <expression repeat="yes">&lt;a href="/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
  173 + <expression repeat="yes" fixchars="1">&lt;a href="/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
174 174 </RegExp>
175 175 <expression noclean="1" />
176 176 </RegExp>

0 comments on commit 42300cc

Please sign in to comment.
Something went wrong with that request. Please try again.