aboutsummaryrefslogtreecommitdiff
path: root/addons/metadata.themoviedb.org
diff options
context:
space:
mode:
authorMartijn Kaijser <mcm.kaijser@gmail.com>2015-08-02 16:38:04 +0200
committerMartijn Kaijser <mcm.kaijser@gmail.com>2015-08-02 16:38:04 +0200
commit312f1e17171c5af6911fb4eb23524ff951f9dbf3 (patch)
treefe3831f030b166eca13e15b5d69c76f4560d58dc /addons/metadata.themoviedb.org
parent6be56184c590cd7cc9ade478884a4f23aa7be70c (diff)
sync scrapers with repo
Diffstat (limited to 'addons/metadata.themoviedb.org')
-rw-r--r--addons/metadata.themoviedb.org/addon.xml3
-rw-r--r--addons/metadata.themoviedb.org/changelog.txt3
-rw-r--r--addons/metadata.themoviedb.org/icon.pngbin8516 -> 8390 bytes
-rw-r--r--addons/metadata.themoviedb.org/resources/language/English (US)/strings.po4
-rw-r--r--addons/metadata.themoviedb.org/resources/settings.xml1
-rw-r--r--addons/metadata.themoviedb.org/tmdb.xml18
6 files changed, 4 insertions, 25 deletions
diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml
index 846272214f..0ba464c889 100644
--- a/addons/metadata.themoviedb.org/addon.xml
+++ b/addons/metadata.themoviedb.org/addon.xml
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.themoviedb.org"
name="The Movie Database"
- version="3.8.3"
+ version="3.8.4"
provider-name="XBMC Foundation">
<requires>
<import addon="xbmc.metadata" version="2.1.0"/>
<import addon="metadata.common.imdb.com" version="2.7.8"/>
- <import addon="metadata.common.hdtrailers.net" version="2.0.5"/>
<import addon="metadata.common.themoviedb.org" version="2.13.1"/>
<import addon="plugin.video.youtube" version="4.4.10" optional="true"/>
</requires>
diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt
index 6c32b33b32..5eeae098f0 100644
--- a/addons/metadata.themoviedb.org/changelog.txt
+++ b/addons/metadata.themoviedb.org/changelog.txt
@@ -1,3 +1,6 @@
+[B]3.8.4[/B]
+- removed: option to scrape trailers from hd-trailers.net (it was broken)
+
[B]3.8.3[/B]
- fixed: further fixes to the broken search results due to API changes
diff --git a/addons/metadata.themoviedb.org/icon.png b/addons/metadata.themoviedb.org/icon.png
index bed844b4e7..01337685ea 100644
--- a/addons/metadata.themoviedb.org/icon.png
+++ b/addons/metadata.themoviedb.org/icon.png
Binary files differ
diff --git a/addons/metadata.themoviedb.org/resources/language/English (US)/strings.po b/addons/metadata.themoviedb.org/resources/language/English (US)/strings.po
index 5d1cb8dec4..d6cd284953 100644
--- a/addons/metadata.themoviedb.org/resources/language/English (US)/strings.po
+++ b/addons/metadata.themoviedb.org/resources/language/English (US)/strings.po
@@ -20,10 +20,6 @@ msgctxt "#30000"
msgid "Enable Fanart"
msgstr "Enable Fanart"
-msgctxt "#30001"
-msgid "Prefer Trailer from HD-Trailers.net"
-msgstr "Prefer Trailer from HD-Trailers.net"
-
msgctxt "#30002"
msgid "Preferred Language"
msgstr "Preferred Language"
diff --git a/addons/metadata.themoviedb.org/resources/settings.xml b/addons/metadata.themoviedb.org/resources/settings.xml
index b98da8dbd9..45ce0c7e19 100644
--- a/addons/metadata.themoviedb.org/resources/settings.xml
+++ b/addons/metadata.themoviedb.org/resources/settings.xml
@@ -3,7 +3,6 @@
<setting label="30005" type="bool" id="keeporiginaltitle" default="false"/>
<setting label="30000" type="bool" id="fanart" default="true"/>
<setting label="30004" type="bool" id="trailer" default="true"/>
- <setting label="30001" type="labelenum" values="No|480p|720p|1080p" id="TrailerQ" default="No"/>
<setting label="30002" type="select" values="bg|cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nb|nl|no|pl|pt|ro|ru|sk|sl|sr|sv|th|tr|uk|zh" id="language" default="en"/>
<setting label="30006" type="select" values="au|bg|cs|da|de|el|es|fi|fr|gb|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|th|tr|us|zh" id="tmdbcertcountry" default="us"/>
<setting label="30003" type="labelenum" values="TMDb|IMDb" id="RatingS" default="TMDb"/>
diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml
index 73c1fb2ff1..e256edcc10 100644
--- a/addons/metadata.themoviedb.org/tmdb.xml
+++ b/addons/metadata.themoviedb.org/tmdb.xml
@@ -113,24 +113,6 @@
<RegExp conditional="trailer" input="$$2" output="&lt;chain function=&quot;GetTMDBTrailerByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
<expression />
</RegExp>
- <RegExp input="$INFO[TrailerQ]" output="&lt;chain function=&quot;GetHDTrailersnet480p&quot;&gt;$$6&lt;/chain&gt;" dest="5+">
- <RegExp input="$$1" output="\1" dest="6">
- <expression clear="yes" noclean="1">&quot;original_title&quot;:&quot;([^&quot;]*)</expression>
- </RegExp>
- <expression>480p</expression>
- </RegExp>
- <RegExp input="$INFO[TrailerQ]" output="&lt;chain function=&quot;GetHDTrailersnet720p&quot;&gt;$$6&lt;/chain&gt;" dest="5+">
- <RegExp input="$$1" output="\1" dest="6">
- <expression clear="yes" noclean="1">&quot;original_title&quot;:&quot;([^&quot;]*)</expression>
- </RegExp>
- <expression>720p</expression>
- </RegExp>
- <RegExp input="$INFO[TrailerQ]" output="&lt;chain function=&quot;GetHDTrailersnet1080p&quot;&gt;$$6&lt;/chain&gt;" dest="5+">
- <RegExp input="$$1" output="\1" dest="6">
- <expression clear="yes" noclean="1">&quot;original_title&quot;:&quot;([^&quot;]*)</expression>
- </RegExp>
- <expression>1080p</expression>
- </RegExp>
<expression noclean="1" />
</RegExp>
</GetDetails>