The branch, frodo has been updated
via 2728ee782eb6f179f3d3dc2518118e37ed3ed2a1 (commit)
from 29d4396cd1d454ba4491f9d57274927a8b4ee94a (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=2728ee782eb6f179f3d3dc2518118e37ed3ed2a1
commit 2728ee782eb6f179f3d3dc2518118e37ed3ed2a1
Author: olympia <[email protected]>
Date: Tue Dec 18 19:53:17 2012 +0100
[metadata.universal] updated to version 2.0.0
diff --git a/metadata.universal/addon.xml b/metadata.universal/addon.xml
index 07b7569..1ef4cb8 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.4"
+ version="2.0.0"
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 a5fec00..40996f4 100644
--- a/metadata.universal/changelog.txt
+++ b/metadata.universal/changelog.txt
@@ -1,5 +1,8 @@
+[B]2.0.0[/B]
+- added: Option to Use IMDb Search Engine
+
[B]1.9.4[/B]
-- updated language files from Transifex
+- updated: language files from Transifex
[B]1.9.3[/B]
- fixed: won't scrape from TMDb when movie is part of a collection
diff --git a/metadata.universal/resources/language/English/strings.xml
b/metadata.universal/resources/language/English/strings.xml
index e602ed6..ccd9e47 100644
--- a/metadata.universal/resources/language/English/strings.xml
+++ b/metadata.universal/resources/language/English/strings.xml
@@ -1,8 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Translated using Transifex web application. For support, or if you would
like to to help out, please visit your language team! -->
-<!-- English language-Team URL:
http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/en/ -->
-<!-- Report language file syntax bugs at: http://trac.xbmc.org/ -->
-
<strings>
<string id="30001">Enable fanart from themoviedb.org</string>
<string id="30002">Enable posters from themoviedb.org</string>
@@ -19,7 +15,6 @@
<string id="30015">Get Cast / Directors / Writers From</string>
<string id="30016">Plot Sources</string>
<string id="30020"> Preferred Plot Language</string>
- <string id="30021">Get Ratings from</string>
<string id="30022">Get Genres From</string>
<string id="30023">Get Title From</string>
<string id="30024">Title Sources</string>
@@ -40,15 +35,25 @@
<string id="30039">Enable trailers from trakt.tv</string>
<string id="30040"> Genre Language</string>
<string id="30041"> Preferred Trailer Language</string>
+ <string id="30041"> Preferred Trailer Language</string>
<string id="30042">Get Tagline From</string>
<string id="30043"> Preferred Tagline Language</string>
<string id="30044">Get IMDb TOP250 Ranking</string>
<string id="30045">Get Outline From IMDb</string>
+
<string id="30100">Rating</string>
+ <string id="30021">Get Ratings from</string>
<string id="30110"> Rating Generated Using</string>
<string id="30115"> Use the Score Aggregated from</string>
<string id="30120"> Use Critics' Consensus as Movie Outline</string>
+
<string id="30200">Credits</string>
<string id="30201">Get Studio from</string>
<string id="30202">Get Country from</string>
+
+ <string id="30300">Search</string>
+ <string id="30301">IMDb</string>
+ <string id="30302">themoviedb.org</string>
+ <string id="30303">Search Engine to Use</string>
+
</strings>
diff --git a/metadata.universal/resources/settings.xml
b/metadata.universal/resources/settings.xml
index b671ea0..e5808df 100644
--- a/metadata.universal/resources/settings.xml
+++ b/metadata.universal/resources/settings.xml
@@ -65,4 +65,10 @@
<setting label="30035" type="text" id="certprefix" default="Rated "/>
</category>
+ <category label="30300">
+ <setting type="lsep" label="30303"/>
+ <setting label="30301" type="bool" id="imdbsearch" default="true"
enable="!eq(1,true)"/>
+ <setting label="30302" type="bool" id="tmdbsearch" default="false"
enable="!eq(-1,true)"/>
+ </category>
+
</settings>
diff --git a/metadata.universal/universal.xml b/metadata.universal/universal.xml
index 2307b10..d9b279a 100644
--- a/metadata.universal/universal.xml
+++ b/metadata.universal/universal.xml
@@ -9,15 +9,21 @@
</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</url>";
dest="3">
+ <RegExp conditional="tmdbsearch" 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>
<expression noclean="1" />
</RegExp>
+ <RegExp conditional="imdbsearch" input="$$1"
output="<url>http://akas.imdb.com/find?q=\1&s=tt</url>";
dest="3">
+ <RegExp input="$$2" output="%20(\1)" dest="4">
+ <expression clear="yes">(.+)</expression>
+ </RegExp>
+ <expression noclean="1"/>
+ </RegExp>
</CreateSearchUrl>
<GetSearchResults dest="8">
- <RegExp input="$$3" output="<results>\1</results>"
dest="8">
+ <RegExp conditional="tmdbsearch" 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-\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>
@@ -29,19 +35,46 @@
</RegExp>
<expression noclean="1" />
</RegExp>
+ <RegExp conditional="imdbsearch" input="$$5" output="<?xml
version="1.0" encoding="iso-8859-1"
standalone="yes"?><results>\1</results>" dest="8">
+ <RegExp input="$$1" output="\1" dest="7">
+ <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>
+ </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>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="4">
+ <expression noclean="1"><table
class="findList"(.*?)</div</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"><td\sclass="result_text">\s<a\shref="/title/([t0-9]*)/[^>]*>(?:&#x22;)?([^<]*?)(?:&#x22;)?</a>\s*(?:\([IV]+\)
)?\([^\(]*?([0-9]{4})[^\)]*\)\s(?:\(TV Movie\) )?<</expression>
+ </RegExp>
+ <RegExp input="$$4"
output="<entity><title>\4</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"><td\sclass="result_text">\s<a\shref="/title/([t0-9]*)/[^>]*>(?:&#x22;)?([^<]*?)(?:&#x22;)?</a>\s*(?:\([IV]+\)
)?\([^\(]*?([0-9]{4})[^\)]*\)\s<br/>aka\s<i>"([^"]*)</expression>
+ </RegExp>
+ <expression clear="yes" noclean="1"/>
+ </RegExp>
</GetSearchResults>
<GetDetails dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
- <RegExp input="$$1" output="\1" dest="2">
+ <RegExp conditional="imdbsearch" input="$$1"
output="<originaltitle>\2</originaltitle>" dest="19">
+ <expression><meta name="title"
content="(IMDb - )?(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
+ </RegExp>
+ <RegExp conditional="imdbsearch" input="$$1"
output="<year>\2</year>" dest="20">
+ <expression><meta name="title"
content="([^"]*?) \([^\(]*?([0-9]{4})\)</expression>
+ </RegExp>
+ <RegExp conditional="tmdbsearch" input="$$1"
output="\1" dest="2">
<expression
noclean="1">"id":([0-9]*),"imdb_id</expression>
</RegExp>
- <RegExp input="$$1" output="\1" dest="2">
+ <RegExp conditional="tmdbsearch" input="$$1"
output="\1" dest="2">
<expression
noclean="1">"id":[0-9]*,"imdb_id":"([^"]*)</expression>
</RegExp>
- <RegExp input="$$1" output="\1" dest="19">
+ <RegExp conditional="tmdbsearch" input="$$1"
output="\1" dest="19">
<expression
fixchars="1">"original_title":"([^"]*)</expression>
</RegExp>
- <RegExp input="$$1"
output="<year>\2</year>" dest="20">
+ <RegExp conditional="tmdbsearch" input="$$1"
output="<year>\2</year>" dest="20">
<expression><meta name="title"
content="([^"]*?) \([^\(]*?([0-9]{4})\)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="20">
-----------------------------------------------------------------------
Summary of changes:
metadata.universal/addon.xml | 2 +-
metadata.universal/changelog.txt | 5 ++-
.../resources/language/English/strings.xml | 15 ++++--
metadata.universal/resources/settings.xml | 6 +++
metadata.universal/universal.xml | 45 +++++++++++++++++---
5 files changed, 60 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
