diff options
| -rw-r--r-- | addons/metadata.common.imdb.com/addon.xml | 2 | ||||
| -rw-r--r-- | addons/metadata.common.imdb.com/changelog.txt | 3 | ||||
| -rw-r--r-- | addons/metadata.common.imdb.com/imdb.xml | 16 |
3 files changed, 12 insertions, 9 deletions
diff --git a/addons/metadata.common.imdb.com/addon.xml b/addons/metadata.common.imdb.com/addon.xml index 4b08fd17a4..419ab4d680 100644 --- a/addons/metadata.common.imdb.com/addon.xml +++ b/addons/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/addons/metadata.common.imdb.com/changelog.txt b/addons/metadata.common.imdb.com/changelog.txt index cd4bd77c6d..4333389496 100644 --- a/addons/metadata.common.imdb.com/changelog.txt +++ b/addons/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/addons/metadata.common.imdb.com/imdb.xml b/addons/metadata.common.imdb.com/imdb.xml index 24a3a4f422..dd3545a101 100644 --- a/addons/metadata.common.imdb.com/imdb.xml +++ b/addons/metadata.common.imdb.com/imdb.xml @@ -81,7 +81,7 @@ <expression noclean="1"><table class="cast_list">(.*?)</table></expression> </RegExp> <RegExp input="$$6" output="<actor><thumb>\1_SX512_SY512_\2</thumb><name>\3</name><role>\4</role></actor>" dest="7"> - <expression repeat="yes" clear="yes" trim="3,4" noclean="1,2"><img\n[^\n]*\n[^\n]*\n\s+src="(?:([^"]*\.)[^"]*(\.jpg))?[^>]*[^"]*"[^"]*">[^>]*>([^<]*).*?<td class="character">[^>]*>[^>]*>([^<]*)?</expression> + <expression repeat="yes" clear="yes" fixchars="3,4" trim="3,4" noclean="1,2"><img\n[^\n]*\n[^\n]*\n\s+src="(?:([^"]*\.)[^"]*(\.jpg))?[^>]*[^"]*"[^"]*">[^>]*>([^<]*).*?<td class="character">[^>]*>[^>]*>([^<]*)?</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> @@ -95,7 +95,7 @@ <expression noclean="1"><table class="cast_list">(.*?)</table></expression> </RegExp> <RegExp input="$$6" output="<actor><thumb>\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2</thumb><name>\3</name><role>\4</role></actor>" dest="7"> - <expression repeat="yes" clear="yes" trim="3,4" noclean="1,2"><img\n[^\n]*\n[^\n]*\n\s+src="(?:([^"]*\.)[^"]*(\.jpg))?[^>]*[^"]*"[^"]*">[^>]*>([^<]*).*?<td class="character">[^>]*>[^>]*>([^<]*)?</expression> + <expression repeat="yes" clear="yes" fixchars="3,4" trim="3,4" noclean="1,2"><img\n[^\n]*\n[^\n]*\n\s+src="(?:([^"]*\.)[^"]*(\.jpg))?[^>]*[^"]*"[^"]*">[^>]*>([^<]*).*?<td class="character">[^>]*>[^>]*>([^<]*)?</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> @@ -109,7 +109,7 @@ <expression clear="yes" noclean="1">Director[s]?.*?</h4>(.*?)<div class</expression> </RegExp> <RegExp input="$$6" output="<director>\1</director>" dest="2+"> - <expression repeat="yes" clear="yes"><a href="/name[^>]*>([^<]*)<</expression> + <expression repeat="yes" fixchars="1" clear="yes"><a href="/name[^>]*>([^<]*)<</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -120,7 +120,7 @@ <expression noclean="1">Writer[s]?.*?</h4>(.*?)<div class</expression> </RegExp> <RegExp input="$$6" output="<credits>\1</credits>" dest="2+"> - <expression repeat="yes"><a href="/name[^>]*>([^<]*)<</expression> + <expression repeat="yes" fixchars="1"><a href="/name[^>]*>([^<]*)<</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -131,7 +131,7 @@ <expression noclean="1"><table class="cast">(.*?)</table></expression> </RegExp> <RegExp input="$$6" output="<actor><thumb>\1_SX512_SY512_\2</thumb><name>\3</name><role>\5</role></actor>" dest="7"> - <expression repeat="yes" clear="yes" trim="3,5" noclean="1,2"><img src="(?:([^"]*\.)[^"]*(\.jpg))?[^>]*[^"]*"nm"><a href="[^"]*[^>]*>([^<]*)<[^"]*"ddd">([^<]<)?[^"]*"char">(.*?)</td></expression> + <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> @@ -145,7 +145,7 @@ <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" trim="3,5" noclean="1,2"><img src="(?:([^"]*\.)[^"]*(\.jpg))?[^>]*[^"]*"nm"><a href="[^"]*[^>]*>([^<]*)<[^"]*"ddd">([^<]<)?[^"]*"char">(.*?)</td></expression> + <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> @@ -159,7 +159,7 @@ <expression clear="yes" noclean="1">Director[s]?:</h5>[^>]*>(.*?)</div</expression> </RegExp> <RegExp input="$$6" output="<director>\1</director>" dest="2+"> - <expression repeat="yes" clear="yes"><a href="/name/[^>]*>([^<]*)<</expression> + <expression repeat="yes" fixchars="1" clear="yes"><a href="/name/[^>]*>([^<]*)<</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -170,7 +170,7 @@ <expression noclean="1">Writing credits(.*?)name="</expression> </RegExp> <RegExp input="$$6" output="<credits>\1</credits>" dest="2+"> - <expression repeat="yes"><a href="/name/[^>]*>([^<]*)<</expression> + <expression repeat="yes" fixchars="1"><a href="/name/[^>]*>([^<]*)<</expression> </RegExp> <expression noclean="1" /> </RegExp> |