Merge pull request #2113 from MartijnKaijser/scraper_change

Change default musicvideo scraper because it's broken

42 files changed, 147 insertions, 189 deletions

diff --git a/addons/metadata.musicvideos.last.fm/addon.xml b/addons/metadata.musicvideos.last.fm/addon.xml
deleted file mode 100644
index d176db5c5d..0000000000
--- a/addons/metadata.musicvideos.last.fm/addon.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="metadata.musicvideos.last.fm"
-       name="Last.fm for Music Videos"
-       version="1.0.3"
-       provider-name="Team XBMC">
-  <requires>
-    <import addon="xbmc.metadata" version="1.0"/>
-    <import addon="metadata.common.last.fm" version="1.3.2"/>
-    <import addon="metadata.common.fanart.tv" version="1.0.1"/>
-  </requires>
-  <extension point="xbmc.metadata.scraper.musicvideos"
-             language="en"
-             library="lastfmmusicvideos.xml"/>
-  <extension point="xbmc.addon.metadata">
-    <summary lang="af">Last.fm Musiek Video Skraper</summary>
-    <summary lang="be">Last.fm Music Video Scraper</summary>
-    <summary lang="bg">Сваля инф. за музикални клипове от Last.fm</summary>
-    <summary lang="ca">Arreplegador de videos musicals de Last.fm</summary>
-    <summary lang="cs">Zdroj dat hudebních videí Last.fm</summary>
-    <summary lang="da">Last.fm Scraper til Musikvideor </summary>
-    <summary lang="de">Last.fm Musik Video Scraper</summary>
-    <summary lang="el">Scraper Μουσικών Βίντεο από Last.fm</summary>
-    <summary lang="en">Last.fm Music Video Scraper</summary>
-    <summary lang="es">Scraper Video Clip Last.fm</summary>
-    <summary lang="es_AR">Scraper Video Clip Last.fm</summary>
-    <summary lang="es_MX">Scraper de Vídeos de Música de Last.fm</summary>
-    <summary lang="fi">Last.fm musiikkivideotietojen lataaja</summary>
-    <summary lang="fr">Collecter les clips vidéos Last.fm</summary>
-    <summary lang="gl">Scraper de música e vídeo de Last.fm</summary>
-    <summary lang="he">Last.fm וידאו קליפ מוזיקה</summary>
-    <summary lang="hu">Last.fm videóklip leolvasó</summary>
-    <summary lang="it">Scaper Video Musicale di Last.fm</summary>
-    <summary lang="ja">Last.fm 音楽ビデオスクレーパー</summary>
-    <summary lang="ko">Last.fm 뮤직 비디오 자료수집기</summary>
-    <summary lang="lt">Last.fm vaizdo klipų Scraper</summary>
-    <summary lang="mk">Last.fm Превземач на Музички видеа</summary>
-    <summary lang="nl">Last.fm Muziek Video Scraper</summary>
-    <summary lang="pl">Scraper teledysków Last.fm</summary>
-    <summary lang="pt">Scraper de música Last.fm</summary>
-    <summary lang="pt_BR">Scraper de Videoclipes do Last.fm</summary>
-    <summary lang="ro">Informaţii Videoclipuri de la Last.fm</summary>
-    <summary lang="ru">Инфоресурс видеоклипов Last.fm</summary>
-    <summary lang="se">Skrapa för Last.fm musik</summary>
-    <summary lang="sk">Zdroj dát hudobných videí z Last.fm</summary>
-    <summary lang="sl">Ponudnik informacij o videospotih Last.fm</summary>
-    <summary lang="sv">Last.fm Musikvideoskrapa</summary>
-    <summary lang="th">ข้อมูลวิดีโอเพลงจาก Last.fm</summary>
-    <summary lang="zh">Last.fm音乐电视刮削器</summary>
-    <description lang="af">Laai Musiek Video inligting af</description>
-    <description lang="am">የሙዚቃ ቪዲዮ መረጃ ማውረጃ </description>
-    <description lang="be">Зладаваць зьвесткі пра музычнае відэа</description>
-    <description lang="bg">Сваля информация за музикални клипове</description>
-    <description lang="ca">Baixa informació de videos musicals</description>
-    <description lang="cs">Stáhnout informace o hudebním videu</description>
-    <description lang="da">Hent information til Musikvideoer</description>
-    <description lang="de">Musik Video Information herunterladen</description>
-    <description lang="el">Λήψη πληροφοριών Μουσικών Βίντεο</description>
-    <description lang="en">Download Music Video information</description>
-    <description lang="es">Descarga información del Video Clip</description>
-    <description lang="es_AR">Descarga información del Video Clip</description>
-    <description lang="es_MX">Descarga Información de Vídeos de Músca</description>
-    <description lang="fi">Lataa musiikkivideoiden tiedot</description>
-    <description lang="fr">Télécharger les informations des clips vidéos</description>
-    <description lang="gl">Descargar información da música e vídeo</description>
-    <description lang="he">הורד מידע וידאו קליפ</description>
-    <description lang="hu">Videóklip információk letöltése a Last.fm webhelyről</description>
-    <description lang="it">Scarica informazioni Video Musicale</description>
-    <description lang="ja">音楽ビデオ情報をダウンロード</description>
-    <description lang="ko">뮤직 비디오 정보 다운로드</description>
-    <description lang="lt">Atsisiusti vaizdo klipų informaciją</description>
-    <description lang="mk">Превземи информации за музичко видео</description>
-    <description lang="nl">Muziek Video informatie downloaden</description>
-    <description lang="pl">Pobieraj informacje o teledyskach z last.fm</description>
-    <description lang="pt">Descarregar informação de vídeoclipe</description>
-    <description lang="pt_BR">Baixar informações do videoclipe</description>
-    <description lang="ro">Descărcare informaţii videoclipuri</description>
-    <description lang="ru">Загружать сведения о видеоклипах</description>
-    <description lang="se">Ladda ner musikvideoinformation från last.fm</description>
-    <description lang="sk">Prevziať informácie o hudobnom videu</description>
-    <description lang="sl">Prenesite informacije o videospotih</description>
-    <description lang="sv">Ladda ner musikvideoinformation</description>
-    <description lang="th">ดาวน์โหลดข้อมูลวิดีโอเพลง</description>
-    <description lang="zh">从Last.fm下载音乐电视信息</description>
-    <broken>broken due to last.fm suspended XBMC API Account</broken>
-  </extension>
-</addon>
diff --git a/addons/metadata.musicvideos.last.fm/icon.png b/addons/metadata.musicvideos.last.fm/icon.png
deleted file mode 100644
index b253ec5897..0000000000
--- a/addons/metadata.musicvideos.last.fm/icon.png
+++ /dev/null
diff --git a/addons/metadata.musicvideos.last.fm/lastfmmusicvideos.xml b/addons/metadata.musicvideos.last.fm/lastfmmusicvideos.xml
deleted file mode 100644
index 64d58e73e1..0000000000
--- a/addons/metadata.musicvideos.last.fm/lastfmmusicvideos.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2012-06-10">
-	<CreateSearchUrl dest="3">
-		<RegExp input="$$1" output="&lt;url cache=&quot;lastfmm-\2.xml&quot;&gt;http://ws.audioscrobbler.com/2.0/?method=track.getinfo&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&amp;artist=\1&amp;track=\2&lt;/url&gt;" dest="3">
-			<expression trim="1,2">(.+)%20%20%20(.+)</expression>
-		</RegExp>
-	</CreateSearchUrl>
-	<GetSearchResults dest="3">
-		<RegExp input="$$5" output="&lt;results&gt;\1&lt;/results&gt;" dest="3">
-			<RegExp input="$$1" output="\1" dest="6">
-				<expression>&lt;/id&gt;\s*&lt;name&gt;([^&lt;]*).*?&lt;artist&gt;\s*&lt;name&gt;([^&lt;]*)</expression>
-			</RegExp>
-			<RegExp input="$$1" output="\2" dest="7">
-				<expression>&lt;/id&gt;\s*&lt;name&gt;([^&lt;]*).*?&lt;artist&gt;\s*&lt;name&gt;([^&lt;]*)</expression>
-			</RegExp>
-			<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;$$7 - $$6&lt;/title&gt;&lt;url cache=&quot;lastfmm-\1.xml&quot;&gt;http://ws.audioscrobbler.com/2.0/?method=track.getinfo&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&amp;artist=\2&amp;track=\1&lt;/url&gt;&lt;/entity&gt;" dest="5">
-				<expression encode="1,2">&lt;/id&gt;\s*&lt;name&gt;([^&lt;]*).*?&lt;artist&gt;\s*&lt;name&gt;([^&lt;]*)</expression>
-			</RegExp>
-			<expression noclean="1" />
-		</RegExp>
-	</GetSearchResults>
-	<GetDetails dest="3">
-		<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="3">
-			<RegExp input="$$1" output="\1" dest="4">
-				<expression>&lt;/title&gt;\s*&lt;mbid&gt;([^&lt;]*)&lt;</expression>
-			</RegExp>
-			<RegExp input="$$1" output="\1" dest="7">
-				<expression>&lt;album[^&gt;]*&gt;\s*&lt;artist&gt;\s*[^&lt;]*&lt;/artist&gt;\s*&lt;title&gt;([^&lt;]*)&lt;/title&gt;</expression>
-			</RegExp>
-			<RegExp input="$$1" output="\1" dest="8">
-				<expression>&lt;artist&gt;\s*&lt;name&gt;([^&lt;]*)&lt;</expression>
-			</RegExp>
-			<RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5">
-				<expression>&lt;name&gt;([^&lt;]*)&lt;</expression>
-			</RegExp>
-			<RegExp input="$$8" output="&lt;artist&gt;\1&lt;/artist&gt;" dest="5+">
-				<expression noclean="1" />
-			</RegExp>
-			<RegExp input="$$7" output="&lt;album&gt;\1&lt;/album&gt;" dest="5+">
-				<expression noclean="1" />
-			</RegExp>
-			<RegExp input="$$4" output="&lt;chain function=&quot;GetLastFMAlbumDateByAlbumAndArtist&quot;&gt;$$7::$$8::$$7::$$8&lt;/chain&gt;" dest="5+">
-				<expression noclean="1" />
-			</RegExp>
-			<RegExp input="$$1" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="5+">
-				<expression fixchars="1">&lt;content&gt;&lt;!\[CDATA\[(.*?)(User-|\]\])</expression>
-			</RegExp>
-			<RegExp input="$$1" output="&lt;genre&gt;\1&lt;/genre&gt;" dest="5+">
-				<expression repeat="yes">&lt;tag&gt;\s*&lt;name&gt;([^&lt;]*)&lt;/name&gt;</expression>
-			</RegExp>
-			<RegExp conditional="lastfmalbumthumbs" input="$$1" output="&lt;thumb&gt;\1&lt;/thumb&gt;" dest="5+">
-				<expression>&lt;image size="extralarge"&gt;\s*([^&lt;]*)\s*&lt;/image&gt;</expression>
-			</RegExp>
-			<RegExp conditional="fanarttvalbumthumbs" input="$$1" output="&lt;chain function=&quot;GetFanartTvAlbumThumbsByMBID&quot;&gt;$$4&lt;/chain&gt;" dest="5+">
-				<expression noclean="1">(.+)</expression>
-			</RegExp>
-			<RegExp conditional="lastfmalbumthumbs" input="$$1" output="&lt;chain function=&quot;GetLastFMAlbumThumbs&quot;&gt;$$7::$$8::$$7::$$8&lt;/chain&gt;" dest="5+">
-				<expression noclean="1" />
-			</RegExp>
-			<expression noclean="1"/>
-		</RegExp>
-	</GetDetails>
-</scraper>
diff --git a/addons/metadata.musicvideos.theaudiodb.com/addon.xml b/addons/metadata.musicvideos.theaudiodb.com/addon.xml
new file mode 100644
index 0000000000..37ab5a46c6
--- /dev/null
+++ b/addons/metadata.musicvideos.theaudiodb.com/addon.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="metadata.musicvideos.theaudiodb.com"
+       name="TheAudioDb.com for Music Videos"
+       version="1.0.3"
+       provider-name="Team XBMC">
+  <requires>
+    <import addon="xbmc.metadata" version="1.0"/>
+    <import addon="metadata.common.fanart.tv" version="1.0.1"/>
+  </requires>
+  <extension point="xbmc.metadata.scraper.musicvideos"
+             language="en"
+             library="tadb.xml"/>
+  <extension point="xbmc.addon.metadata">
+    <summary lang="af">theaudiodb.com Musiek Video Skraper</summary>
+    <summary lang="be">theaudiodb.com Music Video Scraper</summary>
+    <summary lang="bg">Сваля инф. за музикални клипове от theaudiodb.com</summary>
+    <summary lang="cs">Zdroj dat o hudebních videích theaudiodb.com</summary>
+    <summary lang="da">theaudiodb.com Musikvideo-scraper</summary>
+    <summary lang="de">theaudiodb.com Musikvideo-Scraper</summary>
+    <summary lang="el">Scraper Μουσικών Βίντεο του theaudiodb.com</summary>
+    <summary lang="en">theaudiodb.com Music Video Scraper</summary>
+    <summary lang="es">Buscador de videoclips de theaudiodb.com</summary>
+    <summary lang="es_AR">Scraper de Videos de Música de TheAudioDb.com</summary>
+    <summary lang="fi">theaudiodb.com musiikkivideotietojen lataaja</summary>
+    <summary lang="fr">theaudiodb.com Scraper Clip Vidéo</summary>
+    <summary lang="gl">Scraper de vídeo e música de theaudiodb.com</summary>
+    <summary lang="he">theaudiodb.com סקרייפר וידאו קליפ</summary>
+    <summary lang="hu">theaudiodb.com videóklip leolvasó</summary>
+    <summary lang="it">Lo scraper di video musicali theaudiodb.com</summary>
+    <summary lang="ja">theaudiodb.com 音楽ビデオスクレーパー</summary>
+    <summary lang="ko">야후! 뮤직 비디오 스크래퍼</summary>
+    <summary lang="lt">theaudiodb.com vaizdo klipų Scraper</summary>
+    <summary lang="mk">theaudiodb.com Music Video Scraper</summary>
+    <summary lang="nl">theaudiodb.com Muziek Video Scraper</summary>
+    <summary lang="no">theaudiodb.com Skraper for musikkvideo</summary>
+    <summary lang="pl">Scraper teledysków theaudiodb.com</summary>
+    <summary lang="pt">Scraper de música theaudiodb.com</summary>
+    <summary lang="pt_BR">Scraper de concertos theaudiodb.com</summary>
+    <summary lang="ro">Informaţii videoclipuri de la theaudiodb.com </summary>
+    <summary lang="ru">Скрапер музыки и видео theaudiodb.com</summary>
+    <summary lang="se">Skrapa för theaudiodb.com musik</summary>
+    <summary lang="sk">Zdroj získavania dát o hudobných videách zo stránky theaudiodb.com</summary>
+    <summary lang="sl">Ponudnik informacij o videospotih theaudiodb.com</summary>
+    <summary lang="sv">theaudiodb.com musikvideoskrapa</summary>
+    <summary lang="th">ตัวดึงข้อมูลวิดีโอเพลง theaudiodb.com</summary>
+    <summary lang="zh">theaudiodb.com音乐电视刮削器</summary>
+    <description lang="af">Laai Musiek Video informasie af</description>
+    <description lang="am">የሙዚቃ ቪዲዮ መረጃ ማውረጃ</description>
+    <description lang="be">Download Music Video information</description>
+    <description lang="bg">Сваля информация за музикални клипове</description>
+    <description lang="ca">Baixa informació de videos musicals</description>
+    <description lang="cs">Stáhnout informace o hudebním videu</description>
+    <description lang="da">Hent Musikvideo-information</description>
+    <description lang="de">Musik Video Information herunterladen</description>
+    <description lang="el">Λήψη πληροφοριών Μουσικών Βίντεο</description>
+    <description lang="en">Download Music Video information</description>
+    <description lang="es">Descarga información del videoclip</description>
+    <description lang="es_AR">Descarga información del Video Clip</description>
+    <description lang="es_MX">Descarga Información de Vídeos de Músca</description>
+    <description lang="fi">Lataa musiikkivideoiden tiedot</description>
+    <description lang="fr">Télécharger les informations des clips vidéos</description>
+    <description lang="gl">Descargar a información do vídeo e música</description>
+    <description lang="he">הורד מידע וידאו קליפ</description>
+    <description lang="hu">Videóklip információk letöltése a theaudiodb.com webhelyről</description>
+    <description lang="it">Scarica informazioni Video Musicale</description>
+    <description lang="ja">音楽ビデオの情報をダウンロード</description>
+    <description lang="ko">뮤직 비디오 정보 다운로드</description>
+    <description lang="lt">Atsisiusti vaizdo klipų informaciją</description>
+    <description lang="mk">Превземи информации за музичко видео</description>
+    <description lang="nl">Muziek Video informatie downloaden</description>
+    <description lang="no">Last ned musikkvideoinformasjon</description>
+    <description lang="pl">Pobieraj informacje o teledyskach z theaudiodb.com</description>
+    <description lang="pt">Descarregar informação de filmes de theaudiodb.com</description>
+    <description lang="pt_BR">Download de informação de Concertos</description>
+    <description lang="ro">Descarcă informaţii videoclipuri</description>
+    <description lang="ru">Загружать сведения о видеоклипах</description>
+    <description lang="se">Ladda ner musikvideoinformation från theaudiodb.com</description>
+    <description lang="sk">Prevziať informácie o hudobnom videu</description>
+    <description lang="sl">Prenesite informacije o videospotih</description>
+    <description lang="sv">Ladda ner musikvideoinformation</description>
+    <description lang="th">ดาวน์โหลดข้อมูลวิดีโอเพลง</description>
+    <description lang="zh">从theaudiodb.com下载音乐电视资料</description>
+  </extension>
+</addon>
diff --git a/addons/metadata.musicvideos.theaudiodb.com/icon.png b/addons/metadata.musicvideos.theaudiodb.com/icon.png
new file mode 100644
index 0000000000..0460de88c8
--- /dev/null
+++ b/addons/metadata.musicvideos.theaudiodb.com/icon.png
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Afrikaans/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Afrikaans/strings.xml
index 5dcffd95d8..efa80da179 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Afrikaans/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Afrikaans/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Gryp album duimnaelsketse vanaf fanart.tv</string>
-    <string id="30001">Gryp album duimnaelsketse vanaf Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Belarusian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Belarusian/strings.xml
index a362e83d50..91203fe7fa 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Belarusian/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Belarusian/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Grab album thumbs from fanart.tv</string>
-    <string id="30001">Grab album thumbs from Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Bulgarian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Bulgarian/strings.xml
index 62e00455af..ae129c1c94 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Bulgarian/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Bulgarian/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Сваляй миниатюри за албумите от fanart.tv</string>
-    <string id="30001">Сваляй миниатюри за албумите от Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Catalan/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Catalan/strings.xml
index a925b1801c..d38a9ad2b5 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Catalan/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Catalan/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Agafa les miniatures d'àlbums de fanart.tv</string>
-    <string id="30001">Agafa les miniatures d'àlbums de Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Chinese (Simple)/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Simple)/strings.xml
index a50a4e4809..1b4badd576 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Chinese (Simple)/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Simple)/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">从fanart.tv获取专辑图片</string>
-    <string id="30001">从Last.fm获取专辑图片</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Czech/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Czech/strings.xml
index e2232c1ed7..138d80502b 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Czech/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Czech/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Získat náhledy alb z fanart.tv</string>
-    <string id="30001">Získat náhledy alb z Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Danish/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Danish/strings.xml
index 5f974be84b..5d12f88ee2 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Danish/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Danish/strings.xml
@@ -4,6 +4,5 @@
 <!-- Report language file syntax bugs at: http://trac.xbmc.org/ -->
 
 <strings>
