Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[scrapers] sync master with current scraper repo

  • Loading branch information...
commit 64d3b8e87d681c91553fa296a65f77bb3786a67e 1 parent 37e8e4e
@MartijnKaijser MartijnKaijser authored
Showing with 665 additions and 123 deletions.
  1. +8 −3 addons/metadata.album.universal/addon.xml
  2. +11 −2 addons/metadata.album.universal/albumuniversal.xml
  3. +28 −0 addons/metadata.album.universal/changelog.txt
  4. +13 −0 addons/metadata.album.universal/resources/language/Chinese (Simple)/strings.xml
  5. +2 −2 addons/metadata.album.universal/resources/settings.xml
  6. +11 −6 addons/metadata.artists.universal/addon.xml
  7. +11 −2 addons/metadata.artists.universal/artistuniversal.xml
  8. +33 −0 addons/metadata.artists.universal/changelog.txt
  9. +24 −0 addons/metadata.artists.universal/resources/language/Chinese (Simple)/strings.xml
  10. +4 −4 addons/metadata.artists.universal/resources/settings.xml
  11. +1 −1  addons/metadata.common.allmusic.com/addon.xml
  12. +11 −5 addons/metadata.common.allmusic.com/allmusic.xml
  13. +1 −1  addons/metadata.common.fanart.tv/addon.xml
  14. +27 −9 addons/metadata.common.fanart.tv/fanarttv.xml
  15. +1 −7 addons/metadata.common.hdtrailers.net/addon.xml
  16. +24 −3 addons/metadata.common.hdtrailers.net/hdtrailers.xml
  17. BIN  addons/metadata.common.hdtrailers.net/icon.png
  18. +1 −1  addons/metadata.common.imdb.com/addon.xml
  19. +19 −0 addons/metadata.common.imdb.com/changelog.txt
  20. BIN  addons/metadata.common.imdb.com/icon.png
  21. +151 −4 addons/metadata.common.imdb.com/imdb.xml
  22. +1 −1  addons/metadata.common.last.fm/addon.xml
  23. +4 −1 addons/metadata.common.last.fm/lastfm.xml
  24. +1 −1  addons/metadata.common.themoviedb.org/addon.xml
  25. BIN  addons/metadata.common.themoviedb.org/icon.png
  26. +187 −21 addons/metadata.common.themoviedb.org/tmdb.xml
  27. +3 −1 addons/metadata.musicvideos.last.fm/addon.xml
  28. +5 −0 addons/metadata.musicvideos.last.fm/resources/language/Chinese (Simple)/strings.xml
  29. +3 −3 addons/metadata.themoviedb.org/addon.xml
  30. +20 −0 addons/metadata.themoviedb.org/changelog.txt
  31. +4 −3 addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml
  32. +0 −3  addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml
  33. +3 −2 addons/metadata.themoviedb.org/resources/language/English/strings.xml
  34. +0 −2  addons/metadata.themoviedb.org/resources/language/German/strings.xml
  35. +1 −0  addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
  36. +2 −5 addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml
  37. +3 −1 addons/metadata.themoviedb.org/resources/settings.xml
  38. +12 −12 addons/metadata.themoviedb.org/tmdb.xml
  39. +1 −1  addons/metadata.tvdb.com/addon.xml
  40. +15 −0 addons/metadata.tvdb.com/changelog.txt
  41. +19 −16 addons/metadata.tvdb.com/tvdb.xml
