The branch, frodo has been updated
via 458917ba72427a8045bd4e735739d81a7e04e33a (commit)
from ceb973d6d5ebc23f0483d65807fd8b2175e6ddc6 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=458917ba72427a8045bd4e735739d81a7e04e33a
commit 458917ba72427a8045bd4e735739d81a7e04e33a
Author: olympia <[email protected]>
Date: Wed Dec 5 08:01:58 2012 +0100
[metadata.universal] updated to version 1.9.1
diff --git a/metadata.universal/addon.xml b/metadata.universal/addon.xml
index 80da982..23f1c7c 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="1.9.0"
+ version="1.9.1"
provider-name="Olympia, Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.universal/changelog.txt b/metadata.universal/changelog.txt
index d37b8c9..60bdba7 100644
--- a/metadata.universal/changelog.txt
+++ b/metadata.universal/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.9.1[/B]
+- fixed: won't scrape from TMDb when there is not IMDb id registered
+
[B]1.9.0[/B]
- updated: Settings Clean-up / added TOP250 and outline from IMDb
diff --git a/metadata.universal/resources/settings.xml
b/metadata.universal/resources/settings.xml
index 510ee10..b671ea0 100644
--- a/metadata.universal/resources/settings.xml
+++ b/metadata.universal/resources/settings.xml
@@ -4,18 +4,18 @@
<setting type="sep"/>
<setting label="30023" type="labelenum" values="IMDb|themoviedb.org"
id="titlesource" default="IMDb"/>
<setting label="30008" type="labelenum" values="Keep Original|USA /
International|Argentina|Austria|Belgium|Brazil|Bulgaria|Canada|China|Colombia|Chile|Croatia|Czech
Republic|Denmark|Finland|France|Germany|Greece|Hong
Kong|Hungary|Iceland|India|Israel|Italy|Japan|Mexico|Netherlands|Norway|Pakistan|Poland|Portugal|Romania|Russia|Serbia|Singapore|Slovenia|Spain|Sweden|Switzerland|Thailand|Turkey|Uruguay|Venezuela"
id="imdbakatitles" default="Keep Original" visible="eq(-1,0)"/>
- <setting label="30027" type="labelenum"
values="cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbtitlelanguage" default="en" visible="eq(-2,1)"/>
+ <setting label="30027" 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="tmdbtitlelanguage" default="en" visible="eq(-2,1)"/>
<setting type="sep"/>
<setting label="30014" type="labelenum"
values="IMDb|themoviedb.org|Rotten Tomatoes|trakt.tv|OFDb.de|port.hu"
id="plotsource" default="IMDb"/>
- <setting label="30020" type="labelenum"
values="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 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"
id="taglinesource" default="IMDb"/>
- <setting label="30043" type="labelenum"
values="cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbtaglinelanguage" default="en" visible="eq(-1,1)"/>
+ <setting label="30043" 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="tmdbtaglinelanguage" default="en" visible="eq(-1,1)"/>
<setting type="sep"/>
<setting label="30045" type="bool" id="imdboutline" default="true"/>
<setting type="sep"/>
<setting label="30022" type="labelenum"
values="IMDb|themoviedb.org|trakt.tv" id="genressource" default="IMDb"/>
- <setting label="30040" type="labelenum"
values="cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbgenreslanguage" default="en" visible="eq(-1,1)"/>
+ <setting label="30040" 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="tmdbgenreslanguage" default="en" visible="eq(-1,1)"/>
<setting type="sep"/>
<setting label="30013" type="bool" id="tmdbset" default="true"/>
</category>
@@ -33,7 +33,7 @@
<setting type="lsep" label="Poster Sources"/>
<setting label="30037" type="bool" id="trakttvposter" default="false"/>
<setting label="30002" type="bool" id="tmdbthumbs" default="true"/>
- <setting label="30034" type="labelenum"
values="cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbthumblanguage" default="en" enable="!eq(-1,false)"/>
+ <setting label="30034" 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="tmdbthumblanguage" default="en" enable="!eq(-1,false)"/>
<setting label="30003" type="bool" id="impawards" default="false"/>
<setting label="30004" type="bool" id="movieposterdb" default="false"/>
<setting label="30036" type="bool" id="imdbthumbs" default="false"/>
@@ -46,7 +46,7 @@
<setting label="30028" type="lsep"/>
<setting label="30006" type="labelenum" values="No|480p|720p|1080p"
id="TrailerQ" default="No"/>
<setting label="30009" type="bool" id="tmdbtrailer" default="true"/>
- <setting label="30041" type="labelenum"
values="cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|zh"
id="tmdbtrailerlanguage" default="en" enable="!eq(-1,false)"/>
+ <setting label="30041" 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="tmdbtrailerlanguage" default="en" enable="!eq(-1,false)"/>
<setting label="30039" type="bool" id="trakttvtrailer" default="false"/>
<setting label="30005" type="bool" id="ytrailer" default="false"/>
</category>
@@ -61,7 +61,7 @@
<setting type="lsep" label="30031"/>
<setting label="30032" type="labelenum" values="IMDb|themoviedb.org"
id="certificationssource" default="IMDb"/>
<setting label="30033" type="labelenum"
values="Argentina|Australia|Austria|Belgium|Brazil|Bulgaria|Canada|China|Colombia|Chile|Croatia|Czech
Republic|Denmark|Finland|France|Germany|Greece|Hong
Kong|Hungary|Iceland|India|Israel|Italy|Japan|Mexico|Netherlands|Norway|Pakistan|Poland|Portugal|Romania|Russia|Serbia|Singapore|Slovenia|Spain|Sweden|Switzerland|Thailand|Turkey|UK|Uruguay|USA|Venezuela"
id="imdbcertcountry" default="USA" visible="eq(-1,0)"/>
- <setting label="30033" type="labelenum"
values="au|cs|da|de|el|es|fi|fr|gb|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|us|zh"
id="tmdbcertcountry" default="us" visible="eq(-2,1)"/>/>
+ <setting label="30033" type="labelenum"
values="au|bg|cs|da|de|el|es|fi|fr|gb|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|tr|us|zh"
id="tmdbcertcountry" default="us" visible="eq(-2,1)"/>/>
<setting label="30035" type="text" id="certprefix" default="Rated "/>
</category>
diff --git a/metadata.universal/universal.xml b/metadata.universal/universal.xml
index f62fa5c..ab92863 100644
--- a/metadata.universal/universal.xml
+++ b/metadata.universal/universal.xml
@@ -9,7 +9,7 @@
</RegExp>
</NfoUrl>
<CreateSearchUrl dest="3">
- <RegExp input="$$1"
output="<url>http://api.themoviedb.org/3/search/movie?api_key=57983e31fb435df4df77afb854740ea9&amp;query=\1&amp;year=$$4&amp;language=$INFO[language]</url>";
dest="3">
+ <RegExp input="$$1"
output="<url>http://api.themoviedb.org/3/search/movie?api_key=57983e31fb435df4df77afb854740ea9&amp;query=\1&amp;year=$$4</url>";
dest="3">
<RegExp input="$$2" output="\1" dest="4">
<expression clear="yes">(.+)</expression>
</RegExp>
@@ -18,13 +18,13 @@
</CreateSearchUrl>
<GetSearchResults dest="8">
<RegExp input="$$3" output="<results>\1</results>"
dest="8">
- <RegExp input="$$1"
output="<entity><title>\4</title><id>\1</id><year>\3</year><url
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url></entity>";
dest="3">
+ <RegExp input="$$1"
output="<entity><title>\4</title><id>\1</id><year>\3</year><url
cache="tmdb-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9</url></entity>";
dest="3">
<expression
repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":"([0-9]+)-.*?"title":"([^"]*)</expression>
</RegExp>
- <RegExp input="$$1"
output="<entity><title>\2</title><id>\1</id><year>\3</year><url
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url></entity>";
dest="3+">
+ <RegExp input="$$1"
output="<entity><title>\2</title><id>\1</id><year>\3</year><url
cache="tmdb-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9</url></entity>";
dest="3+">
<expression
repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":"([0-9]+)-</expression>
</RegExp>
- <RegExp input="$$1"
output="<entity><title>\2</title><id>\1</id><url
cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url></entity>";
dest="3+">
+ <RegExp input="$$1"
output="<entity><title>\2</title><id>\1</id><url
cache="tmdb-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9</url></entity>";
dest="3+">
<expression
repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":null</expression>
</RegExp>
<expression noclean="1" />
@@ -33,7 +33,10 @@
<GetDetails dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
<RegExp input="$$1" output="\1" dest="2">
- <expression clear="yes"
noclean="1">"id":[0-9]*,"imdb_id":"([^"]*)</expression>
+ <expression clear="yes"
noclean="1">"id":([0-9]*),"</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="2">
+ <expression
noclean="1">"id":[0-9]*,"imdb_id":"([^"]*)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="19">
<expression
fixchars="1">"original_title":"([^"]*)</expression>
-----------------------------------------------------------------------
Summary of changes:
metadata.universal/addon.xml | 2 +-
metadata.universal/changelog.txt | 3 +++
metadata.universal/resources/settings.xml | 14 +++++++-------
metadata.universal/universal.xml | 13 ++++++++-----
4 files changed, 19 insertions(+), 13 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