-    <string id="30000">Hent Miniaturebilleder af Albummer fra fanart.tv</string>
-    <string id="30001">Hent Miniaturebilleder af Albummer fra Last.fm</string>
+    <string id="30000">Hent miniaturebilleder til albummer fra fanart.tv</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Dutch/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Dutch/strings.xml
index a2f4fa593c..521473130c 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Dutch/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Dutch/strings.xml
@@ -4,6 +4,5 @@
 <!-- Report language file syntax bugs at: http://trac.xbmc.org/ -->
 
 <strings>
-    <string id="30000">Pak albumminiaturen van fanart.tv</string>
-    <string id="30001">Pak albumminiaturen van Last.fm</string>
+    <string id="30000">Verkrijg album thumbs van fanart.tv</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/English/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/English/strings.xml
index 77b55a184c..8b5221e453 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/English/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/English/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Grab album thumbs from fanart.tv</string>
-    <string id="30001">Grab album thumbs from Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Finnish/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Finnish/strings.xml
index 8be501a38a..36e9182d22 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Finnish/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Finnish/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Hae albumin pienoiskuvat fanart.tv:stä</string>
-    <string id="30001">Hae albumin pienoiskuvat Last.fm:stä</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/French/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/French/strings.xml
index 760231dcfd..bdd7dd3229 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/French/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/French/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Récupérer les vignettes d'albums depuis fanart.tv</string>
-    <string id="30001">Récupérer les vignettes d'albums depuis Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Galician/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Galician/strings.xml
index e81599dfb2..17b6ffa5f8 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Galician/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Galician/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Obter as miniaturas do álbum dende fanart.tv</string>
-    <string id="30001">Obter as miniaturas do álbum dende Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/German/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/German/strings.xml
index 548004a329..f9ba422ffa 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/German/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/German/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Album Minibild von fanart.tv grabben</string>
-    <string id="30001">Album Minibild von Last.fm grabben</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Greek/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Greek/strings.xml
index 8b8cb61ecc..a30f60c67e 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Greek/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Greek/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Μικρογραφίες άλμπουμ από fanart.tv</string>
-    <string id="30001">Μικρογραφίες άλμπουμ από Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Hebrew/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Hebrew/strings.xml
index a5c861461a..db8e17a227 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Hebrew/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Hebrew/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">השג תמונות אלבום מ- fanart.tv</string>
-    <string id="30001">השג תמונות אלבום מ- Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Hungarian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Hungarian/strings.xml
index 70c3a726e4..1df352ce4b 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Hungarian/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Hungarian/strings.xml
@@ -4,6 +4,5 @@
 <!-- Report language file syntax bugs at: http://trac.xbmc.org/ -->
 
 <strings>
