Skip to content

Commit

Permalink
Bump addons to current git snapshots
Browse files Browse the repository at this point in the history
  • Loading branch information
theuni committed Feb 15, 2011
1 parent b56bfa7 commit 99b071f
Show file tree
Hide file tree
Showing 20 changed files with 275 additions and 173 deletions.
4 changes: 2 additions & 2 deletions addons/metadata.artists.allmusic.com/addon.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.artists.allmusic.com"
name="AllMusic"
version="2.0.2"
version="2.0.3"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
<import addon="metadata.common.last.fm" version="1.0"/>
<import addon="metadata.common.last.fm" version="1.1.0"/>
<import addon="metadata.common.allmusic.com" version="1.8.1"/>
<import addon="metadata.common.htbackdrops.com" version="1.0.7"/>
</requires>
Expand Down
2 changes: 1 addition & 1 deletion addons/metadata.artists.allmusic.com/allmusic.xml
Expand Up @@ -44,7 +44,7 @@
<RegExp input="$$1" output="&lt;url cache=&quot;am-$$2-artist.html&quot; function=&quot;ParseAMGArtist&quot;&gt;http://www.allmusic.com/artist/\1&lt;/url&gt;" dest="5+">
<expression>http://www.allmusic.com/artist/([^&amp;&quot;/]*)</expression>
</RegExp>
<RegExp input="$$2" conditional="lastfmartistthumbs" output="&lt;chain function=&quot;GetLastFMArtistThumbs&quot;&gt;\1&lt;/chain&gt;" dest="5+">
<RegExp input="$$2" conditional="lastfmartistthumbs" output="&lt;chain function=&quot;GetLastFMArtistThumbsByName&quot;&gt;\1&lt;/chain&gt;" dest="5+">
<expression/>
</RegExp>
<RegExp input="$$2" conditional="htbfanart" output="&lt;chain function=&quot;GetHTBFanart&quot;&gt;\1&lt;/chain&gt;" dest="5+">
Expand Down
10 changes: 4 additions & 6 deletions 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.4"
version="1.0.6"
provider-name="Bence Nádas (olympia)">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
Expand All @@ -14,22 +14,20 @@
<summary lang="es">Scraper de Trailers de HD-Trailers.net</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">HTBackdrops-scraperfuncties</summary>
<summary lang="pl">Scraper biblioteki HD-Trailers.net</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 trailers från HD-Trailers.net</summary>
<summary lang="zh">HD-Trailers.net刮削器代码库</summary>
<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="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">Achtergronden ophalen van www.htbackdrops.com</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 trailers från www.hd-trailers.net</description>
<description lang="zh">从www.hd-trailers.net下载电影预告片</description>
<minversion>20000</minversion>
<platform>all</platform>
Expand Down
30 changes: 15 additions & 15 deletions addons/metadata.common.hdtrailers.net/hdtrailers.xml
@@ -1,43 +1,43 @@
<scraperfunctions>
<GetHDTrailersnet480p dest="3">
<RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse480pTrailer&quot;&gt;http://www.hd-trailers.net/blog/?s=&quot;\1%20%28Theatrical%20Trailer%29%22&lt;/url&gt;&lt;/details&gt;" dest="3">
<RegExp input="$$1" output="\1" dest="6">
<expression noclean="1" fixchars="1" trim="1" encode="1">(.*)</expression>
<RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse480pTrailer&quot; cache=&quot;hd-trailers-\1.xml&quot;&gt;http://xbmc.hd-trailers.net/movie/\1&lt;/url&gt;&lt;/details&gt;" dest="3">
<RegExp input="$$1" output="\1-" dest="6">
<expression repeat="yes" fixchars="1" trim="1">([\w]+)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</GetHDTrailersnet480p>
<GetHDTrailersnet720p dest="3">
<RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse720pTrailer&quot;&gt;http://www.hd-trailers.net/blog/?s=&quot;\1%20%28Theatrical%20Trailer%29%22&lt;/url&gt;&lt;/details&gt;" dest="3">
<RegExp input="$$1" output="\1" dest="6">
<expression noclean="1" fixchars="1" trim="1" encode="1">(.*)</expression>
<RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse720pTrailer&quot; cache=&quot;hd-trailers-\1.xml&quot;&gt;http://xbmc.hd-trailers.net/movie/\1&lt;/url&gt;&lt;/details&gt;" dest="3">
<RegExp input="$$1" output="\1-" dest="6">
<expression repeat="yes" fixchars="1" trim="1">([\w]+)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</GetHDTrailersnet720p>
<GetHDTrailersnet1080p dest="3">
<RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse1080pTrailer&quot;&gt;http://www.hd-trailers.net/blog/?s=&quot;\1%20%28Theatrical%20Trailer%29%22&lt;/url&gt;&lt;/details&gt;" dest="3">
<RegExp input="$$1" output="\1" dest="6">
<expression noclean="1" fixchars="1" trim="1" encode="1">(.*)</expression>
<RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse1080pTrailer&quot; cache=&quot;hd-trailers-\1.xml&quot;&gt;http://xbmc.hd-trailers.net/movie/\1&lt;/url&gt;&lt;/details&gt;" dest="3">
<RegExp input="$$1" output="\1-" dest="6">
<expression repeat="yes" fixchars="1" trim="1">([\w]+)</expression>
</RegExp>
<expression noclean="1" />
</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=\1&lt;/trailer&gt;&lt;/details&gt;" dest="5">
<expression noclean="1">sid=(\d*)"&gt;480p&lt;/a&gt;</expression>
<expression noclean="1">&quot;&gt;Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
</RegExp>
</Parse480pTrailer>
<Parse720pTrailer dest="5">
<RegExp input="$$6" output="&lt;details&gt;&lt;trailer&gt;\1&lt;/trailer&gt;&lt;/details&gt;" dest="5">
<!--Fallback to fetch 480p trailer link if 720p is not available-->
<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\1" dest="6">
<expression noclean="1">sid=(\d*)"&gt;480p&lt;/a&gt;</expression>
<expression noclean="1">&quot;&gt;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=\1" dest="6">
<expression noclean="1">sid=(\d*)"&gt;720p&lt;/a&gt;</expression>
<expression noclean="1">&quot;&gt;Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res720p</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
Expand All @@ -46,15 +46,15 @@
<RegExp input="$$6" output="&lt;details&gt;&lt;trailer&gt;\1&lt;/trailer&gt;&lt;/details&gt;" dest="5">
<!--Fallback to fetch 480p trailer link if 720p and 1080p are not available-->
<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\1" dest="6">
<expression noclean="1">sid=(\d*)"&gt;480p&lt;/a&gt;</expression>
<expression noclean="1">&quot;&gt;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=\1" dest="6">
<expression noclean="1">sid=(\d*)"&gt;720p&lt;/a&gt;</expression>
<expression noclean="1">&quot;&gt;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=\1" dest="6">
<expression noclean="1">sid=(\d*)"&gt;1080p&lt;/a&gt;</expression>
<expression noclean="1">&quot;&gt;Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res1080p</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
Expand Down
2 changes: 1 addition & 1 deletion 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.0.4"
version="1.1.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
Expand Down
93 changes: 49 additions & 44 deletions addons/metadata.common.last.fm/lastfm.xml
@@ -1,44 +1,49 @@
<scraperfunctions>
<GetLastFMDiscography dest="5">
<RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseLastFMDiscography&quot;&gt;http://ws.audioscrobbler.com/2.0/?method=artist.gettopalbums&amp;amp;artist=\1&amp;amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lt;/url&gt;&lt;/details&gt;" dest="5">
<expression noclean="1"/>
</RegExp>
</GetLastFMDiscography>
<ParseLastFMDiscography dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="&lt;album&gt;&lt;title&gt;\1&lt;/title&gt;&lt;/album&gt;" dest="2+">
<expression repeat="yes">&lt;album[^&gt;]*&gt;[^&lt;]*&lt;name&gt;([^&lt;]*?)&lt;/name&gt;</expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
</ParseLastFMDiscography>
<GetLastFMArtistThumbs dest="5">
<RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseLastFMArtistThumbs&quot;&gt;http://ws.audioscrobbler.com/2.0/?method=artist.getimages&amp;amp;artist=\1&amp;amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lt;/url&gt;&lt;/details&gt;" dest="5">
<expression noclean="1"/>
</RegExp>
</GetLastFMArtistThumbs>
<ParseLastFMArtistThumbs dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="&lt;thumb&gt;\1&lt;/thumb&gt;" dest="2">
<expression noclean="1" repeat="yes">&lt;size name=&quot;original&quot;[^&gt;]*&gt;([^&lt;]*)&lt;/size&gt;</expression>
</RegExp>
<expression noclean="1"></expression>
</RegExp>
</ParseLastFMArtistThumbs>
<GetLastFMAlbumThumbs dest="5">
<RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseLastFMAlbumThumbs&quot;&gt;http://ws.audioscrobbler.com/2.0/?method=album.getinfo&amp;artist=\2&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lt;/url&gt;&lt;/details&gt;" dest="5">
<expression>(.+)::(.+)</expression>
</RegExp>
</GetLastFMAlbumThumbs>
<ParseLastFMAlbumThumbs dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="&lt;thumb&gt;\1&lt;/thumb&gt;" dest="2">
<expression noclean="1">&lt;image size=&quot;extralarge&quot;&gt;([^&lt;]*)&lt;/image&gt;</expression>
</RegExp>
<RegExp input="$$1" output="&lt;thumb&gt;\1&lt;/thumb&gt;" dest="2+">
<expression noclean="1">&lt;image size=&quot;large&quot;&gt;([^&lt;]*)&lt;/image&gt;</expression>
</RegExp>
<expression noclean="1"></expression>
</RegExp>
</ParseLastFMAlbumThumbs>
</scraperfunctions>
<scraperfunctions>
<GetLastFMDiscography dest="5">
<RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseLastFMDiscography&quot;&gt;http://ws.audioscrobbler.com/2.0/?method=artist.gettopalbums&amp;amp;artist=\1&amp;amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lt;/url&gt;&lt;/details&gt;" dest="5">
<expression noclean="1"/>
</RegExp>
</GetLastFMDiscography>
<ParseLastFMDiscography dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="&lt;album&gt;&lt;title&gt;\1&lt;/title&gt;&lt;/album&gt;" dest="2+">
<expression repeat="yes">&lt;album[^&gt;]*&gt;[^&lt;]*&lt;name&gt;([^&lt;]*?)&lt;/name&gt;</expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
</ParseLastFMDiscography>
<GetLastFMArtistThumbsByID dest="5">
<RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseLastFMArtistThumbs&quot;&gt;http://ws.audioscrobbler.com/2.0/?method=artist.getimages&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lt;/url&gt;&lt;/details&gt;" dest="5">
<expression noclean="1" />
</RegExp>
</GetLastFMArtistThumbsByID>
<GetLastFMArtistThumbsByName dest="5">
<RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseLastFMArtistThumbs&quot;&gt;http://ws.audioscrobbler.com/2.0/?method=artist.getimages&amp;artist=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lt;/url&gt;&lt;/details&gt;" dest="5">
<expression noclean="1" />
</RegExp>
</GetLastFMArtistThumbsByName>
<ParseLastFMArtistThumbs dest="5">
<RegExp input="$$6" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="&lt;thumb preview=&quot;\2&quot;&gt;\1&lt;/thumb&gt;" dest="6">
<expression repeat="yes" noclean="1">&lt;size name="original"[^&gt;]*&gt;([^&lt;]*)&lt;[^&lt;]*&lt;size name="large"[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
</RegExp>
<expression noclean="1">(.+)</expression>
</RegExp>
</ParseLastFMArtistThumbs>
<GetLastFMAlbumThumbs dest="5">
<RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseLastFMAlbumThumbs&quot;&gt;http://ws.audioscrobbler.com/2.0/?method=album.getinfo&amp;artist=\2&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lt;/url&gt;&lt;/details&gt;" dest="5">
<expression>(.+)::(.+)</expression>
</RegExp>
</GetLastFMAlbumThumbs>
<ParseLastFMAlbumThumbs dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="&lt;thumb&gt;\1&lt;/thumb&gt;" dest="2">
<expression noclean="1">&lt;image size=&quot;extralarge&quot;&gt;([^&lt;]*)&lt;/image&gt;</expression>
</RegExp>
<RegExp input="$$1" output="&lt;thumb&gt;\1&lt;/thumb&gt;" dest="2+">
<expression noclean="1">&lt;image size=&quot;large&quot;&gt;([^&lt;]*)&lt;/image&gt;</expression>
</RegExp>
<expression noclean="1"></expression>
</RegExp>
</ParseLastFMAlbumThumbs>
</scraperfunctions>

0 comments on commit 99b071f

Please sign in to comment.