The branch, eden has been updated
via 4d865c5cf8a55eeba6263129e70f679c492c8f19 (commit)
from 9e7716973db167d05e6546794abe402fe742e8c3 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=4d865c5cf8a55eeba6263129e70f679c492c8f19
commit 4d865c5cf8a55eeba6263129e70f679c492c8f19
Author: olympia <[email protected]>
Date: Sun Apr 29 15:27:22 2012 +0200
[metadata.common.imdb.com] updated to v2.2.1
diff --git a/metadata.common.imdb.com/addon.xml
b/metadata.common.imdb.com/addon.xml
index 994add2..3bc579d 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.2.0"
+ version="2.2.1"
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 6f98721..93d202c 100644
--- a/metadata.common.imdb.com/changelog.txt
+++ b/metadata.common.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.2.1[/B]
+- fixed: hopefully fixed issue with html encodes
+
[B]2.2.0[/B]
- factored out GetIMDBAKATitlesById
- factored out scraping certifications
diff --git a/metadata.common.imdb.com/imdb.xml
b/metadata.common.imdb.com/imdb.xml
index 5695458..fd75d4f 100644
--- a/metadata.common.imdb.com/imdb.xml
+++ b/metadata.common.imdb.com/imdb.xml
@@ -242,47 +242,47 @@
<ParseIMDBAKATitles dest="5">
<RegExp input="$$2"
output="<details><title>\1</title></details>" dest="5">
<RegExp input="$$1" output="\1" dest="2">
- <expression><h1>([^<]*)</expression>
+ <expression
fixchars="1"><h1>([^<]*)</expression>
</RegExp>
<RegExp input="$$10" output="\1" dest="4">
<RegExp input="$$1" output="\1" dest="9">
- <expression><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
+ <expression fixchars="1"><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
</RegExp>
<RegExp input="$$9" output="\1" dest="10">
<expression />
</RegExp>
<RegExp input="$$1" output="\1" dest="11">
- <expression
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+Hong
Kong [<em>][^"]+English</expression>
+ <expression fixchars="1"
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+Hong
Kong [<em>][^"]+English</expression>
</RegExp>
<RegExp input="$$11" output="\1" dest="10">
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="11">
- <expression
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+((Canada)\s(<em>)?\((English|imdb))</expression>
+ <expression fixchars="1"
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+((Canada)\s(<em>)?\((English|imdb))</expression>
</RegExp>
<RegExp input="$$11" output="\1" dest="10">
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="11">
- <expression
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+(UK(<em>)?<br>)</expression>
+ <expression fixchars="1"
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+(UK(<em>)?<br>)</expression>
</RegExp>
<RegExp input="$$11" output="\1" dest="10">
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="11">
- <expression
clear="yes">>\s*?"([^<]+)"[^"]+International\s(<em>)?\(English
title\)(</em>)?(,|<)( |b)</expression>
+ <expression fixchars="1"
clear="yes">>\s*?"([^<]+)"[^"]+International\s(<em>)?\(English
title\)(</em>)?(,|<)( |b)</expression>
</RegExp>
<RegExp input="$$11" output="\1" dest="10">
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="11">
- <expression
clear="yes">>\s*?"([^<]+)"[^"]+International\s(<em>)?\(English
title\)(</em>)? (<em>)?\(imdb</expression>
+ <expression fixchars="1"
clear="yes">>\s*?"([^<]+)"[^"]+International\s(<em>)?\(English
title\)(</em>)? (<em>)?\(imdb</expression>
</RegExp>
<RegExp input="$$11" output="\1" dest="10">
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="12">
- <expression clear="yes"><a
href="/country/[^>]+>(UK</a></div>)</expression>
+ <expression fixchars="1"
clear="yes"><a
href="/country/[^>]+>(UK</a></div>)</expression>
</RegExp>
<RegExp input="$$12" output="$$9" dest="10">
<expression>(.+)</expression>
@@ -294,19 +294,19 @@
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="11">
- <expression
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+(USA(<em>)?<br>)</expression>
+ <expression fixchars="1"
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+(USA(<em>)?<br>)</expression>
</RegExp>
<RegExp input="$$11" output="\1" dest="10">
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="11">
- <expression
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+((USA)\s(<em>)?\((English|imdb))</expression>
+ <expression fixchars="1"
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+((USA)\s(<em>)?\((English|imdb))</expression>
</RegExp>
<RegExp input="$$11" output="\1" dest="10">
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="11">
- <expression
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+((USA)\s(<em>)?\((new
title))</expression>
+ <expression fixchars="1"
clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+((USA)\s(<em>)?\((new
title))</expression>
</RegExp>
<RegExp input="$$11" output="\1" dest="10">
<expression>(.+)</expression>
@@ -317,13 +317,13 @@
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="4">
-
<expression>>\s*?"([^<]+)"[^<]+[<em>]?[^"]+$INFO[imdbakatitles]</expression>
+ <expression
fixchars="1">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+$INFO[imdbakatitles]</expression>
</RegExp>
<RegExp input="$$4" output="\1" dest="2">
<expression>(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="4">
-
<expression>>\s*?"([^<]+)"[^<]+[<em>]?[^"]+$INFO[imdbakatitles]\s(<em>)?\((imdb
display)</expression>
+ <expression
fixchars="1">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+$INFO[imdbakatitles]\s(<em>)?\((imdb
display)</expression>
</RegExp>
<RegExp input="$$4" output="\1" dest="2">
<expression>(.+)</expression>
diff --git a/metadata.universal/addon.xml b/metadata.universal/addon.xml
index 5b36d14..78aca82 100644
--- a/metadata.universal/addon.xml
+++ b/metadata.universal/addon.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.universal"
name="Universal Scraper"
- version="1.0.2"
+ version="1.0.3"
provider-name="Olympia; Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
<import addon="metadata.common.themoviedb.org" version="2.1.4"/>
<import addon="metadata.common.movieposterdb.com" version="1.0.5"/>
- <import addon="metadata.common.imdb.com" version="2.1.9"/>
+ <import addon="metadata.common.imdb.com" version="2.2.1"/>
<import addon="metadata.common.impa.com" version="1.0.3"/>
<import addon="metadata.common.hdtrailers.net" version="1.0.7"/>
<import addon="metadata.common.youtubetrailers" version="1.0.4"/>
diff --git a/metadata.universal/changelog.txt b/metadata.universal/changelog.txt
index b9f345e..8c907bc 100644
--- a/metadata.universal/changelog.txt
+++ b/metadata.universal/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.0.3[/B]
+- updated: to use IMDb scraper library v2.2.1
+
[B]1.0.2[/B]
- added: support for OFDb.de plot
diff --git a/metadata.universal/universal.xml b/metadata.universal/universal.xml
index f851f8f..dba6bd6 100644
--- a/metadata.universal/universal.xml
+++ b/metadata.universal/universal.xml
@@ -22,13 +22,13 @@
<expression
clear="yes">/title/([t0-9]*)/(combined|faq|releaseinfo|vote)</expression>
</RegExp>
<RegExp input="$$1"
output="<entity><title>\1</title><year>\2</year><url
cache="$$7-main.html">http://akas.imdb.com/title/$$7/</url><id>$$7</id></entity>";
dest="5">
- <expression clear="yes" noclean="1"><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
+ <expression fixchars="1" clear="yes"
noclean="1"><meta name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="4">
<expression noclean="1">(><a
href="/title.*)</expression>
</RegExp>
<RegExp input="$$4"
output="<entity><title>\2</title><year>\3</year><url
cache="\1-main.html">http://akas.imdb.com/title/\1/</url><id>\1</id></entity>";
dest="5+">
- <expression repeat="yes"
noclean="1,2">><a
href="/title/([t0-9]*)/[^>]*>(?:&#x22;)?([^<]*?)(?:&#x22;)?</a>
*\([^\(]*?([0-9]{4})</expression>
+ <expression fixchars="2" repeat="yes"
noclean="1,2">><a
href="/title/([t0-9]*)/[^>]*>(?:&#x22;)?([^<]*?)(?:&#x22;)?</a>
*\([^\(]*?([0-9]{4})</expression>
</RegExp>
<expression clear="yes" noclean="1"/>
</RegExp>
@@ -39,7 +39,7 @@
<expression/>
</RegExp>
<RegExp input="$$1"
output="<originaltitle>\2</originaltitle>" dest="5+">
- <expression><meta name="title"
content="(IMDb - )?(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
+ <expression fixchars="1"><meta
name="title" content="(IMDb -
)?(?:&#x22;)?([^"]*?)(?:&#x22;)? \([^\(]*?([0-9]{4})\)</expression>
</RegExp>
<RegExp input="$$1"
output="<year>\2</year>" dest="5+">
<expression><meta name="title"
content="([^"]*?) \([^\(]*?([0-9]{4})\)</expression>
-----------------------------------------------------------------------
Summary of changes:
metadata.common.imdb.com/addon.xml | 2 +-
metadata.common.imdb.com/changelog.txt | 3 +++
metadata.common.imdb.com/imdb.xml | 26 +++++++++++++-------------
metadata.universal/addon.xml | 4 ++--
metadata.universal/changelog.txt | 3 +++
metadata.universal/universal.xml | 6 +++---
6 files changed, 25 insertions(+), 19 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