-    <string id="30000">Tölts le album miniképeket a fanart.tv-ről</string>
-    <string id="30001">Tölts le album miniképeket a Last.fm-ről</string>
+    <string id="30000">Album miniképek letőltésea fanart.tv-ről</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Italian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Italian/strings.xml
index 10a1abc613..0c8c8b1219 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Italian/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Italian/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Scarica le copertine album da fanart.tv</string>
-    <string id="30001">Scarica le copertine album da Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Japanese/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Japanese/strings.xml
index 449f5deca5..f232505006 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Japanese/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Japanese/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">fanart.tv からアルバムサムネールを取得</string>
-    <string id="30001">Last.fm からアルバムサムネールを取得</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Korean/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Korean/strings.xml
index 520ce4782c..da27bae11d 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Korean/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Korean/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">fanart.tv 에서 앨범 커버 가져오기</string>
-    <string id="30001">Last.fm 에서 앨범 커버 가져오기</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Lithuanian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Lithuanian/strings.xml
index 48cf6b5a6a..2c7fca4a8a 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Lithuanian/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Lithuanian/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Paimti albumų miniatiūras iš fanart.tv</string>
-    <string id="30001">Paimti albumų miniatiūras iš Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Macedonian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Macedonian/strings.xml
index 1f4ab4ada9..a94780d111 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Macedonian/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Macedonian/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Симни сликички за албум од fanart.tv</string>
-    <string id="30001">Симни сликички за албум од last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.theaudiodb.com/resources/language/Norwegian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Norwegian/strings.xml
new file mode 100644
index 0000000000..91b424582f
--- /dev/null
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Norwegian/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Translated using Transifex web application. For support, or if you would like to to help out, please visit your language team! -->
+<!-- Norwegian language-Team URL: http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/no/ -->
+<!-- Report language file syntax bugs at: http://trac.xbmc.org/ -->
+
+<strings>
+    <string id="30000">Hent Album Thumbs fra fanart.tv</string>
+</strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Polish/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Polish/strings.xml
index a9e0ac2f28..157ccb2a27 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Polish/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Polish/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Pobierz ikony albumu z fanart.tv</string>
-    <string id="30001">Pobierz ikony albumu z Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Portuguese (Brazil)/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese (Brazil)/strings.xml
index 1f146b2510..32bff6a511 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Portuguese (Brazil)/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese (Brazil)/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Obter miniaturas de álbuns de fanart.tv</string>
-    <string id="30001">Obter miniaturas de álbuns do Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Portuguese/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese/strings.xml
index 6b86b03b43..d31d2b9d60 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Portuguese/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Obter miniaturas de álbum em fanart.tv</string>
-    <string id="30001">Obter miniaturas do álbum em Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Romanian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Romanian/strings.xml
index 057a15403b..555f442a6b 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Romanian/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Romanian/strings.xml
@@ -4,6 +4,5 @@
 <!-- Report language file syntax bugs at: http://trac.xbmc.org/ -->
 
 <strings>