View
11 addons/metadata.album.universal/addon.xml
@@ -1,24 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.album.universal"
name="Universal Album Scraper"
- version="1.2.2"
+ version="1.4.0"
provider-name="Olympia, Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
<import addon="metadata.common.last.fm" version="1.3.2"/>
<import addon="metadata.common.allmusic.com" version="2.3.1"/>
<import addon="metadata.common.musicbrainz.org" version="1.2.3"/>
- <import addon="metadata.common.fanart.tv" version="1.0.1"/>
+ <import addon="metadata.common.fanart.tv" version="2.0.0"/>
<import addon="metadata.common.amazon.de" version="1.0.0"/>
+ <import addon="metadata.common.theaudiodb.com" version="1.1.0"/>
</requires>
<extension point="xbmc.metadata.scraper.albums"
language="en"
library="albumuniversal.xml"/>
<extension point="xbmc.addon.metadata">
<summary lang="en">Universal Scraper for Albums</summary>
+ <summary lang="zh">通用音乐专辑信息刮削器</summary>
<description lang="en">This scraper collects information from the following supported sites: MusicBrainz, last.fm, allmusic.com and amazon.de, while grabs artwork from: fanart.tv, last.fm and allmusic.com. It can be set field by field that from which site you want that specific information.
The initial search is always done on MusicBrainz. In case allmusic and/or amazon.de links are not added on the MusicBrainz site, fields from allmusic.com and/or amazon.de cannot be fetched (very easy to add those missing links though).</description>
+ <description lang="zh">本刮削器支持从以下网站获取信息:MusicBrainz、last.fm、allmusic.com和amazon.de,并从以下网站获取艺术图片:fanart.tv、last.fm和allmusic.com。你可以指定每一项内容的来源网站。
+
+初始结果总是先从MusicBrainz获取。如果MusicBrainz网站没有到allmusic和/或amazon.de的外部链接,则无法获取allmusic.com的/或amazon.de的信息(当然你能很容易地加入缺失的链接)。</description>
<platform>all</platform>
</extension>
</addon>
View
13 addons/metadata.album.universal/albumuniversal.xml
@@ -6,12 +6,12 @@
</RegExp>
</NfoUrl>
<CreateAlbumSearchUrl dest="3">
- <RegExp input="$$1" output="&lt;url&gt;http://search.musicbrainz.org/ws/2/release/?fmt=xml&amp;query=release:&quot;\1&quot;%20AND%20artist:&quot;$$2&quot;&lt;/url&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;url&gt;http://search.musicbrainz.org/ws/2/release/?fmt=xml&amp;query=release:\1%20AND%20artist:$$4&lt;/url&gt;" dest="3">
<RegExp input="$$2" output="\1" dest="4">
<expression noclean="1">(.+)</expression>
</RegExp>
<RegExp input="$$2" output="\1" dest="6">
- <expression noclean="1">(.+)(?:Ft%2e|Feat%2e|Ft.|Feat.|%20and%20)</expression>
+ <expression noclean="1">(.+)(?:Ft%2e|Feat%2e|%20Ft\.|%20Feat\.|%20and%20)</expression>
</RegExp>
<RegExp input="$$6" output="\1" dest="4">
<expression>(.+)</expression>
@@ -27,6 +27,12 @@
<RegExp input="$$1" output="&lt;entity&gt;&lt;year&gt;\5-\4-T#\6&lt;/year&gt;&lt;artist&gt;\3&lt;/artist&gt;&lt;title&gt;\2&lt;/title&gt;&lt;url cache=&quot;mb-\1-album.xml&quot;&gt;http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings&lt;/url&gt;&lt;/entity&gt;" dest="5+">
<expression repeat="yes">id=&quot;([^&quot;]*)&quot;&gt;&lt;title&gt;([^&lt;]*)&lt;/title&gt;&lt;status&gt;Official&lt;/status&gt;&lt;text-representation&gt;&lt;language&gt;[^&lt;]*&lt;/language&gt;&lt;script&gt;[^&lt;]*&lt;/script&gt;&lt;/text-representation&gt;&lt;artist-credit&gt;&lt;name-credit(?:&gt;)*(?:\sjoinphrase=&quot;[^&quot;]*&quot;&gt;)*(?:&lt;name&gt;[^&lt;]*&lt;/name)*(?:&gt;)*&lt;artist\sid=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;([^&lt;]*)&lt;/name&gt;(?:&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)*(?:&lt;disambiguation&gt;[^&lt;]*&lt;/disambiguation&gt;)*(?:&lt;alias-list&gt;.*?&lt;/alias-list&gt;)*&lt;/artist&gt;&lt;/name-credit&gt;(?:&lt;name-credit(?:&gt;)*(?:\sjoinphrase=&quot;[^&quot;]*&quot;&gt;)*(?:&lt;name&gt;[^&lt;]*&lt;/name)*(?:&gt;)*&lt;artist\sid=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;[^&lt;]*&lt;/name&gt;(?:&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)*(?:&lt;disambiguation&gt;[^&lt;]*&lt;/disambiguation&gt;)*(?:&lt;alias-list&gt;.*?&lt;/alias-list&gt;)*&lt;/artist&gt;&lt;/name-credit&gt;)*&lt;/artist-credit&gt;&lt;release-group(?:\stype=&quot;[^&quot;]*&quot;)*\sid=&quot;[^&quot;]*&quot;&gt;(?:&lt;primary-type&gt;[^&lt;]*&lt;/primary-type&gt;)*(?:&lt;secondary-type-list&gt;&lt;secondary-type&gt;[^&lt;]*&lt;/secondary-type&gt;&lt;/secondary-type-list&gt;)*&lt;/release-group&gt;&lt;date&gt;(\d{4})[^&lt;]*&lt;/date&gt;(?:&lt;country&gt;)*([^&lt;]*)?.*?&lt;track-list\scount=&quot;(\d+)</expression>
</RegExp>
+ <RegExp input="$$1" output="&lt;entity&gt;&lt;year&gt;\5-\4-T#\6&lt;/year&gt;&lt;artist&gt;\3&lt;/artist&gt;&lt;title&gt;\2&lt;/title&gt;&lt;url cache=&quot;mb-\1-album.xml&quot;&gt;http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings&lt;/url&gt;&lt;/entity&gt;" dest="5">
+ <expression repeat="yes">id=&quot;([^&quot;]*)&quot; ext:score=&quot;[^&quot;]*&quot;&gt;&lt;title&gt;([^&lt;]*)&lt;/title&gt;&lt;status&gt;Official&lt;/status&gt;&lt;text-representation&gt;&lt;language&gt;[^&lt;]*&lt;/language&gt;&lt;script&gt;[^&lt;]*&lt;/script&gt;&lt;/text-representation&gt;&lt;artist-credit&gt;&lt;name-credit(?:&gt;)*(?:\sjoinphrase=&quot;[^&quot;]*&quot;&gt;)*(?:&lt;name&gt;[^&lt;]*&lt;/name)*(?:&gt;)*&lt;artist\sid=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;([^&lt;]*)&lt;/name&gt;(?:&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)*(?:&lt;disambiguation&gt;[^&lt;]*&lt;/disambiguation&gt;)*(?:&lt;alias-list&gt;.*?&lt;/alias-list&gt;)*&lt;/artist&gt;&lt;/name-credit&gt;(?:&lt;name-credit(?:&gt;)*(?:\sjoinphrase=&quot;[^&quot;]*&quot;&gt;)*(?:&lt;name&gt;[^&lt;]*&lt;/name)*(?:&gt;)*&lt;artist\sid=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;[^&lt;]*&lt;/name&gt;(?:&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)*(?:&lt;disambiguation&gt;[^&lt;]*&lt;/disambiguation&gt;)*(?:&lt;alias-list&gt;.*?&lt;/alias-list&gt;)*&lt;/artist&gt;&lt;/name-credit&gt;)*&lt;/artist-credit&gt;&lt;release-group\sid=&quot;[^&quot;]*&quot;\stype=&quot;Album&quot;&gt;(?:&lt;primary-type&gt;[^&lt;]*&lt;/primary-type&gt;)*(?:&lt;secondary-type-list&gt;&lt;secondary-type&gt;[^&lt;]*&lt;/secondary-type&gt;&lt;/secondary-type-list&gt;)*&lt;/release-group&gt;&lt;date&gt;(\d{4})[^&lt;]*&lt;/date&gt;(?:&lt;country&gt;)*([^&lt;]*)?.*?&lt;track-list\scount=&quot;(\d+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="&lt;entity&gt;&lt;year&gt;\5-\4-T#\6&lt;/year&gt;&lt;artist&gt;\3&lt;/artist&gt;&lt;title&gt;\2&lt;/title&gt;&lt;url cache=&quot;mb-\1-album.xml&quot;&gt;http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings&lt;/url&gt;&lt;/entity&gt;" dest="5+">
+ <expression repeat="yes">id=&quot;([^&quot;]*)&quot; ext:score=&quot;[^&quot;]*&quot;&gt;&lt;title&gt;([^&lt;]*)&lt;/title&gt;&lt;status&gt;Official&lt;/status&gt;&lt;text-representation&gt;&lt;language&gt;[^&lt;]*&lt;/language&gt;&lt;script&gt;[^&lt;]*&lt;/script&gt;&lt;/text-representation&gt;&lt;artist-credit&gt;&lt;name-credit(?:&gt;)*(?:\sjoinphrase=&quot;[^&quot;]*&quot;&gt;)*(?:&lt;name&gt;[^&lt;]*&lt;/name)*(?:&gt;)*&lt;artist\sid=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;([^&lt;]*)&lt;/name&gt;(?:&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)*(?:&lt;disambiguation&gt;[^&lt;]*&lt;/disambiguation&gt;)*(?:&lt;alias-list&gt;.*?&lt;/alias-list&gt;)*&lt;/artist&gt;&lt;/name-credit&gt;(?:&lt;name-credit(?:&gt;)*(?:\sjoinphrase=&quot;[^&quot;]*&quot;&gt;)*(?:&lt;name&gt;[^&lt;]*&lt;/name)*(?:&gt;)*&lt;artist\sid=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;[^&lt;]*&lt;/name&gt;(?:&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)*(?:&lt;disambiguation&gt;[^&lt;]*&lt;/disambiguation&gt;)*(?:&lt;alias-list&gt;.*?&lt;/alias-list&gt;)*&lt;/artist&gt;&lt;/name-credit&gt;)*&lt;/artist-credit&gt;&lt;release-group\sid=&quot;[^&quot;]*&quot;(?:\stype=&quot;[^&quot;]*&quot;)*&gt;(?:&lt;primary-type&gt;[^&lt;]*&lt;/primary-type&gt;)*(?:&lt;secondary-type-list&gt;&lt;secondary-type&gt;[^&lt;]*&lt;/secondary-type&gt;&lt;/secondary-type-list&gt;)*&lt;/release-group&gt;&lt;date&gt;(\d{4})[^&lt;]*&lt;/date&gt;(?:&lt;country&gt;)*([^&lt;]*)?.*?&lt;track-list\scount=&quot;(\d+)</expression>
+ </RegExp>
<expression noclean="1" />
</RegExp>
</GetAlbumSearchResults>
@@ -69,6 +75,9 @@
<RegExp input="$INFO[albumreviewsource]" output="&lt;chain function=&quot;GetLastFMAlbumReviewByAlbumAndArtist&quot;&gt;$$7::$$8::$$7::$$8&lt;/chain&gt;" dest="5+">
<expression>last.fm</expression>
</RegExp>
+ <RegExp input="$INFO[albumreviewsource]" output="&lt;chain function=&quot;GetTADBAlbumReviewByMBID&quot;&gt;$$4&lt;/chain&gt;" dest="5+">
+ <expression>TheAudioDb.com</expression>
+ </RegExp>
<RegExp input="$INFO[albumreviewsource]" output="&lt;url function=&quot;GetAmazonDEAlbumReview&quot;&gt;http://musicbrainz.org/ws/2/release-group/$$4?inc=url-rels&lt;/url&gt;" dest="5+">
<expression>amazon.de</expression>
</RegExp>
View
28 addons/metadata.album.universal/changelog.txt
@@ -1,3 +1,31 @@
+[B]1.4.0[/B]
+Added back fanart.tv scraping via JSON API. Still off by default.
+
+[B]1.3.7[/B]
+Temporarily disable fanarttv.com scraping due to site load issues
+
+[B]1.3.6[/B]
+Fixed: Scraper now works with both API layout
+
+[B]1.3.5[/B]
+Added: Chinese translation
+
+[B]1.3.4[/B]
+Fixed: MusicBrainz reverted back previous API layout changes so scraper needs to be reverted too
+
+[B]1.3.3[/B]
+Fixed: Broken search after API result layout changes
+
+[B]1.3.2[/B]
+Changed: Loosen up search results
+
+[B]1.3.1[/B]
+Tuned: Artist Splitter
+
+[B]1.3.0[/B]
+Added: scraping album review from TheAudioDb.com
+Fixed: Artist Splitter
+
[B]1.2.2[/B]
Fixed: accommodate new Frodo style URL encoding
View
13 addons/metadata.album.universal/resources/language/Chinese (Simple)/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<strings>
+ <string id="30000">启用fanart.tv专辑图片</string>
+ <string id="30001">启用Last.fm专辑图片</string>
+ <string id="30002">专辑评论获取于</string>
+ <string id="30003"> 首选语言</string>
+ <string id="30004">专辑评分获取于</string>
+ <string id="30005">专辑风格获取于</string>
+ <string id="30006">专辑心情获取于</string>
+ <string id="30007">专辑主题获取于</string>
+ <string id="30008">启用allmusic.com专辑图片</string>
+ <string id="30009">艺术图片</string>
+</strings>
View
4 addons/metadata.album.universal/resources/settings.xml
@@ -2,7 +2,7 @@
<settings>
<category label="128">
<setting type="lsep" label="General Settings"/>
- <setting label="30002" type="labelenum" values="last.fm|amazon.de|None" id="albumreviewsource" default="last.fm"/>
+ <setting label="30002" type="labelenum" values="last.fm|TheAudioDb.com|amazon.de|None" id="albumreviewsource" default="last.fm"/>
<setting label="30003" type="labelenum" values="en|de|es|fr|it|jp|pl|pt|ru|sv|tr|zh" id="lastfmlanguage" default="en" visible="eq(-1,0)"/>
<setting type="sep"/>
<setting label="30004" type="labelenum" values="MusicBrainz|allmusic.com|None" id="albumratingsource" default="MusicBrainz"/>
@@ -13,7 +13,7 @@
<category label="30009">
<setting type="lsep" label="Artwork Settings"/>
- <setting label="30000" type="bool" id="fanarttvalbumthumbs" default="true"/>
+ <setting label="30000" type="bool" id="fanarttvalbumthumbs" default="false"/>
<setting label="30001" type="bool" id="lastfmalbumthumbs" default="true"/>
<setting label="30008" type="bool" id="allmusicalbumthumbs" default="true"/>
</category>
View
17 addons/metadata.artists.universal/addon.xml
@@ -1,24 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.artists.universal"
name="Universal Artist Scraper"
- version="2.0.6"
+ version="2.2.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.last.fm" version="1.4.1"/>
- <import addon="metadata.common.allmusic.com" version="2.4.1"/>
+ <import addon="metadata.common.last.fm" version="1.5.1"/>
+ <import addon="metadata.common.allmusic.com" version="2.5.2"/>
<import addon="metadata.common.musicbrainz.org" version="1.2.1"/>
<import addon="metadata.common.htbackdrops.com" version="1.2.0"/>
- <import addon="metadata.common.fanart.tv" version="1.1.0"/>
+ <import addon="metadata.common.fanart.tv" version="2.0.0"/>
+ <import addon="metadata.common.theaudiodb.com" version="1.2.0"/>
</requires>
<extension point="xbmc.metadata.scraper.artists"
language="en"
library="artistuniversal.xml"/>
<extension point="xbmc.addon.metadata">
<summary lang="en">Universal Scraper for Artists</summary>
- <description lang="en">This scraper collects information from the following supported sites: MusicBrainz, last.fm, and allmusic.com, while grabs artwork from: fanart.tv, htbackdrops.com, last.fm and allmusic.com. It can be set field by field that from which site you want that specific information.
+ <summary lang="zh">通用艺术家信息刮削器</summary>
+ <description lang="en">This scraper collects information from the following supported sites: TheAudioDb.com, MusicBrainz, last.fm, and allmusic.com, while grabs artwork from: fanart.tv, htbackdrops.com, last.fm and allmusic.com. It can be set field by field that from which site you want that specific information.
The initial search is always done on MusicBrainz. In case allmusic link is not added on the MusicBrainz site fields from allmusic.com cannot be fetched (very easy to add those missing links though).</description>
+ <description lang="zh">本刮削器支持从以下网站获取信息:TheAudioDb.com、MusicBrainz、last.fm和allmusic.com,并从以下网站获取艺术图片:fanart.tv、htbackdrops.com、last.fm和allmusic.com。你可以指定每一项内容的来源网站。
+
+初始结果总是先从MusicBrainz获取,如果MusicBrainz网站未加入到allmusic的外部链接,则无法获取allmusic.com的信息(当然你能很容易地加入缺失的链接)。</description>
<platform>all</platform>
</extension>
</addon>
View
13 addons/metadata.artists.universal/artistuniversal.xml
@@ -6,12 +6,12 @@
</RegExp>
</NfoUrl>
<CreateArtistSearchUrl dest="3">
- <RegExp input="$$1" output="&lt;url&gt;http://search.musicbrainz.org/ws/2/artist/?fmt=xml&amp;query=artist:&quot;$$4&quot;&amp;limit=100&lt;/url&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;url&gt;http://search.musicbrainz.org/ws/2/artist/?fmt=xml&amp;query=artist:$$4&amp;limit=100&lt;/url&gt;" dest="3">
<RegExp input="$$1" output="\1" dest="4">
<expression noclean="1">(.+)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1">(.+)(?:Ft%2e|Feat%2e|Ft.|Feat.|%20and%20)</expression>
+ <expression noclean="1">(.+)(?:Ft%2e|Feat%2e|%20Ft\.|%20Feat\.|%20and%20)</expression>
</RegExp>
<RegExp input="$$6" output="\1" dest="4">
<expression>(.+)</expression>
@@ -22,6 +22,9 @@
<GetArtistSearchResults dest="8">
<RegExp input="$$5" output="&lt;results&gt;\1&lt;/results&gt;" dest="8">
<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;genre&gt;\7&lt;/genre&gt;&lt;url cache=&quot;mb-\1-artist.xml&quot;&gt;http://www.musicbrainz.org/ws/2/artist/\1?inc=url-rels&lt;/url&gt;&lt;/entity&gt;" dest="9">
+ <expression repeat="yes" noclean="1">artist id=&quot;([^&quot;]*)&quot;(?:\stype=&quot;[^&quot;]*&quot;)* ext:score=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;([^&lt;]*)&lt;/name&gt;(&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)?(&lt;gender&gt;[^&lt;]*&lt;/gender&gt;)?(&lt;country&gt;[^&lt;]*&lt;/country&gt;)?(&lt;disambiguation&gt;([^&lt;]*))?</expression>
+ </RegExp>
+ <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;genre&gt;\7&lt;/genre&gt;&lt;url cache=&quot;mb-\1-artist.xml&quot;&gt;http://www.musicbrainz.org/ws/2/artist/\1?inc=url-rels&lt;/url&gt;&lt;/entity&gt;" dest="9">
<expression repeat="yes" noclean="1">artist ext:score=&quot;[^&quot;]*&quot;(?:\stype=&quot;[^&quot;]*&quot;)* id=&quot;([^&quot;]*)&quot;&gt;&lt;name&gt;([^&lt;]*)&lt;/name&gt;(&lt;sort-name&gt;[^&lt;]*&lt;/sort-name&gt;)?(&lt;gender&gt;[^&lt;]*&lt;/gender&gt;)?(&lt;country&gt;[^&lt;]*&lt;/country&gt;)?(&lt;disambiguation&gt;([^&lt;]*))?</expression>
</RegExp>
<RegExp input="$$9" output="\1" dest="5">
@@ -40,6 +43,9 @@
<RegExp input="$$1" output="\2" dest="9">
<expression noclean="1">&gt;&lt;relation type=&quot;allmusic&quot;&gt;&lt;target&gt;http://(www.)?allmusic.com/artist/([^&lt;]*)</expression>
</RegExp>
+ <RegExp input="$$1" output="&lt;name&gt;\1&lt;/name&gt;" dest="5">
+ <expression noclean="1">&lt;artist(?:\stype=&quot;[^&quot;]*&quot;)* id=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;([^&lt;]*)</expression>
+ </RegExp>
<RegExp input="$$8" conditional="fanarttvthumbs" output="&lt;chain function=&quot;GetFanartTvArtistThumbsByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
<expression/>
</RegExp>
@@ -79,6 +85,9 @@
<RegExp input="$INFO[stylessource]" output="&lt;chain function=&quot;GetLastFMArtistStylesByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="5+">
<expression>last.fm</expression>
</RegExp>
+ <RegExp input="$INFO[biogsource]" output="&lt;chain function=&quot;GetTADBBiographyByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="5+">
+ <expression>TheAudioDb.com</expression>
+ </RegExp>
<expression noclean="1"/>
</RegExp>
</GetArtistDetails>
View
33 addons/metadata.artists.universal/changelog.txt
@@ -1,3 +1,36 @@
+[B]2.2.0[/B]
+Added back fanart.tv scraping via JSON API. Still off by default.
+
+[B]2.1.9[/B]
+Temporarily disable fanarttv.com scraping due to site load issues
+
+[B]2.1.8[/B]
+Fixed: Scraper now works with both API layouts
+
+[B]2.1.7[/B]
+Added: Chinese translation
+
+[B]2.1.6[/B]
+Fixed: MusicBrainz reverted back previous API layout changes so scraper needs to be reverted too
+
+[B]2.1.5[/B]
+Fixed: Broken search after API result layout changes
+
+[B]2.1.4[/B]
+Added: correctly populate the artist name into MusicInfoArtist
+
+[B]2.1.3[/B]
+Fixed: fallback from last.fm
+
+[B]2.1.2[/B]
+Changed: Loosen up search results
+
+[B]2.1.1[/B]
+Tuned: Artist Splitter
+
+[B]2.1.0[/B]
+Added: scraping Biography from TheAudioDb.com
+
[B]2.0.6[/B]
Fixed: accommodate new Frodo style URL encoding
View
24 addons/metadata.artists.universal/resources/language/Chinese (Simple)/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<strings>
+ <string id="30000">启用HTBackdrops.com艺人同人画</string>
+ <string id="30001">启用allmusic.com艺人图片</string>
+ <string id="30002">启用last.fm艺人图片</string>
+ <string id="30003">启用HTBackdrops.com艺人图片</string>
+ <string id="30004">启用fanart.tv艺人同人画</string>
+ <string id="30005">启用fanart.tv艺人图片</string>
+ <string id="30006">艺人传记获取于</string>
+ <string id="30007">艺术图片</string>
+ <string id="30008">艺人唱片目录获取于</string>
+ <string id="30009">艺人类型获取于</string>
+ <string id="30010">艺人风格获取于</string>
+ <string id="30011">艺人生卒年月获取于</string>
+ <string id="30012">艺人心情获取于</string>
+ <string id="30014">艺人活跃期获取于</string>
+ <string id="30015"> 首选语言</string>
+ <string id="30016">备选艺人传记获取于</string>
+ <string id="30017">备选艺人唱片目录获取于</string>
+ <string id="30018">备选艺人类型获取于</string>
+ <string id="30019">备选艺人风格获取于</string>
+ <string id="30020">备选艺人生卒年月获取于</string>
+ <string id="30021">备选</string>
+</strings>
View
8 addons/metadata.artists.universal/resources/settings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
<category label="128">
- <setting label="30006" type="labelenum" values="last.fm|None" id="biogsource" default="last.fm"/>
+ <setting label="30006" type="labelenum" values="last.fm|TheAudioDb.com|None" id="biogsource" default="last.fm"/>
<setting label="30015" type="labelenum" values="en|de|es|fr|it|jp|pl|pt|ru|sv|tr|zh" id="lastfmlanguage" default="en" visible="eq(-1,0)"/>
<setting type="sep"/>
<setting label="30008" type="labelenum" values="last.fm|MusicBrainz|allmusic.com|None" id="discogsource" default="MusicBrainz"/>
@@ -14,7 +14,7 @@
</category>
<category label="30021">
- <setting label="30016" type="labelenum" values="last.fm|None" id="biogfbsource" default="None"/>
+ <setting label="30016" type="labelenum" values="last.fm|TheAudioDb.com|None" id="biogfbsource" default="None"/>
<setting label="30015" type="labelenum" values="en|de|es|fr|it|jp|pl|pt|ru|sv|tr|zh" id="lastfmlanguage" default="en" visible="eq(-1,0)"/>
<setting type="sep"/>
<setting label="30017" type="labelenum" values="last.fm|MusicBrainz|None" id="discogfbsource" default="None" visible="false"/>
@@ -25,12 +25,12 @@
<category label="30007">
<setting type="lsep" label="Thumb Sources"/>
- <setting label="30005" type="bool" id="fanarttvthumbs" default="true"/>
+ <setting label="30005" type="bool" id="fanarttvthumbs" default="false"/>
<setting label="30003" type="bool" id="htbthumbs" default="true"/>
<setting label="30002" type="bool" id="lastfmartistthumbs" default="true"/>
<setting label="30001" type="bool" id="allmusicartistthumbs" default="true"/>
<setting type="lsep" label="Fanart Sources"/>
- <setting label="30004" type="bool" id="fanarttvfanart" default="true"/>
+ <setting label="30004" type="bool" id="fanarttvfanart" default="false"/>
<setting label="30000" type="bool" id="htbfanart" default="true"/>
</category>
View
2  addons/metadata.common.allmusic.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.allmusic.com"
name="AllMusic"
- version="2.4.3"
+ version="2.5.2"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
View
16 addons/metadata.common.allmusic.com/allmusic.xml
@@ -33,6 +33,9 @@
<RegExp input="$INFO[biogfbsource]" output="&lt;chain function=&quot;GetLastFMFallbackBiographyByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="12">
<expression>last.fm</expression>
</RegExp>
+ <RegExp input="$INFO[biogfbsource]" output="&lt;chain function=&quot;GetTADBFMFallbackBiographyByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="12">
+ <expression>TheAudioDb.com</expression>
+ </RegExp>
<expression>^$</expression>
</RegExp>
<RegExp input="$$11" output="&lt;biography&gt;\1&lt;/biography&gt;" dest="2">
@@ -52,7 +55,7 @@
<RegExp input="" output="" dest="2">
<expression />
</RegExp>
- <RegExp input="$$1" output="\1" dest="2">
+ <RegExp input="$$1" output="&lt;biography&gt;\1&lt;/biography&gt;" dest="2">
<expression clear="yes">&quot; itemprop=&quot;description&quot;&gt;(.*?)div class=&quot;advertisement leaderboard&quot;&gt;</expression>
</RegExp>
<expression noclean="1"/>
@@ -294,10 +297,13 @@
<RegExp input="" output="" dest="2">
<expression />
</RegExp>
- <RegExp input="$$1" output="\1" dest="9">
+ <RegExp input="" output="" dest="4">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="4">
<expression noclean="1">&lt;h4&gt;photo gallery&lt;/h4&gt;(.*?)&lt;h4&gt;</expression>
</RegExp>
- <RegExp input="$$9" output="&lt;thumb&gt;http://cps-static.rovicorp.com/3/JPG_1080/\1&lt;/thumb&gt;" dest="2">
+ <RegExp input="$$4" output="&lt;thumb&gt;http://cps-static.rovicorp.com/3/JPG_1080/\1&lt;/thumb&gt;" dest="2">
<expression repeat="yes" noclean="1">&lt;img src=&quot;http://cps-static.rovicorp.com/3/JPG_[^/]*/([^&quot;]*)</expression>
</RegExp>
<expression noclean="1"/>
@@ -436,10 +442,10 @@
</GetAMGAlbumThemesByAMGID>
<ParseAMGAlbumThemes dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
- <RegExp input="$$1" output="\1" dest="9">
+ <RegExp input="$$1" output="\1" dest="4">
<expression noclean="1">&lt;h4&gt;album themes&lt;/h4&gt;(.*?)&lt;/ul&gt;</expression>
</RegExp>
- <RegExp input="$$9" output="&lt;theme&gt;\1&lt;/theme&gt;" dest="2">
+ <RegExp input="$$4" output="&lt;theme&gt;\1&lt;/theme&gt;" dest="2">
<expression repeat="yes" noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
</RegExp>
<expression noclean="1" />
View
2  addons/metadata.common.fanart.tv/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.fanart.tv"
name="fanart.tv"
- version="1.1.0"
+ version="2.0.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
View
36 addons/metadata.common.fanart.tv/fanarttv.xml
@@ -1,6 +1,6 @@
<scraperfunctions>
<GetFanartTvArtistThumbsByMBID dest="5" clearbuffers="no">
- <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseFanartTvArtistThumbs&quot; cache=&quot;fanarttv-artistimages-\1.xml&quot;&gt;http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/xml/&lt;/url&gt;&lt;/details&gt;" dest="5">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseFanartTvArtistThumbs&quot; cache=&quot;fanarttv-artistimages-\1.json&quot;&gt;http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/json/&lt;/url&gt;&lt;/details&gt;" dest="5">
<expression noclean="1" />
</RegExp>
</GetFanartTvArtistThumbsByMBID>
@@ -9,15 +9,21 @@
<RegExp input="" output="" dest="13">
<expression />
</RegExp>
- <RegExp input="$$1" output="&lt;thumb preview=&quot;\1/preview&quot;&gt;\1&lt;/thumb&gt;" dest="13">
- <expression repeat="yes" noclean="1">&lt;artistthumb id=&quot;[^&quot;]*&quot; url=&quot;([^&quot;]*)</expression>
+ <RegExp input="" output="" dest="16">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="16">
+ <expression noclean="1">&quot;artistthumb&quot;:\[(.*?)\],&quot;</expression>
+ </RegExp>
+ <RegExp input="$$16" output="&lt;thumb preview=&quot;\1/preview&quot;&gt;\1&lt;/thumb&gt;" dest="13">
+ <expression repeat="yes" noclean="1">&quot;id&quot;:&quot;\d*&quot;,&quot;url&quot;:&quot;([^&quot;]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</ParseFanartTvArtistThumbs>
<GetFanartTvArtistFanartsByMBID dest="5" clearbuffers="no">
- <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseFanartTvArtistFanarts&quot; cache=&quot;fanarttv-artistimages-\1.xml&quot;&gt;http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/xml/&lt;/url&gt;&lt;/details&gt;" dest="5">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseFanartTvArtistFanarts&quot; cache=&quot;fanarttv-artistimages-\1.json&quot;&gt;http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/json/&lt;/url&gt;&lt;/details&gt;" dest="5">
<expression noclean="1" />
</RegExp>
</GetFanartTvArtistFanartsByMBID>
@@ -29,8 +35,14 @@
<RegExp input="" output="" dest="14">
<expression />
</RegExp>
- <RegExp input="$$1" output="&lt;thumb preview=&quot;\1/preview&quot;&gt;\1&lt;/thumb&gt;" dest="14">
- <expression repeat="yes" noclean="1">&lt;artistbackground id=&quot;[^&quot;]*&quot; url=&quot;([^&quot;]*)</expression>
+ <RegExp input="" output="" dest="16">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="16">
+ <expression noclean="1">&quot;artistbackground&quot;:\[(.*?)\],&quot;</expression>
+ </RegExp>
+ <RegExp input="$$16" output="&lt;thumb preview=&quot;\1/preview&quot;&gt;\1&lt;/thumb&gt;" dest="14">
+ <expression repeat="yes" noclean="1">&quot;id&quot;:&quot;\d*&quot;,&quot;url&quot;:&quot;([^&quot;]*)</expression>
</RegExp>
<RegExp input="$$14" output="\1" dest="13">
<expression noclean="1">(.+)</expression>
@@ -40,7 +52,7 @@
</ParseFanartTvArtistFanarts>
<GetFanartTvAlbumThumbsByMBID dest="5" clearbuffers="no">
- <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseFanartTvAlbumThumbs&quot; cache=&quot;fanarttv-albumimages-\1.xml&quot;&gt;http://fanart.tv/webservice/album/ed4b784f97227358b31ca4dd966a04f1/\1/xml/&lt;/url&gt;&lt;/details&gt;" dest="5">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseFanartTvAlbumThumbs&quot; cache=&quot;fanarttv-albumimages-\1.json&quot;&gt;http://fanart.tv/webservice/album/ed4b784f97227358b31ca4dd966a04f1/\1/json/&lt;/url&gt;&lt;/details&gt;" dest="5">
<expression noclean="1" />
</RegExp>
</GetFanartTvAlbumThumbsByMBID>
@@ -49,8 +61,14 @@
<RegExp input="" output="" dest="13">
<expression />
</RegExp>
- <RegExp input="$$1" output="&lt;thumb preview=&quot;\1/preview&quot;&gt;\1&lt;/thumb&gt;" dest="13">
- <expression repeat="yes" noclean="1">&lt;albumcover id=&quot;[^&quot;]*&quot; url=&quot;([^&quot;]*)</expression>
+ <RegExp input="" output="" dest="16">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="16">
+ <expression noclean="1">&quot;albumcover&quot;:\[(.*?)\]\}</expression>
+ </RegExp>
+ <RegExp input="$$16" output="&lt;thumb preview=&quot;\1/preview&quot;&gt;\1&lt;/thumb&gt;" dest="13">
+ <expression repeat="yes" noclean="1">&quot;id&quot;:&quot;\d*&quot;,&quot;url&quot;:&quot;([^&quot;]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
View
8 addons/metadata.common.hdtrailers.net/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.hdtrailers.net"
name="HD-Trailers common scraper functions"
- version="1.0.7"
+ version="1.0.8"
provider-name="Bence Nádas (olympia)">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -9,31 +9,25 @@
<extension point="xbmc.metadata.scraper.library"
library="hdtrailers.xml"/>
<extension point="xbmc.addon.metadata">
- <summary lang="bg">Библиотека за сваляне на инф. от HD-Trailers.net</summary>
<summary lang="en">HD-Trailers.net Scraper Library</summary>
<summary lang="de">Scraper für Trailer von HD-Trailers.net</summary>
<summary lang="es">Scraper de Trailers de HD-Trailers.net</summary>
- <summary lang="fi">HD-Trailers.net trailerilataajan kirjasto</summary>
<summary lang="fr">Scraper HD-Trailers.net pour les bande-annonces</summary>
<summary lang="hu">HD-Trailers.net leolvasó-könyvtár</summary>
<summary lang="nl">HD-Trailers.net Scraper Collectie</summary>
<summary lang="pl">Scraper zwiastunów HD-Trailers.net</summary>
<summary lang="pt">Scraper de trailers de HD-Trailers.net</summary>
<summary lang="ru">Обработчик для трейлеров с HD-Trailers.net</summary>
- <summary lang="se">Skrapa för HD-Trailers.net</summary>
<summary lang="zh">HD-Trailers.net刮削器代码库</summary>
- <description lang="bg">Сваля трейлъри на филми от www.hd-trailers.net</description>
<description lang="en">Download Movie Trailers from www.hd-trailers.net</description>
<description lang="de">Downloade Trailer von www.hd-trailers.net</description>
<description lang="es">Descarga trailers de www.hd-trailers.net</description>
- <description lang="fi">Lataa elokuvien trailereita osoitteesta www.hd-trailers.net</description>
<description lang="fr">Télécharge les bande-annonces de films depuis www.hd-trailers.net</description>
<description lang="hu">Filmelőzetesek letöltése a www.hd-trailers.net-ről</description>
<description lang="nl">Download trailers van www.hd-trailers.net</description>
<description lang="pl">Pobieraj zwiastuny filmowe z www.hd-trailers.net</description>
<description lang="pt">Descarregar trailers de www.hd-trailers.net</description>
<description lang="ru">Загружать трейлеры с www.hd-trailers.net</description>
- <description lang="se">Ladda ner filmtrailers från www.hd-trailers.net</description>
<description lang="zh">从www.hd-trailers.net下载电影预告片</description>
<minversion>20000</minversion>
<platform>all</platform>
View
27 addons/metadata.common.hdtrailers.net/hdtrailers.xml
@@ -24,9 +24,15 @@
</RegExp>
</GetHDTrailersnet1080p>
<Parse480pTrailer dest="5">
- <!--Fetch 480p trailer link from hdtrailers.net-->
- <RegExp input="$$1" output="&lt;details&gt;&lt;trailer&gt;http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2&lt;/trailer&gt;&lt;/details&gt;" dest="5">
- <expression noclean="1">&quot;&gt;(Theatrical )?Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
+ <RegExp input="$$6" output="&lt;details&gt;&lt;trailer&gt;\1&lt;/trailer&gt;&lt;/details&gt;" dest="5">
+ <!--fetch 480p trailer link from hdtrailers.net-->
+ <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6">
+ <expression noclean="1">&quot;&gt;(Theatrical )?Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
+ </RegExp>
+ <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6+">
+ <expression noclean="1">&quot;&gt;(Teaser )?Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
+ </RegExp>
+ <expression noclean="1" />
</RegExp>
</Parse480pTrailer>
<Parse720pTrailer dest="5">
@@ -35,10 +41,16 @@
<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6">
<expression noclean="1">&quot;&gt;(Theatrical )?Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
</RegExp>
+ <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6+">
+ <expression noclean="1">&quot;&gt;(Teaser )?Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
+ </RegExp>
<!--Fetch 720p trailer link from hdtrailers.net-->
<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6">
<expression noclean="1">&quot;&gt;(Theatrical )?Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res720p</expression>
</RegExp>
+ <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6+">
+ <expression noclean="1">&quot;&gt;(Teaser )?Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res720p</expression>
+ </RegExp>
<expression noclean="1" />
</RegExp>
</Parse720pTrailer>
@@ -48,14 +60,23 @@
<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6">
<expression noclean="1">&quot;&gt;(Theatrical )?Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
</RegExp>
+ <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6+">
+ <expression noclean="1">&quot;&gt;(Teaser )?Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
+ </RegExp>
<!--Fallback to fetch 720p trailer link if 1080p is not available-->
<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6">
<expression noclean="1">&quot;&gt;(Theatrical )?Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res720p</expression>
</RegExp>
+ <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6+">
+ <expression noclean="1">&quot;&gt;(Teaser )?Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res720p</expression>
+ </RegExp>
<!--Fetch 1080p trailer link from hdtrailers.net-->
<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6">
<expression noclean="1">&quot;&gt;(Theatrical )?Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res1080p</expression>
</RegExp>
+ <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6+">
+ <expression noclean="1">&quot;&gt;(Teaser )?Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res1080p</expression>
+ </RegExp>
<expression noclean="1" />
</RegExp>
</Parse1080pTrailer>
View
BIN  addons/metadata.common.hdtrailers.net/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2  addons/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.1.9"
+ version="2.4.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
View
19 addons/metadata.common.imdb.com/changelog.txt
@@ -1,3 +1,22 @@
+[B]2.4.0[/B]
+- added: aspect tag to imdb poster
+
+[B]2.3.0[/B]
+- added: option to scrape rating from MetaCritic (via IMDb)
+
+[B]2.2.3[/B]
+- fixed: still to address some html encode issues, now in plots
+
+[B]2.2.2[/B]
+- fixed: still to address html encode issues
+
+[B]2.2.1[/B]
+- fixed: hopefully fixed issue with html encodes
+
+[B]2.2.0[/B]
+- factored out GetIMDBAKATitlesById
+- factored out scraping certifications
+
[B]2.1.9[/B]
- fixed: plot when contains html links (once again)
View
BIN  addons/metadata.common.imdb.com/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
155 addons/metadata.common.imdb.com/imdb.xml
@@ -27,6 +27,20 @@
</RegExp>
</ParseIMDBRating>
+ <GetMetaCriticRatingById dest="5">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;$$1-main.html&quot; function=&quot;ParseMetaCriticRating&quot;&gt;http://akas.imdb.com/title/$$1/&lt;/url&gt;&lt;/details&gt;" dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetMetaCriticRatingById>
+ <ParseMetaCriticRating dest="5">
+ <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+ <RegExp input="$$1" output="&lt;rating&gt;\1.\2&lt;/rating&gt;" dest="2">
+ <expression>&lt;a href=&quot;criticreviews&quot;&gt;(\d)(\d*)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseMetaCriticRating>
+
<GetIMDBPlotById dest="5">
<RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;$$1-main.html&quot; function=&quot;ParseIMDBPlot&quot;&gt;http://akas.imdb.com/title/$$1/&lt;/url&gt;&lt;/details&gt;" dest="5">
<expression noclean="1" />
@@ -35,7 +49,7 @@
<ParseIMDBPlot dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="2">
- <expression trim="1">&lt;h2&gt;Storyline&lt;/h2&gt;\n+&lt;p&gt;(.*?)&lt;[^a/]</expression>
+ <expression fixchars="1" trim="1">&lt;h2&gt;Storyline&lt;/h2&gt;\n+&lt;p&gt;(.*?)&lt;[^a/]</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -51,7 +65,7 @@
<RegExp input="$$1" output="\1" dest="6">
<expression noclean="1">&lt;table class=&quot;cast_list&quot;&gt;(.*?)&lt;/table&gt;</expression>
</RegExp>
- <RegExp input="$$6" output="&lt;actor&gt;&lt;thumb&gt;\2_SX512_SY512_\3&lt;/thumb&gt;&lt;name&gt;\1&lt;/name&gt;&lt;role&gt;\5&lt;/role&gt;&lt;/actor&gt;" dest="7">
+ <RegExp input="$$6" output="&lt;actor&gt;&lt;thumb&gt;\2_SX1024_SY1024_\3&lt;/thumb&gt;&lt;name&gt;\1&lt;/name&gt;&lt;role&gt;\5&lt;/role&gt;&lt;/actor&gt;" dest="7">
<expression repeat="yes" clear="yes" trim="3,4" noclean="1,2">&lt;noscript&gt;&lt;img \n[^a]*alt=&quot;([^&quot;]*)&quot;[^&quot;]*&quot;[^&quot;]*&quot;[^s]*src=&quot;(?:([^&quot;]*\.)[^&quot;]*(\.jpg))[^&gt;]*.*?ter"&gt;[^&gt;]*&gt;\n\s*(&lt;[^&gt;]*&gt;)?([^&lt;\(]*)?</expression>
</RegExp>
<RegExp input="$$6" output="&lt;actor&gt;&lt;thumb&gt;&lt;/thumb&gt;&lt;name&gt;\1&lt;/name&gt;&lt;role&gt;\3&lt;/role&gt;&lt;/actor&gt;" dest="7+">
@@ -131,7 +145,7 @@
<RegExp input="$$1" output="\1" dest="6">
<expression noclean="1">&lt;table class=&quot;cast&quot;&gt;(.*?)&lt;/table&gt;</expression>
</RegExp>
- <RegExp input="$$6" output="&lt;actor&gt;&lt;thumb&gt;\1_SX512_SY512_\2&lt;/thumb&gt;&lt;name&gt;\3&lt;/name&gt;&lt;role&gt;\5&lt;/role&gt;&lt;/actor&gt;" dest="7">
+ <RegExp input="$$6" output="&lt;actor&gt;&lt;thumb&gt;\1_SX1024_SY1024_\2&lt;/thumb&gt;&lt;name&gt;\3&lt;/name&gt;&lt;role&gt;\5&lt;/role&gt;&lt;/actor&gt;" dest="7">
<expression repeat="yes" clear="yes" fixchars="3,5" trim="3,5" noclean="1,2">&lt;img src="(?:([^&quot;]*\.)[^&quot;]*(\.jpg))?[^&gt;]*[^&quot;]*&quot;nm&quot;&gt;&lt;a href=&quot;[^&quot;]*[^&gt;]*&gt;([^&lt;]*)&lt;[^&quot;]*&quot;ddd&quot;&gt;([^&lt;]&lt;)?[^&quot;]*&quot;char&quot;&gt;(.*?)&lt;/td&gt;</expression>
</RegExp>
<RegExp input="$$7" output="&lt;actor&gt;&lt;thumb&gt;\1&lt;/thumb&gt;\2&lt;/actor&gt;" dest="2+">
@@ -205,10 +219,143 @@
<RegExp input="$$1" output="\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2" dest="4">
<expression noclean="1,2">&lt;a name=&quot;poster&quot;.*?src=&quot;(.*?)_S.*?(.jpg)&quot;.*?&lt;/a&gt;</expression>
</RegExp>
- <RegExp input="$$4" output="&lt;thumb&gt;\1&lt;/thumb&gt;" dest="6">
+ <RegExp input="$$4" output="&lt;thumb aspect=&quot;poster&quot;&gt;\1&lt;/thumb&gt;" dest="6">
<expression noclean="1">(.*?_SX[0-9]+_SY[0-9]+_.jpg)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</ParseIMDBThumbs>
+
+ <GetIMDBUSACert dest="5">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;$$1-main.html&quot; function=&quot;ParseIMDBUSACert&quot;&gt;http://akas.imdb.com/title/$$1/&lt;/url&gt;&lt;/details&gt;" dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBUSACert>
+ <ParseIMDBUSACert dest="5">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;mpaa&gt;$INFO[certprefix]\1&lt;/mpaa&gt;&lt;/details&gt;" dest="5">
+ <expression>MPAA&lt;/a&gt;\)&lt;/h4&gt;\n?&lt;span itemprop=&quot;contentRating&quot;&gt;Rated\s([^&lt;]*)</expression>
+ </RegExp>
+ </ParseIMDBUSACert>
+
+ <GetIMDBCountryCert dest="5">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;$$1-combined.html&quot; function=&quot;ParseIMDBCountryCert&quot;&gt;http://akas.imdb.com/title/$$1/combined&lt;/url&gt;&lt;/details&gt;" dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBCountryCert>
+ <ParseIMDBCountryCert dest="5">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;mpaa&gt;$INFO[certprefix]\1&lt;/mpaa&gt;&lt;/details&gt;" dest="5">
+ <expression>&gt;\s*$INFO[imdbcertcountry]:([^&lt;]+)&lt;/a&gt;</expression>
+ </RegExp>
+ </ParseIMDBCountryCert>
+
+ <GetIMDBAKATitlesById dest="5">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;$$1-combined.html&quot; function=&quot;ParseIMDBAKATitles&quot;&gt;http://akas.imdb.com/title/$$1/combined&lt;/url&gt;&lt;/details&gt;" dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetIMDBAKATitlesById>
+ <ParseIMDBAKATitles dest="5">
+ <RegExp input="$$2" output="&lt;details&gt;&lt;title&gt;\1&lt;/title&gt;&lt;/details&gt;" dest="5">
+ <RegExp input="$$1" output="\1" dest="2">
+ <expression fixchars="1">&lt;h1&gt;([^&lt;]*)</expression>
+ </RegExp>
+ <RegExp input="$$10" output="\1" dest="4">
+ <RegExp input="$$1" output="\2" dest="9">
+ <expression fixchars="2">&lt;meta name=&quot;title&quot; content=&quot;(IMDb - )?(?:&amp;#x22;)?([^&quot;]*?)(?:&amp;#x22;)? \([^\(]*?([0-9]{4})\)</expression>
+ </RegExp>
+ <RegExp input="$$9" output="\1" dest="10">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression fixchars="1" clear="yes">&gt;\s*?&quot;([^&lt;]+)&quot;[^&lt;]+[&lt;em&gt;]?[^&quot;]+Hong Kong [&lt;em&gt;][^&quot;]+English</expression>
+ </RegExp>
+ <RegExp input="$$11" output="\1" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression fixchars="1" clear="yes">&gt;\s*?&quot;([^&lt;]+)&quot;[^&lt;]+[&lt;em&gt;]?[^&quot;]+((Canada)\s(&lt;em&gt;)?\((English|imdb))</expression>
+ </RegExp>
+ <RegExp input="$$11" output="\1" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression fixchars="1" clear="yes">&gt;\s*?&quot;([^&lt;]+)&quot;[^&lt;]+[&lt;em&gt;]?[^&quot;]+(UK(&lt;em&gt;)?&lt;br&gt;)</expression>
+ </RegExp>
+ <RegExp input="$$11" output="\1" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression fixchars="1" clear="yes">&gt;\s*?&quot;([^&lt;]+)&quot;[^&quot;]+International\s(&lt;em&gt;)?\(English title\)(&lt;/em&gt;)?(,|&lt;)( |b)</expression>
+ </RegExp>
+ <RegExp input="$$11" output="\1" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression fixchars="1" clear="yes">&gt;\s*?&quot;([^&lt;]+)&quot;[^&quot;]+International\s(&lt;em&gt;)?\(English title\)(&lt;/em&gt;)? (&lt;em&gt;)?\(imdb</expression>
+ </RegExp>
+ <RegExp input="$$11" output="\1" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="12">
+ <expression fixchars="1" clear="yes">&lt;a href=&quot;/country/[^&gt;]+&gt;(UK&lt;/a&gt;&lt;/div&gt;)</expression>
+ </RegExp>
+ <RegExp input="$$12" output="$$9" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="12">
+ <expression clear="yes">&lt;a href=&quot;/country/[^&gt;]+&gt;(USA&lt;/a&gt;&lt;/div&gt;)</expression>
+ </RegExp>
+ <RegExp input="$$12" output="$$9" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression fixchars="1" clear="yes">&gt;\s*?&quot;([^&lt;]+)&quot;[^&lt;]+[&lt;em&gt;]?[^&quot;]+(USA(&lt;em&gt;)?&lt;br&gt;)</expression>
+ </RegExp>
+ <RegExp input="$$11" output="\1" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression fixchars="1" clear="yes">&gt;\s*?&quot;([^&lt;]+)&quot;[^&lt;]+[&lt;em&gt;]?[^&quot;]+((USA)\s(&lt;em&gt;)?\((English|imdb))</expression>
+ </RegExp>
+ <RegExp input="$$11" output="\1" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression fixchars="1" clear="yes">&gt;\s*?&quot;([^&lt;]+)&quot;[^&lt;]+[&lt;em&gt;]?[^&quot;]+((USA)\s(&lt;em&gt;)?\((new title))</expression>
+ </RegExp>
+ <RegExp input="$$11" output="\1" dest="10">
+ <expression>(.+)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ <RegExp input="$$4" output="\1" dest="2">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="4">
+ <expression fixchars="1">&gt;\s*?&quot;([^&lt;]+)&quot;[^&lt;]+[&lt;em&gt;]?[^&quot;]+$INFO[imdbakatitles]</expression>
+ </RegExp>
+ <RegExp input="$$4" output="\1" dest="2">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="4">
+ <expression fixchars="1">&gt;\s*?&quot;([^&lt;]+)&quot;[^&lt;]+[&lt;em&gt;]?[^&quot;]+$INFO[imdbakatitles]\s(&lt;em&gt;)?\((imdb display)</expression>
+ </RegExp>
+ <RegExp input="$$4" output="\1" dest="2">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="5">
+ <expression>&lt;a href=&quot;/country/[^&gt;]+&gt;($INFO[imdbakatitles])</expression>
+ </RegExp>
+ <RegExp input="$$5" output="$$9" dest="4">
+ <expression>($INFO[imdbakatitles])</expression>
+ </RegExp>
+ <RegExp input="$INFO[imdbakatitles]" output="$$9" dest="4">
+ <expression>Keep Original</expression>
+ </RegExp>
+ <RegExp input="$$4" output="\1" dest="2">
+ <expression>(.+)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseIMDBAKATitles>
+
</scraperfunctions>
View
2  addons/metadata.common.last.fm/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.last.fm"
name="Last.FM"
- version="1.4.1"
+ version="1.5.1"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
View
5 addons/metadata.common.last.fm/lastfm.xml
@@ -37,10 +37,13 @@
<RegExp input="$$1" output="\1" dest="11">
<expression fixchars="1">&lt;content&gt;&lt;!\[CDATA\[(.*?)\]\]</expression>
</RegExp>
- <RegExp input="$$11" output="$$12" dest="2">
+ <RegExp input="$$11" output="$$12" dest="6">
<RegExp input="$INFO[biogfbsource]" output="&lt;chain function=&quot;GetAMGFallbackBiographyByAMGID&quot;&gt;$$9&lt;/chain&gt;" dest="12">
<expression>allmusic.com</expression>
</RegExp>
+ <RegExp input="$INFO[biogfbsource]" output="&lt;chain function=&quot;GetTADBFMFallbackBiographyByMBID&quot;&gt;$$9&lt;/chain&gt;" dest="12">
+ <expression>TheAudioDb.com</expression>
+ </RegExp>
<expression>^$</expression>
</RegExp>
<RegExp input="$$11" output="&lt;biography&gt;\1&lt;/biography&gt;" dest="6">
View
2  addons/metadata.common.themoviedb.org/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.themoviedb.org"
name="The MovieDB common scraper functions"
- version="2.1.4"
+ version="2.6.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
View
BIN  addons/metadata.common.themoviedb.org/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
208 addons/metadata.common.themoviedb.org/tmdb.xml
@@ -2,7 +2,7 @@
<GetTMDBCertificationsByIdChain dest="4">
<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
- <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBCertifications&quot; cache=&quot;tmdb-cert-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/releases?api_key=57983e31fb435df4df77afb854740ea9&lt;/url&gt;" dest="5">
+ <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBCertifications&quot; cache=&quot;tmdb-cert-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/releases?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[tmdbcertcountry]&lt;/url&gt;" dest="5">
<expression />
</RegExp>
<expression noclean="1" />
@@ -10,30 +10,66 @@
</GetTMDBCertificationsByIdChain>
<ParseTMDBCertifications dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
- <RegExp input="$$1" output="&lt;mpaa&gt;Rated \1&lt;/mpaa&gt;" dest="2">
- <expression fixchars="1">&quot;US&quot;,&quot;certification&quot;:&quot;([^&quot;]*)</expression>
+ <RegExp input="$$1" output="&lt;mpaa&gt;$INFO[certprefix]\1&lt;/mpaa&gt;" dest="2">
+ <expression fixchars="1">&quot;$INFO[tmdbcertcountry]&quot;,&quot;certification&quot;:&quot;([^&quot;]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</ParseTMDBCertifications>
+ <GetTMDBTitleByIdChain dest="4">
+ <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
+ <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBTitle&quot; cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;" dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBTitleByIdChain>
+ <GetTMDBLangTitleByIdChain dest="4">
+ <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
+ <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBTitle&quot; cache=&quot;tmdb-$INFO[tmdbtitlelanguage]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[tmdbtitlelanguage]&lt;/url&gt;" dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBLangTitleByIdChain>
+ <ParseTMDBTitle dest="5">
+ <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+ <RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="2">
+ <expression fixchars="1">&quot;title&quot;:&quot;([^&quot;]*)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseTMDBTitle>
+
<GetTMDBPlotByIdChain clearbuffers="no" dest="4">
<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
<RegExp input="$$1" output="\1" dest="8">
<expression clear="yes" noclean="1" />
</RegExp>
- <RegExp input="$$8" output="&lt;url function=&quot;ParseTMDBPlot&quot; cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;" dest="5">
+ <RegExp input="$$8" output="&lt;url function=&quot;ParseTMDBPlot&quot; cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;" dest="5">
<expression />
</RegExp>
<expression noclean="1" />
</RegExp>
</GetTMDBPlotByIdChain>
+ <GetTMDBLangPlotByIdChain clearbuffers="no" dest="4">
+ <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
+ <RegExp input="$$1" output="\1" dest="8">
+ <expression clear="yes" noclean="1" />
+ </RegExp>
+ <RegExp input="$$8" output="&lt;url function=&quot;ParseTMDBPlot&quot; cache=&quot;tmdb-$INFO[tmdbplotlanguage]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[tmdbplotlanguage]&lt;/url&gt;" dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBLangPlotByIdChain>
<ParseTMDBPlot dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="\1" dest="9">
<expression clear="yes" fixchars="1">&quot;overview&quot;:&quot;(.*?)&quot;,&quot;</expression>
</RegExp>
- <RegExp input="$$9" output="&lt;url function=&quot;ParseFallbackTMDBPlot&quot; cache=&quot;tmdb-en-$$8.json&quot;&gt;http://api.themoviedb.org/3/movie/$$8?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en&lt;/url&gt;" dest="2">
+ <RegExp input="$$9" output="&lt;url function=&quot;ParseFallbackTMDBPlot&quot; cache=&quot;tmdb-en-$$8.json&quot;&gt;http://api.themoviedb.org/3/movie/$$8?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=en&lt;/url&gt;" dest="2">
<expression>^$</expression>
</RegExp>
<RegExp input="$$9" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="2">
@@ -53,16 +89,24 @@
<GetTMDBSetByIdChain dest="4">
<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
- <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBSet&quot; cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;" dest="5">
+ <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBSet&quot; cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;" dest="5">
<expression />
</RegExp>
<expression noclean="1" />
</RegExp>
</GetTMDBSetByIdChain>
+ <GetTMDBLangSetByIdChain dest="4">
+ <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
+ <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBSet&quot; cache=&quot;tmdb-$INFO[tmdbsetlanguage]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[tmdbsetlanguage]&lt;/url&gt;" dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBLangSetByIdChain>
<ParseTMDBSet dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="&lt;set&gt;\1&lt;/set&gt;" dest="2">
- <expression noclean="1">&quot;belongs_to_collection&quot;:{&quot;id&quot;:[0-9]+,&quot;name&quot;:&quot;([^&quot;]*)</expression>
+ <expression noclean="1">&quot;belongs_to_collection&quot;:\{&quot;id&quot;:[0-9]+,&quot;name&quot;:&quot;([^&quot;]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -85,7 +129,7 @@
<expression repeat="yes" fixchars="1">&quot;name&quot;:&quot;([^&quot;]*)&quot;,&quot;character&quot;:&quot;([^&quot;]*)</expression>
</RegExp>
<RegExp input="$$7" output="&lt;actor&gt;&lt;name&gt;\1&lt;/name&gt;&lt;role&gt;\2&lt;/role&gt;&lt;thumb&gt;http://cf2.imgobject.com/t/p/original\3&lt;/thumb&gt;&lt;/actor&gt;" dest="2+">
- <expression repeat="yes" fixchars="1">&quot;name&quot;:&quot;([^&quot;]*)&quot;,&quot;character&quot;:&quot;([^&quot;]*)&quot;,&quot;order&quot;:[0-9]*,&quot;profile_path&quot;:&quot;([^&quot;]*)&quot;</expression>
+ <expression repeat="yes" fixchars="1">&quot;name&quot;:&quot;([^&quot;]*)&quot;,&quot;character&quot;:&quot;([^&quot;]*)&quot;,&quot;order&quot;:[0-9]*,&quot;cast_id&quot;:[0-9]*,&quot;profile_path&quot;:&quot;([^&quot;]*)&quot;</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -133,12 +177,20 @@
<GetTMDBGenresByIdChain dest="4">
<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
- <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBGenres&quot; cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;" dest="5">
+ <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBGenres&quot; cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;" dest="5">
<expression />
</RegExp>
<expression noclean="1" />
</RegExp>
</GetTMDBGenresByIdChain>
+ <GetTMDBLangGenresByIdChain dest="4">
+ <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
+ <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBGenres&quot; cache=&quot;tmdb-$INFO[tmdbgenreslanguage]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[tmdbgenreslanguage]&lt;/url&gt;" dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBLangGenresByIdChain>
<ParseTMDBGenres dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="\1" dest="7">
@@ -153,7 +205,7 @@
<GetTMDBRatingByIdChain dest="4">
<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
- <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBRating&quot; cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;" dest="5">
+ <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBRating&quot; cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;" dest="5">
<expression />
</RegExp>
<expression noclean="1" />
@@ -173,23 +225,71 @@
<GetTMDBTrailerByIdChain dest="4">
<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
- <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBTrailer&quot; cache=&quot;tmdb-trailer-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/trailers?api_key=57983e31fb435df4df77afb854740ea9&lt;/url&gt;" dest="5">
+ <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBTrailer&quot; cache=&quot;tmdb-trailer-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/trailers?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;" dest="5">
<expression />
</RegExp>
<expression noclean="1" />
</RegExp>
</GetTMDBTrailerByIdChain>
+ <GetTMDBLangTrailerByIdChain dest="4">
+ <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
+ <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBTrailer&quot; cache=&quot;tmdb-trailer-$INFO[tmdbtrailerlanguage]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/trailers?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[tmdbtrailerlanguage]&lt;/url&gt;" dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBLangTrailerByIdChain>
<ParseTMDBTrailer dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+ <RegExp input="$$1" output="\1" dest="8">
+ <expression noclean="1">&quot;id&quot;:([0-9]*),</expression>
+ </RegExp>
<RegExp input="$$1" output="\1" dest="7">
- <expression clear="yes" noclean="1">&quot;youtube&quot;:\[{([^\]]*)</expression>
+ <expression clear="yes" noclean="1">&quot;youtube&quot;:\[\{([^\}]*)</expression>
</RegExp>
- <RegExp input="$$7" output="&lt;trailer&gt;plugin://plugin.video.youtube/?action=play_video&amp;videoid=\1&lt;/trailer&gt;" dest="2">
+ <RegExp input="$$7" output="&lt;trailer&gt;plugin://plugin.video.youtube/?action=play_video&amp;amp;videoid=\1&lt;/trailer&gt;" dest="9">
<expression noclean="1">&quot;source&quot;:&quot;([^&quot;]*)</expression>
</RegExp>
+ <RegExp input="$$9" output="&lt;url function=&quot;ParseTMDBEnTrailer&quot; cache=&quot;tmdb-trailer-en-$$8.json&quot;&gt;http://api.themoviedb.org/3/movie/$$8/trailers?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=en&lt;/url&gt;" dest="2">
+ <expression>^$</expression>
+ </RegExp>
+ <RegExp input="$$9" output="$$9" dest="2">
+ <expression>(.+)</expression>
+ </RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
</ParseTMDBTrailer>
+ <ParseTMDBEnTrailer dest="5">
+ <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+ <RegExp input="$$1" output="\1" dest="8">
+ <expression noclean="1">&quot;id&quot;:([0-9]*),</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression clear="yes" noclean="1">&quot;youtube&quot;:\[\{([^\}]*)</expression>
+ </RegExp>
+ <RegExp input="$$7" output="&lt;trailer&gt;plugin://plugin.video.youtube/?action=play_video&amp;amp;videoid=\1&lt;/trailer&gt;" dest="9">
+ <expression noclean="1">&quot;source&quot;:&quot;([^&quot;]*)</expression>
+ </RegExp>
+ <RegExp input="$$9" output="&lt;url function=&quot;ParseTMDBAllTrailer&quot; cache=&quot;tmdb-trailer-$$8.json&quot;&gt;http://api.themoviedb.org/3/movie/$$8/trailers?api_key=57983e31fb435df4df77afb854740ea9&lt;/url&gt;" dest="5">
+ <expression>^$</expression>
+ </RegExp>
+ <RegExp input="$$9" output="$$9" dest="2">
+ <expression>(.+)</expression>
+ </RegExp>
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ </ParseTMDBEnTrailer>
+ <ParseTMDBAllTrailer dest="5">
+ <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression clear="yes" noclean="1">&quot;youtube&quot;:\[\{([^\}]*)</expression>
+ </RegExp>
+ <RegExp input="$$7" output="&lt;trailer&gt;plugin://plugin.video.youtube/?action=play_video&amp;amp;videoid=\1&lt;/trailer&gt;" dest="2">
+ <expression noclean="1">&quot;source&quot;:&quot;([^&quot;]*)</expression>
+ </RegExp>
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ </ParseTMDBAllTrailer>
<GetTMDBFanartByIdChain dest="4">
<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
@@ -210,7 +310,7 @@
<ParseTMDBFanart dest="5">
<RegExp input="$$2" output="&lt;details&gt;&lt;fanart&gt;\1&lt;/fanart&gt;&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="\1" dest="7">
- <expression clear="yes" noclean="1">&quot;backdrops&quot;:\[{([^\]]*)</expression>
+ <expression clear="yes" noclean="1">&quot;backdrops&quot;:\[\{([^\]]*)</expression>
</RegExp>
<RegExp input="$$7" output="&lt;thumb preview=&quot;http://cf2.imgobject.com/t/p/w780\1&quot;&gt;http://cf2.imgobject.com/t/p/original\1&lt;/thumb&gt;" dest="2">
<expression repeat="yes" noclean="1">&quot;file_path&quot;:&quot;([^&quot;]*)</expression>
@@ -221,15 +321,23 @@
<GetTMDBThumbsByIdChain dest="4">
<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
- <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBThumbs&quot; cache=&quot;tmdb-images-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;" dest="5">
+ <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBThumbs&quot; cache=&quot;tmdb-images-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;" dest="5">
<expression />
</RegExp>
<expression noclean="1" />
</RegExp>
</GetTMDBThumbsByIdChain>
+ <GetTMDBLangThumbsByIdChain dest="4">
+ <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
+ <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBLangThumbs&quot; cache=&quot;tmdb-images-$INFO[tmdbthumblanguage]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[tmdbthumblanguage]&lt;/url&gt;" dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetTMDBLangThumbsByIdChain>
<GetTMDBThumbsById dest="4">
<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
- <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBThumbs&quot; cache=&quot;tmdb-images-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;" dest="5">
+ <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBThumbs&quot; cache=&quot;tmdb-images-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;" dest="5">
<expression />
</RegExp>
<expression noclean="1" />
@@ -237,24 +345,82 @@
</GetTMDBThumbsById>
<ParseTMDBThumbs dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
- <RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBAllThumbs&quot; cache=&quot;tmdb-images-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&lt;/url&gt;" dest="2">
+ <RegExp input="$$1" output="\1" dest="8">
<expression noclean="1">&quot;id&quot;:([0-9]*),</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="7">
- <expression clear="yes" noclean="1">&quot;posters&quot;:\[{([^\]]*)</expression>
+ <expression clear="yes" noclean="1">&quot;posters&quot;:\[\{([^\]]*)</expression>
</RegExp>
- <RegExp input="$$7" output="&lt;thumb preview=&quot;http://cf2.imgobject.com/t/p/w500\1&quot;&gt;http://cf2.imgobject.com/t/p/original\1&lt;/thumb&gt;" dest="2+">
+ <RegExp input="$$7" output="&lt;thumb aspect=&quot;poster&quot;preview=&quot;http://cf2.imgobject.com/t/p/w500\1&quot;&gt;http://cf2.imgobject.com/t/p/original\1&lt;/thumb&gt;" dest="9">
<expression repeat="yes" noclean="1">&quot;file_path&quot;:&quot;([^&quot;]*)</expression>
</RegExp>
+ <RegExp input="$$9" output="$$12" dest="2+">
+ <RegExp input="$INFO[language]" output="&lt;url function=&quot;ParseTMDBAllThumbs&quot; cache=&quot;tmdb-images-$$8.json&quot;&gt;http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9&lt;/url&gt;" dest="12">
+ <expression>en</expression>
+ </RegExp>
+ <expression>^$</expression>
+ </RegExp>
+ <RegExp input="$$9" output="$$9" dest="2+">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$INFO[language]" output="&lt;url function=&quot;ParseTMDBEnThumbs&quot; cache=&quot;tmdb-images-en-$$8.json&quot;&gt;http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=en&lt;/url&gt;" dest="2+">
+ <expression>^((?!en).)*$</expression>
+ </RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
</ParseTMDBThumbs>
+ <ParseTMDBLangThumbs dest="5">
+ <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+ <RegExp input="$$1" output="\1" dest="8">
+ <expression noclean="1">&quot;id&quot;:([0-9]*),</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression clear="yes" noclean="1">&quot;posters&quot;:\[\{([^\]]*)</expression>
+ </RegExp>
+ <RegExp input="$$7" output="&lt;thumb aspect=&quot;poster&quot;preview=&quot;http://cf2.imgobject.com/t/p/w500\1&quot;&gt;http://cf2.imgobject.com/t/p/original\1&lt;/thumb&gt;" dest="9">
+ <expression repeat="yes" noclean="1">&quot;file_path&quot;:&quot;([^&quot;]*)</expression>
+ </RegExp>
+ <RegExp input="$$9" output="$$12" dest="2+">
+ <RegExp input="$INFO[tmdbthumblanguage]" output="&lt;url function=&quot;ParseTMDBAllThumbs&quot; cache=&quot;tmdb-images-$$8.json&quot;&gt;http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9&lt;/url&gt;" dest="12">
+ <expression>en</expression>
+ </RegExp>
+ <expression>^$</expression>
+ </RegExp>
+ <RegExp input="$$9" output="$$9" dest="2+">
+ <expression>(.+)</expression>
+ </RegExp>
+ <RegExp input="$INFO[tmdbthumblanguage]" output="&lt;url function=&quot;ParseTMDBEnThumbs&quot; cache=&quot;tmdb-images-en-$$8.json&quot;&gt;http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=en&lt;/url&gt;" dest="2+">
+ <expression>^((?!en).)*$</expression>
+ </RegExp>
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ </ParseTMDBLangThumbs>
+ <ParseTMDBEnThumbs dest="5">
+ <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+ <RegExp input="$$1" output="\1" dest="8">
+ <expression noclean="1">&quot;id&quot;:([0-9]*),</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression clear="yes" noclean="1">&quot;posters&quot;:\[\{([^\]]*)</expression>
+ </RegExp>
+ <RegExp input="$$7" output="&lt;thumb aspect=&quot;poster&quot;preview=&quot;http://cf2.imgobject.com/t/p/w500\1&quot;&gt;http://cf2.imgobject.com/t/p/original\1&lt;/thumb&gt;" dest="9">
+ <expression repeat="yes" noclean="1">&quot;file_path&quot;:&quot;([^&quot;]*)</expression>
+ </RegExp>
+ <RegExp input="$$9" output="&lt;url function=&quot;ParseTMDBAllThumbs&quot; cache=&quot;tmdb-images-$$8.json&quot;&gt;http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9&lt;/url&gt;" dest="2">
+ <expression>^$</expression>
+ </RegExp>
+ <RegExp input="$$9" output="$$9" dest="2">
+ <expression>(.+)</expression>
+ </RegExp>
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ </ParseTMDBEnThumbs>
<ParseTMDBAllThumbs dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="\1" dest="7">
- <expression clear="yes" noclean="1">&quot;posters&quot;:\[{([^\]]*)</expression>
+ <expression clear="yes" noclean="1">&quot;posters&quot;:\[\{([^\]]*)</expression>
</RegExp>
- <RegExp input="$$7" output="&lt;thumb preview=&quot;http://cf2.imgobject.com/t/p/w500\1&quot;&gt;http://cf2.imgobject.com/t/p/original\1&lt;/thumb&gt;" dest="2">
+ <RegExp input="$$7" output="&lt;thumb aspect=&quot;poster&quot;preview=&quot;http://cf2.imgobject.com/t/p/w500\1&quot;&gt;http://cf2.imgobject.com/t/p/original\1&lt;/thumb&gt;" dest="2">
<expression repeat="yes" noclean="1">&quot;file_path&quot;:&quot;([^&quot;]*)</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
View
4 addons/metadata.musicvideos.last.fm/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.musicvideos.last.fm"
name="Last.fm for Music Videos"
- version="1.0.0"
+ version="1.0.1"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -20,6 +20,7 @@
<summary lang="pl">Scraper teledysków Last.fm</summary>
<summary lang="pt">Scraper de música Last.fm</summary>
<summary lang="se">Skrapa för Last.fm musik</summary>
+ <summary lang="zh">Last.fm音乐电视刮削器</summary>
<description lang="bg">Сваля информация за музикални клипове</description>
<description lang="en">Download Music Video information</description>
<description lang="fi">Lataa musiikkivideoiden tiedot</description>
@@ -28,5 +29,6 @@
<description lang="pl">Pobieraj informacje o teledyskach z last.fm</description>
<description lang="pt">Descarregar informação de filmes de last.fm</description>
<description lang="se">Ladda ner musikvideoinformation från last.fm</description>
+ <description lang="zh">从Last.fm下载音乐电视信息</description>
</extension>
</addon>
View
5 addons/metadata.musicvideos.last.fm/resources/language/Chinese (Simple)/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+ <string id="30000">从fanart.tv获取专辑图片</string>
+ <string id="30001">从Last.fm获取专辑图片</string>
+</strings>
View
6 addons/metadata.themoviedb.org/addon.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.themoviedb.org"
name="The MovieDB"
- version="3.0.9"
+ version="3.5.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.themoviedb.org" version="2.1.2"/>
+ <import addon="metadata.common.themoviedb.org" version="2.6.0"/>
<import addon="metadata.common.hdtrailers.net" version="1.0.7"/>
<import addon="metadata.common.imdb.com" version="2.1.9"/>
- <import addon="plugin.video.youtube" version="2.1.4" optional="true"/>
+ <import addon="plugin.video.youtube" version="2.9.1" optional="true"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="en"
View
20 addons/metadata.themoviedb.org/changelog.txt
@@ -1,3 +1,23 @@
+[B]3.5.0[/B]
+- added: aspect tag and reorder languages according to the alphabet
+
+[B]3.4.1[/B]
+- updated chinese translation
+
+[B]3.4.0[/B]
+- added: prefer trailer language according to the selected language
+
+[B]3.3.0[/B]
+- updated: improve CreateSearchUrl according to TMDb API changes
+
+[B]3.2.0[/B]
+- fixed: keep Originaltitle
+- fixed: &'s needs double escaping
+- added: option to scrape certification from selected country
+
+[B]3.1.0[/B]
+- updated: factored out title scraping to common library
+
[B]3.0.9[/B]
- fixed: missing language parameter name in NfoUrl
View
7 addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
<string id="30000">启用同人画</string>
- <string id="30001">首选HD-Trailers.net预告片</string>
+ <string id="30001">备选HD-Trailers.net预告片</string>
<string id="30002">首选语言</string>
- <string id="30003">获取评价信息于</string>
+ <string id="30003">获取评分于</string>
<string id="30004">启用预告片(YouTube)</string>
- <string id="30005">保留原片名</string>
+ <string id="30005">使用未翻译片名</string>
+ <string id="30006">首选电影分级国别</string>
</strings>
View
3  addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml
@@ -3,7 +3,4 @@
<string id="30000">Fanart inschakelen</string>
<string id="30001">Trailers van HD-Trailers.net inschakelen</string>
<string id="30002">Voorkeurstaal</string>
- <string id="30003">Verkrijg waardering van IMDb</string>
- <string id="30004">Trailer inschakelen (YouTube)</string>
- <string id="30005">Behoud originele titel</string>
</strings>
View
5 addons/metadata.themoviedb.org/resources/language/English/strings.xml
@@ -3,7 +3,8 @@
<string id="30000">Enable Fanart</string>
<string id="30004">Enable Trailer (YouTube)</string>
<string id="30001">Prefer Trailer from HD-Trailers.net</string>
- <string id="30002">Preferred language</string>
- <string id="30003">Get rating from</string>
+ <string id="30002">Preferred Language</string>
+ <string id="30003">Get Rating from</string>
<string id="30005">Keep Original Title</string>
+ <string id="30006">Preferred Certification Country</string>
</strings>
View
2  addons/metadata.themoviedb.org/resources/language/German/strings.xml
@@ -4,6 +4,4 @@
<string id="30001">Aktiviere Trailer von HD-Trailers.net</string>
<string id="30002">Bevorzugte Sprache</string>
<string id="30003">Bewertung von IMDb nutzen</string>
- <string id="30004">Aktiviere Trailer (YouTube)</string>
- <string id="30005">Behalte original Filmtitel bei</string>
</strings>
View
1  addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
@@ -6,4 +6,5 @@
<string id="30002">Preferált nyelv</string>
<string id="30003">Értékelés letöltése innen</string>
<string id="30005">Eredeti filmcím megtartása</string>
+ <string id="30006">Preferált korhatár-besorolás innen</string>
</strings>
View
7 addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml
@@ -2,13 +2,10 @@
<!--Language file translated with Team XBMC Translator-->
<!--Translator: blittan-->
<!--Email: blittan@xbmc.org-->
-<!--Date of translation: 12/26/2011-->
+<!--Date of translation: 09/11/2010-->
<!--$Revision$-->
<strings>
<string id="30000">Aktivera fanart</string>
<string id="30001">Aktivera trailers från HD-Trailers.net</string>
<string id="30002">Föredraget språk</string>
- <string id="30003">Hämta betyg från IMDb</string>
- <string id="30004">Aktivera trailers (YouTube)</string>
- <string id="30005">Behåll originaltitel</string>
-</strings>
+</strings>
View
4 addons/metadata.themoviedb.org/resources/settings.xml
@@ -4,6 +4,8 @@
<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="labelenum" values="da|fi|nl|de|it|es|fr|pl|hu|el|tr|ru|he|ja|pt|zh|cs|sl|hr|ko|en|sv|no" id="language" default="en"/>
+ <setting label="30002" 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|th|tr|zh" id="language" default="en"/>
+ <setting label="30006" 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|th|tr|us|zh" id="tmdbcertcountry" default="us"/>
<setting label="30003" type="labelenum" values="TMDb|IMDb" id="RatingS" default="TMDb"/>
+ <setting label="certprefix" type="text" id="certprefix" default="Rated " visible="false"/>
</settings>
View
24 addons/metadata.themoviedb.org/tmdb.xml
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<scraper framework="1.1" date="2012-01-16">
<CreateSearchUrl dest="3">
- <RegExp input="$$1" output="&lt;url&gt;http://api.themoviedb.org/3/search/movie?api_key=57983e31fb435df4df77afb854740ea9&amp;query=\1$$4&amp;language=$INFO[language]&lt;/url&gt;" dest="3">
- <RegExp input="$$2" output="+\1" dest="4">
+ <RegExp input="$$1" output="&lt;url&gt;http://api.themoviedb.org/3/search/movie?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;query=\1&amp;amp;year=$$4&amp;amp;language=$INFO[language]&lt;/url&gt;" dest="3">
+ <RegExp input="$$2" output="\1" dest="4">
<expression clear="yes">(.+)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</CreateSearchUrl>
<NfoUrl dest="3">
- <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;\2&lt;/id&gt;&lt;/details&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;\2&lt;/id&gt;&lt;/details&gt;" dest="3">
<expression clear="yes" noclean="1">(themoviedb.org/movie/)([0-9]*)</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
<expression>imdb....?/title/tt([0-9]*)</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
<expression>imdb....?/Title\?([0-9]*)</expression>
</RegExp>
</NfoUrl>
<GetSearchResults dest="8">
<RegExp input="$$3" output="&lt;results&gt;\1&lt;/results&gt;" dest="8">
- <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\4&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\4&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3">
<expression repeat="yes">&quot;id&quot;:([0-9]*),&quot;original_title&quot;:&quot;([^&quot;]*)&quot;,&quot;release_date&quot;:&quot;([0-9]+)-.*?&quot;title&quot;:&quot;([^&quot;]*)</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
+ <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
<expression repeat="yes">&quot;id&quot;:([0-9]*),&quot;original_title&quot;:&quot;([^&quot;]*)&quot;,&quot;release_date&quot;:&quot;([0-9]+)-</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
+ <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
<expression repeat="yes">&quot;id&quot;:([0-9]*),&quot;original_title&quot;:&quot;([^&quot;]*)&quot;,&quot;release_date&quot;:null</expression>
</RegExp>
<expression noclean="1" />
@@ -47,8 +47,8 @@
<RegExp conditional="keeporiginaltitle" input="$$9" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
<expression/>
</RegExp>
- <RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
- <expression fixchars="1">&quot;title&quot;:&quot;([^&quot;]*)</expression>
+ <RegExp conditional="!keeporiginaltitle" input="$$2" output="&lt;chain function=&quot;GetTMDBTitleByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+ <expression />
</RegExp>
<RegExp input="$$9" output="&lt;originaltitle&gt;\1&lt;/originaltitle&gt;" dest="5+">
<expression/>
@@ -59,7 +59,7 @@
<RegExp input="$$1" output="\1" dest="10">
<expression clear="yes" noclean="1">&quot;runtime&quot;:([0-9]+)</expression>
</RegExp>
- <RegExp input="$$10" output="&lt;url function=&quot;ParseFallbackTMDBRuntime&quot; cache=&quot;tmdb-en-$$2.json&quot;&gt;http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en&lt;/url&gt;" dest="5+">
+ <RegExp input="$$10" output="&lt;url function=&quot;ParseFallbackTMDBRuntime&quot; cache=&quot;tmdb-en-$$2.json&quot;&gt;http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=en&lt;/url&gt;" dest="5+">
<expression>^$</expression>
</RegExp>
<RegExp input="$$10" output="&lt;runtime&gt;\1&lt;/runtime&gt;" dest="5+">
@@ -68,7 +68,7 @@
<RegExp input="$$1" output="\1" dest="10">
<expression clear="yes" fixchars="1">&quot;tagline&quot;:&quot;([^&quot;]*)</expression>
</RegExp>
- <RegExp input="$$10" output="&lt;url function=&quot;ParseFallbackTMDBTagline&quot; cache=&quot;tmdb-en-$$2.json&quot;&gt;http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en&lt;/url&gt;" dest="5+">
+ <RegExp input="$$10" output="&lt;url function=&quot;ParseFallbackTMDBTagline&quot; cache=&quot;tmdb-en-$$2.json&quot;&gt;http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=en&lt;/url&gt;" dest="5+">
<expression>^$</expression>
</RegExp>
<RegExp input="$$10" output="&lt;tagline&gt;\1&lt;/tagline&gt;" dest="5+">
View
2  addons/metadata.tvdb.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.tvdb.com"
name="The TVDB"
- version="1.2.4"
+ version="1.4.2"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
View
15 addons/metadata.tvdb.com/changelog.txt
@@ -1,3 +1,18 @@
+[B]1.4.2[/B]
+- Added: cache to GetTVDBId
+
+[B]1.4.1[/B]
+- Fixed: missing xml tag in GetTVDBId
+
+[B]1.4.0[/B]
+- Added: scraping of EpisodeID
+
+[B]1.3.1[/B]
+- Added: added back non-intentional removal of the imdb id lookup
+
+[B]1.3.0[/B]
+- Added: return the aspect attribute for thumb fields as banner or poster
+
[B]1.2.4[/B]
- Added: support for imdb url nfo's
View
35 addons/metadata.tvdb.com/tvdb.xml
<
@@ -5,16 +5,16 @@
<RegExp input="$$1" output="&lt;url cache=&quot;\1.xml&quot;&gt;http://www.thetvdb.com/api/1D62F2F90030C444/series/\1/all/$INFO[language].zip&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;" dest="3">
<expression>http://(?:www\.)?thetvdb.com/(?:index\.php)?\?tab=series&amp;id=([0-9]+)</expression>
</RegExp>