The branch, frodo has been updated
via 2bae88f982c53ca9b9cf96784b9844872988beeb (commit)
from 3ed108fae1551fc7af28967bed7b1a2b0a27c132 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=2bae88f982c53ca9b9cf96784b9844872988beeb
commit 2bae88f982c53ca9b9cf96784b9844872988beeb
Author: olympia <[email protected]>
Date: Sun Feb 10 21:24:41 2013 +0100
[metadata.universal] updated to version 2.3.0
diff --git a/metadata.universal/addon.xml b/metadata.universal/addon.xml
index 774efa6..9fb6b91 100644
--- a/metadata.universal/addon.xml
+++ b/metadata.universal/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.universal"
- name="Universal Scraper"
- version="2.2.0"
+ name="Universal Movie Scraper"
+ version="2.3.0"
provider-name="Olympia, Team XBMC">
<requires>
<import addon="xbmc.metadata" version="2.1.0"/>
@@ -56,7 +56,7 @@
<description lang="da">Denne scraper indsamler information fra følgende
understøttede sider: IMDb, TMDb, Rotten Tomatoes, Trakt.tv, OFDb.de. Første
søgning sker altid i TMDb, men efterfølgende kan der felt for felt vælges,
hvilken side den specifikke infomation ønskes fra.</description>
<description lang="de">Dieser Sammler sammelt Informationen von den
folgenden, unterstützen Seiten: IMDb, TMDb, Rotten Tomatoes, Trakt.tv,
OFDb.de. Es fürt jedes mal die Anfangssuche auf TMDb aus, aber danach kann
Feld für Feld ausgewählt werden, woher die Information geholt werden
sollen.</description>
<description lang="el">ÎÏ
ÏÏ Ïο scraper ÏÏ
λλÎγει
ÏληÏοÏοÏÎ¯ÎµÏ Î±ÏÏ ÏÎ¹Ï Î±ÎºÏλοÏ
Î¸ÎµÏ Î¹ÏÏοÏελίδεÏ:
IMDb, TMDb, Rotten Tomatoes, Trakt.tv, OFDb.de. ΠαÏÏική
αναζήÏηÏη γίνεÏαι ÏάνÏα ÏÏο TMDb, αλλά ÎÏειÏα
μÏοÏεί να ÏÏ
θμιÏÏεί Ïεδίο ανά Ïεδίο αÏÏ
Ïοια Ïελίδα να λαμβάνονÏαι
ÏληÏοÏοÏίεÏ.</description>
- <description lang="en">This scraper collecting information from the
following supported sites: IMDb, TMDb, Rotten Tomatoes, Trakt.tv, OFDb.de. It
always does the initial search on TMDb, but following that it can be set field
by field that from which site you want that specific information.</description>
+ <description lang="en">Universal Scraper is currently the most
customizable scraper by collecting information from the following supported
sites: IMDb, TMDb, Rotten Tomatoes, Trakt.tv, OFDb.de, port.hu. This scraper is
currently the flagship of the Team-XBMC scrapers. The initial search can be
done either on TMDb or IMDb (according to the settings), but following that it
can be set field by field that from which site you want that specific
information.</description>
<description lang="es">Este buscador obtiene información de los
siguientes sitios: IMDb, TMDb, Rotten Tomatoes, Trakt.tv, OFDb.de. La primera
búsqueda siempre se realiza en TMDb, pero se puede elegir, campo por campo, de
qué sitio se tiene que obtener la información.</description>
<description lang="es_AR">Este buscador obtiene información de los
siguientes sitios: IMDb, TMDb, Rotten tomatoes, Trakt.tv, OFDb.de. Realiza la
búsqueda inicial en TMDb, pero a partir de allà se puede especificar desde
que sitio se desea obtener cada campo.</description>
<description lang="fr">Ce scraper collecte les informations depuis les
sites supportés suivants : IMDb, TMDb, Rotten Tomatoes, Trakt.tv, OFDb.de. La
recherche initiale est toujours effectuée depuis TMDb, mais vous pouvez
indiquer les sites sources des champs un par un pour avoir une information plus
spécifique.</description>
diff --git a/metadata.universal/changelog.txt b/metadata.universal/changelog.txt
index 5601d0b..2a13096 100644
--- a/metadata.universal/changelog.txt
+++ b/metadata.universal/changelog.txt
@@ -1,3 +1,8 @@
+[B]2.3.0[/B]
+- fixed: various original title fixes
+- fixed: year won't scrape in certain cases
+- added: option to insert IMDb Outline as plot
+
[B]2.2.0[/B]
- fixed: original title won't scrape
- fixed: year in case of TV Movies
diff --git a/metadata.universal/resources/settings.xml
b/metadata.universal/resources/settings.xml
index 5266af1..5633787 100644
--- a/metadata.universal/resources/settings.xml
+++ b/metadata.universal/resources/settings.xml
@@ -17,7 +17,7 @@
<category label="30400">
<setting type="lsep" label="30401"/>
<setting type="sep"/>
- <setting label="30014" type="labelenum"
values="IMDb|themoviedb.org|Rotten Tomatoes|trakt.tv|OFDb.de|port.hu|Rotten
Tomatoes / Critics' Consensus" id="plotsource" default="IMDb"/>
+ <setting label="30014" type="labelenum"
values="IMDb|themoviedb.org|Rotten Tomatoes|trakt.tv|OFDb.de|port.hu|Rotten
Tomatoes / Critics' Consensus|IMDb Outline" id="plotsource" default="IMDb"/>
<setting label="30020" type="labelenum"
values="bg|cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbplotlanguage" default="en" visible="eq(-1,1)"/>
<setting type="sep"/>
<setting label="30042" type="labelenum"
values="IMDb|themoviedb.org|None" id="taglinesource" default="IMDb"/>
diff --git a/metadata.universal/universal.xml b/metadata.universal/universal.xml
index db8ce04..c449857 100644
--- a/metadata.universal/universal.xml
+++ b/metadata.universal/universal.xml
@@ -43,10 +43,10 @@
<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 clear="yes" noclean="1"><meta
name="title"
content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})(?:â\s)?\)</expression>
</RegExp>
<RegExp input="$$1"
output="<entity><title>\2</title><year>\1</year><url
cache="$$7-main.html">http://akas.imdb.com/title/$$7/</url><id>$$7</id></entity>";
dest="5+">
- <expression fixchars="2" noclean="1"><meta
name="title" content="(?:&#x22;)?[^"]*?(?:&#x22;)?
\([^\(]*?([0-9]{4})\).*?Also Known As:</h4>([^\n]*)</expression>
+ <expression fixchars="2" noclean="1"><meta
name="title" content="(?:&#x22;)?[^"]*?(?:&#x22;)?
\([^\(]*?([0-9]{4})(?:â\s)?\).*?Also Known As:</h4>([^\n]*)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="4">
<expression noclean="1"><table
class="findList"(.*?)</div</expression>
@@ -76,13 +76,13 @@
</GetAKASearchResults>
<GetDetails dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
- <RegExp conditional="imdbsearch" input="$$1"
output="\2" dest="19">
- <expression fixchars="2"><meta
name="title" content="(IMDb -
)?(?:&#x22;)?([^"]*?)(?:&#x22;)? \([^\(]*?([0-9]{4})\)</expression>
+ <RegExp input="$$1" output="\2" dest="19">
+ <expression fixchars="2"><meta
name="title" content="(IMDb -
)?(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})(?:â\s)?\)</expression>
</RegExp>
- <RegExp conditional="imdbsearch" input="$$1"
output="\1" dest="19">
+ <RegExp input="$$1" output="\1" dest="19">
<expression fixchars="1"
trim="1"><br/><span\sclass="title-extra">([^<]*)<i>\(original
title\)</expression>
</RegExp>
- <RegExp conditional="imdbsearch" input="$$1"
output="\2" dest="20">
+ <RegExp input="$$1" output="\2" dest="20">
<expression><meta
name="title"\scontent="([^"]*?)\s\([^\(]*?([0-9]{4})(?:â\s)?\)</expression>
</RegExp>
<RegExp conditional="tmdbsearch" input="$$1"
output="\1" dest="2">
@@ -91,10 +91,10 @@
<RegExp conditional="tmdbsearch" input="$$1"
output="\1" dest="2">
<expression
noclean="1">"id":[0-9]*,"imdb_id":"([^"]*)</expression>
</RegExp>
- <RegExp conditional="tmdbsearch" input="$$1"
output="\1" dest="19">
+ <RegExp input="$$1" output="\1" dest="19">
<expression
fixchars="1">"original_title":"([^"]*)</expression>
</RegExp>
- <RegExp conditional="tmdbsearch" input="$$1"
output="\1" dest="20">
+ <RegExp input="$$1" output="\1" dest="20">
<expression
noclean="1">"release_date":"([0-9]+)-</expression>
</RegExp>
<RegExp input="$$2" output="<id>\1</id>"
dest="5">
@@ -178,6 +178,9 @@
<RegExp input="$INFO[plotsource]" output="<chain
function="GetRTCConsensusToPlotById">$$2</chain>" dest="5+">
<expression>Rotten Tomatoes / Critics'
Consensus</expression>
</RegExp>
+ <RegExp input="$INFO[plotsource]" output="<chain
function="GetIMDBOutlineById">$$2</chain>" dest="5+">
+ <expression>IMDb Outline</expression>
+ </RegExp>
<RegExp input="$INFO[taglinesource]" output="<chain
function="GetIMDBTaglineById">$$2</chain>" dest="5+">
<expression>IMDb</expression>
</RegExp>
@@ -193,7 +196,7 @@
<RegExp input="$INFO[plotsource]" output="<chain
function="GetTRAKTTVPlotByIdChain">$$2</chain>" dest="5+">
<expression>trakt.tv</expression>
</RegExp>
- <RegExp input="$INFO[plotsource]" output="<chain
function="GetPortHUPlotByTitleAndYear">$$19::$$20</chain>"
dest="5+">
+ <RegExp input="$INFO[plotsource]" output="<chain
function="GetPortHUPlotByTitleAndYear">$$19::$$20::$$2</chain>"
dest="5+">
<expression>port.hu</expression>
</RegExp>
<RegExp input="$INFO[creditssource]" output="<chain
function="GetIMDBCastById">$$2</chain>" dest="5+">
-----------------------------------------------------------------------
Summary of changes:
metadata.universal/addon.xml | 6 +++---
metadata.universal/changelog.txt | 5 +++++
metadata.universal/resources/settings.xml | 2 +-
metadata.universal/universal.xml | 21 ++++++++++++---------
4 files changed, 21 insertions(+), 13 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