-    <string id="30000">Obţine imagini album de la fanart.tv</string>
-    <string id="30001">Obţine imagini album de la Last.fm</string>
+    <string id="30000">Obţine imagini albume de la fanart.tv</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Russian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Russian/strings.xml
index bffa18fe0e..71d81ce1e6 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Russian/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Russian/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Загружать эскизы альбомов с fanart.tv</string>
-    <string id="30001">Загружать эскизы альбомов с Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Slovak/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Slovak/strings.xml
index 08fbb4d5f3..8faf8ca14f 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Slovak/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Slovak/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Získať náhľady albumov zo stránky fanart.tv</string>
-    <string id="30001">Získať náhľady albumov zo stránky Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Slovenian/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Slovenian/strings.xml
index 748c909187..57bcb77535 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Slovenian/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Slovenian/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Prenesi sličice albumov s fanart.tv</string>
-    <string id="30001">Prenesi sličice albumov z Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Spanish (Argentina)/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Argentina)/strings.xml
index 41cf2ccf80..27fb72c87f 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Spanish (Argentina)/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Argentina)/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Obtener miniatura de album de fanart.tv</string>
-    <string id="30001">Obtener miniatura de album de Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Spanish (Mexico)/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Mexico)/strings.xml
index 0a9bdb80a4..a345ea3c56 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Spanish (Mexico)/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Mexico)/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Obtener miniaturas de álbumes desde fanart.tv</string>
-    <string id="30001">Obtener miniaturas de álbumes desde Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Spanish/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish/strings.xml
index da0cdcc72a..54d3c5dabd 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Spanish/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish/strings.xml
@@ -4,6 +4,5 @@
 <!-- Report language file syntax bugs at: http://trac.xbmc.org/ -->
 
 <strings>
-    <string id="30000">Obtener miniatura de album de fanart.tv</string>
-    <string id="30001">Obtener miniatura de album de Last.fm</string>
+    <string id="30000">Obtener miniatura de álbum de fanart.tv</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Swedish/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Swedish/strings.xml
index 8111531d31..d1b76159d7 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Swedish/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Swedish/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">Hämta albumminiatyrer från fanart.tv</string>
-    <string id="30001">Hämta albumminiatyrer från Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Thai/strings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Thai/strings.xml
index 1ac286c84f..34a36fd13a 100644
--- a/addons/metadata.musicvideos.last.fm/resources/language/Thai/strings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/language/Thai/strings.xml
@@ -5,5 +5,4 @@
 
 <strings>
     <string id="30000">ดึงข้อมูลภาพปกอัลบั้มจาก fanart.tv</string>
-    <string id="30001">ดึงข้อมูลภาพปกอัลบั้มจาก Last.fm</string>
 </strings>
diff --git a/addons/metadata.musicvideos.last.fm/resources/settings.xml b/addons/metadata.musicvideos.theaudiodb.com/resources/settings.xml
index 403462073b..ea430f171c 100644
--- a/addons/metadata.musicvideos.last.fm/resources/settings.xml
+++ b/addons/metadata.musicvideos.theaudiodb.com/resources/settings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
       <setting label="30000" type="bool" id="fanarttvalbumthumbs" default="true"/>
-      <setting label="30001" type="bool" id="lastfmalbumthumbs" default="true"/>
 </settings>
diff --git a/addons/metadata.musicvideos.theaudiodb.com/tadb.xml b/addons/metadata.musicvideos.theaudiodb.com/tadb.xml
new file mode 100644
index 0000000000..2305e2d09b
--- /dev/null
+++ b/addons/metadata.musicvideos.theaudiodb.com/tadb.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scraper framework="1.1" date="2012-06-10">
+	<CreateSearchUrl dest="3">
+		<RegExp input="$$1" output="&lt;url&gt;http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/searchtrack.php?s=\1&t=\2&lt;/url&gt;" dest="3">
+			<expression trim="1,2">(.+)%20%20%20(.+)</expression>
+		</RegExp>
+	</CreateSearchUrl>
+	<GetSearchResults dest="3">
+		<RegExp input="$$5" output="&lt;results&gt;\1&lt;/results&gt;" dest="3">
+			<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\5 - \3 [\4]&lt;/title&gt;&lt;url cache=&quot;tadb-\1.json&quot;&gt;http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/track.php?h=\1&lt;/url&gt;&lt;/entity&gt;" dest="5">
+				<expression repeat="yes" clear="yes" fixchars="1" noclean="1">idTrack&quot;:&quot;([^&quot;]*)&quot;,&quot;idAlbum&quot;:&quot;([^&quot;]*).*?&quot;strTrack&quot;:&quot;([^&quot;]*)&quot;,&quot;strAlbum&quot;:&quot;([^&quot;]*)&quot;,&quot;strArtist&quot;:&quot;([^&quot;]*)</expression>
+			</RegExp>
+			<expression noclean="1" />
+		</RegExp>
+	</GetSearchResults>
+	<GetDetails dest="3">
+		<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="3">
+			<RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5">
+				<expression fixchars="1" noclean="1">strTrack&quot;:&quot;([^&quot;]*)&quot;</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;artist&gt;\1&lt;/artist&gt;" dest="5+">
+				<expression fixchars="1" noclean="1">strArtist&quot;:&quot;([^&quot;]*)&quot;</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;album&gt;\1&lt;/album&gt;" dest="5+">
+				<expression fixchars="1" noclean="1">strAlbum&quot;:&quot;([^&quot;]*)&quot;</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="5+">
+				<expression fixchars="1" noclean="1">strDescription&quot;:&quot;(.*?)&quot;,&quot;</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;genre&gt;\1&lt;/genre&gt;" dest="5+">
+				<expression fixchars="1" noclean="1">strGenre&quot;:&quot;([^&quot;]*)&quot;</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;thumb&gt;\1&lt;/thumb&gt;" dest="5+">
+				<expression fixchars="1" noclean="1">strTrackThumb&quot;:&quot;([^&quot;]*)&quot;</expression>
+			</RegExp>
+			<RegExp conditional="fanarttvalbumthumbs" input="$$1" output="&lt;chain function=&quot;GetFanartTvAlbumThumbsByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+				<expression fixchars="1" noclean="1">strMusicBrainzAlbumID&quot;:&quot;([^&quot;]*)&quot;</expression>
+			</RegExp>
+			<expression noclean="1"/>
+		</RegExp>
+	</GetDetails>
+</scraper>
diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp
index 23fdee7b4b..76ec0cccda 100644
--- a/xbmc/settings/GUISettings.cpp
+++ b/xbmc/settings/GUISettings.cpp
@@ -815,7 +815,7 @@ void CGUISettings::Initialize()
 
   AddDefaultAddon(NULL, "scrapers.moviesdefault", 21413, "metadata.themoviedb.org", ADDON_SCRAPER_MOVIES);
   AddDefaultAddon(NULL, "scrapers.tvshowsdefault", 21414, "metadata.tvdb.com", ADDON_SCRAPER_TVSHOWS);
-  AddDefaultAddon(NULL, "scrapers.musicvideosdefault", 21415, "metadata.musicvideos.last.fm", ADDON_SCRAPER_MUSICVIDEOS);
+  AddDefaultAddon(NULL, "scrapers.musicvideosdefault", 21415, "metadata.musicvideos.theaudiodb.com", ADDON_SCRAPER_MUSICVIDEOS);
 
   // service settings
   AddGroup(SETTINGS_SERVICE, 14036);
@@ -1461,6 +1461,13 @@ void CGUISettings::LoadXML(TiXmlElement *pRootElement, bool hideSettings /* = fa
     updated = true;
   }
 
+  // replace broken last.fm musicvideo scraper with theaudiodb.com if it's still in use
+  if (GetString("scrapers.musicvideosdefault") == "metadata.musicvideos.last.fm")
+  {
+    SetString("scrapers.musicvideosdefault", "metadata.musicvideos.theaudiodb.com");
+    updated = true;
+  }
+
   if (updated)
     g_settings.Save();
 }