The branch, frodo has been updated
       via  1ae8004b238d5e87de80725b9b6d248e35b7f3af (commit)
       via  51c36470406d327d44b68e9bbe47fedcd243e002 (commit)
      from  d8365798ff327008df4c92c2b2239913bb3540a0 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=1ae8004b238d5e87de80725b9b6d248e35b7f3af

commit 1ae8004b238d5e87de80725b9b6d248e35b7f3af
Author: Martijn Kaijser <[email protected]>
Date:   Sat Aug 16 10:10:21 2014 +0200

    [metadata.artists.metal-archives.com] 2.0.0

diff --git a/metadata.artists.metal-archives.com/addon.xml 
b/metadata.artists.metal-archives.com/addon.xml
index 7c8f546..b67ddbe 100644
--- a/metadata.artists.metal-archives.com/addon.xml
+++ b/metadata.artists.metal-archives.com/addon.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.artists.metal-archives.com"
        name="Encyclopaedia Metallum"
-       version="1.0.4"
-       provider-name="spiff">
+       version="2.0.0"
+       provider-name="farlight">
   <requires>
-    <import addon="xbmc.metadata" version="1.0"/>
-    <import addon="metadata.common.htbackdrops.com" version="1.0.1"/>
-    <import addon="metadata.common.last.fm" version="1.0.1"/>
+    <import addon="xbmc.metadata" version="2.1.0"/>
+    <import addon="metadata.common.htbackdrops.com" version="1.3.0"/>
   </requires>
   <extension point="xbmc.metadata.scraper.artists"
              language="en"
              library="metal-archives.xml"/>
   <extension point="xbmc.addon.metadata">
     <summary lang="en">Download information about your metal from 
Encyclopaedia Metallum</summary>
+    <summary lang="es">Descarga información desde Encyclopaedia 
Metallum</summary>
     <summary lang="hu">Encyclopaedia Metallum előadó információk</summary>
     <summary lang="pl">Pobieraj informacje z Encyklopedii Metallum</summary>
-    <description lang="en">Encyclopaedia Metallum: The Metal Archives is a 
website which lists bands from various forms of heavy metal music.
-
-Encyclopaedia Metallum attempts to provide comprehensive information on each 
band, such as a discography, logos, pictures, lyrics, line-ups, biography, 
trivia and user-submitted reviews.
-
-The site also provides a system for submitting bands to the archives, and 
users are encouraged to use it. The site has 73,000+ bands listed, 170,000+ 
releases, 1,196,000+ tracks, 52,000+ reviews and 227,000+ registered users. It 
is one of the top 500 most-visited websites in five countries.</description>
-    <description lang="hu">A Metal Archives egy weboldal ami a heavy metal 
zene különböző formáit listázza.
-Az oldal megpróbál átfogó információkat nyújtani minden egyes 
csapatról, mint a diszkográfia, logók, képek, dalszövegek, felállások, 
életrajzok és felhasználói vélemények.
-Továbbá egy olyan rendszert nyújt melyben a felhasználók bátorítva 
vannak, hogy együtteseket, információkat adjanak hozzá az adatbázishoz. Az 
oldalon 73,000+ együttes van listázva, 1,196,000+ szám, 52,000+ kritika és 
227,000+ regisztrált felhasználó. A webhely benne van az 500 
leglátogatottabb weboldal között öt országban.</description>
+    <description lang="en">Encyclopaedia Metallum: The Metal Archives is a 
website which lists bands from various forms of heavy metal music. 
Encyclopaedia Metallum attempts to provide comprehensive information on each 
band, such as a discography, logos, pictures, lyrics, line-ups, biography, 
trivia and user-submitted reviews. The site also provides a system for 
submitting bands to the archives, and users are encouraged to use it. The site 
has 73,000+ bands listed, 70,000+ releases, 1,196,000+ tracks, 52,000+ reviews 
and 227,000+ registered users. It is one of the top 500 most-visited websites 
in five countries.</description>
+    <description lang="es">Encyclopaedia Metallum: The Metal Archives es un 
lugar donde encontrar información sobre toda la musica heavy metal. 
Encyclopaedia Metallum intenta tener toda la información relevante sobre 
cualquier banda del metal, discografía, logos, imágenes, letras, músicos, 
biografía y reviews de usuarios. La web tiene un sistema para añadir nuevas 
bandas por usuarios que mantienen los propios usuarios. Actualmente contiene 
mas de 73.000 bandas, mas de 170.000 ediciones, mas de 1.196.000 canciones, mas 
de 52.000 reviews y mas de 227.000 usuarios registrados. Es una de las 500 webs 
mas visitadas mundialmente.</description>
+    <description lang="hu">A Metal Archives egy weboldal ami a heavy metal 
zene különböző formáit listázza. Az oldal megpróbál átfogó 
információkat nyújtani minden egyes csapatról, mint a diszkográfia, 
logók, képek, dalszövegek, felállások, életrajzok és felhasználói 
vélemények. Továbbá egy olyan rendszert nyújt melyben a felhasználók 
bátorítva vannak, hogy együtteseket, információkat adjanak hozzá az 
adatbázishoz. Az oldalon 73,000+ együttes van listázva, 1,196,000+ szám, 
52,000+ kritika és 227,000+ regisztrált felhasználó. A webhely benne van az 
500 leglátogatottabb weboldal között öt országban.</description>
     <description lang="pl">Encyklopedia Metallum: Metalowe Archiwa to strona 
skupiająca metalowe kapele. Serwis stara się zbierać wszystkie informacje o 
formacjach metalowych i ich twórczości (dyskografie, logotypy, zdjęcia, 
teksty, biografie, ciekawostki i recenzje użytkowników).</description>
-    <platform>all</platform>
+    <language></language>
+       <platform>all</platform>
+       <website></website>
+    
<source>https://github.com/farlight1/metadata.artists.metal-archives.com</source>
+    <email></email>
+    <forum></forum>
+    <license>GPL v2.0</license>
   </extension>
 </addon>
diff --git a/metadata.artists.metal-archives.com/changelog.txt 
b/metadata.artists.metal-archives.com/changelog.txt
index 6e488ec..51803a7 100644
--- a/metadata.artists.metal-archives.com/changelog.txt
+++ b/metadata.artists.metal-archives.com/changelog.txt
@@ -1,3 +1,14 @@
+[B]2.0.0[/B]
+Updated Scraper libraries
+logo band and thumb collected
+Additional (if available) full-bio collected
+User can choose in config to retrieve all band releases and not only 
full-albums in artist discography
+Added Spanish translation.
+First version provided by farlight
+
+[B]1.0.4[/B]
+last release by spiff
+
 [B]1.0.3[/B]
 New icon.
 
diff --git a/metadata.artists.metal-archives.com/metal-archives.xml 
b/metadata.artists.metal-archives.com/metal-archives.xml
index 6653fe1..f2b89ef 100644
--- a/metadata.artists.metal-archives.com/metal-archives.xml
+++ b/metadata.artists.metal-archives.com/metal-archives.xml
@@ -1,68 +1,93 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<scraper framework="1.1" date="2010-05-25">
-       <NfoUrl dest="3">
-               <RegExp input="$$1" 
output="&lt;url&gt;http://www.\1&lt;/url&gt;"; dest="3">
-                       <expression>(metal-archives.com/.*)</expression>
-               </RegExp>
-       </NfoUrl>
-       <CreateArtistSearchUrl dest="3">
-               <RegExp input="$$1" 
output="&lt;url&gt;http://www.metal-archives.com/search.php?string=\1&amp;amp;type=band&lt;/url&gt;";
 dest="3">
-                       <expression/>
-               </RegExp>
-       </CreateArtistSearchUrl>
-       <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;url&gt;http://www.metal-archives.com/\1&lt;/url&gt;&lt;/entity&gt;";
 dest="5+">
-                               <expression>location.href = 
'([^']*)'</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;url&gt;http://www.metal-archives.com/\1&lt;/entity&gt;";
 dest="5+">
-                               <expression repeat="yes" noclean="1">&lt;a 
href='(band.php[^']*)'&gt;([^&lt;]*)&lt;/a&gt;</expression>
-                       </RegExp>
-                       <expression noclean="1"/>
-               </RegExp>               
-       </GetArtistSearchResults>
-       <GetArtistDetails dest="3">
-               <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="3">
-                       <RegExp input="$$1" output="\1" dest="6">
-                               <expression>Genre\(s\).*?&lt;td 
colspan=&quot;4&quot;&gt;([^&lt;]*)&lt;/td&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$6" 
output="&lt;genre&gt;\1&lt;/genre&gt;" dest="5+">
-                               <expression 
repeat="yes">([^,]+)[,]?</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="\1" dest="7">
-                               <expression>Lyrical theme\(s\).*?&lt;td 
colspan=&quot;4&quot;&gt;([^&lt;]*)&lt;/td&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$7" 
output="&lt;theme&gt;\1&lt;/theme&gt;" dest="5+">
-                               <expression 
repeat="yes">([^,]+)[,]?</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="\1" dest="9">
-                               <expression>&lt;td class=&quot;tt&quot; 
colspan=&quot;4&quot;&gt;([^&lt;]*)&lt;/td&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$9" 
output="&lt;name&gt;\1&lt;/name&gt;" dest="5+">
-                               <expression/>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;formed&gt;\1&lt;/formed&gt;" dest="5+">
-                               
<expression>&lt;td&gt;.*?&lt;/td&gt;.*?&lt;td&gt;([0-9]+)&lt;/td&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;biography&gt;\1\n\2&lt;/biography&gt;" dest="5+">
-                               <expression trim="1,2">Current 
line-up&lt;/td&gt;(.*)&lt;td class=&quot;trt&quot; 
colspan=&quot;4&quot;&gt;Additional notes(.*?)&lt;td class=&quot;trt&quot; 
colspan=&quot;4&quot;>Buy</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;album&gt;&lt;title&gt;\1&lt;/title&gt;&lt;year&gt;\2&lt;/year&gt;&lt;/album&gt;"
 dest="5+">
-                               <expression 
repeat="yes">release.php[^']*'&gt;([^&lt;]*)&lt;.*?, ([0-9]+)</expression>
-                       </RegExp>
-                       <RegExp input="$$9" conditional="htbfanart" 
output="&lt;chain function=&quot;GetHTBFanart&quot;&gt;\1&lt;/chain&gt;" 
dest="5+">
-                               <expression encode="1"/>
-                       </RegExp>
-                       <RegExp input="$$9" conditional="lastfmartistthumbs" 
output="&lt;chain 
function=&quot;GetLastFMArtistThumbs&quot;&gt;\1&lt;/chain&gt;" dest="5+">
-                               <expression encode="1"/>
-                       </RegExp>
-                       <RegExp input="$$2" conditional="htbthumbs" 
output="&lt;chain function=&quot;GetHTBThumbs&quot;&gt;\1&lt;/chain&gt;" 
dest="5+">
-                               <expression/>
-                       </RegExp>
-                       <RegExp conditional="maartistthumbs"input="$$1" 
output="&lt;thumb&gt;\1&lt;/thumb&gt;" dest="5+">
-                               <expression noclean="1">&lt;a 
href='(http://www.metal-archives.com/images[^']*)'&gt;</expression>
-                       </RegExp>
-                       <expression noclean="1"/>
-               </RegExp>
-       </GetArtistDetails>
-</scraper>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<scraper thumb="" date="2014-08-12" framework="1.1" name="">
+    <NfoUrl dest="3">
+        <RegExp dest="3" output="&lt;url&gt;http://www.\1&lt;/url&gt;"; 
input="$$1">
+            <expression>(metal-archives.com/.*)</expression>
+        </RegExp>
+    </NfoUrl>
+    <CreateArtistSearchUrl dest="3">
+        <RegExp dest="3" 
output="&lt;url&gt;http://www.metal-archives.com/search/ajax-band-search/?field=name&amp;amp;query=\1&lt;/url&gt;";
 input="$$1">
+            <expression/>
+        </RegExp>
+    </CreateArtistSearchUrl>
+    <GetArtistSearchResults dest="8">
+        <RegExp dest="8" output="&lt;?xml version=&quot;1.0&quot; 
encoding=&quot;iso-8859-1&quot; 
standalone=&quot;yes&quot;?&gt;&lt;results&gt;\1&lt;/results&gt;" input="$$5">
+            <RegExp dest="5+" 
output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;url&gt;\1&lt;/url&gt;&lt;/entity&gt;"
 input="$$1">
+                <expression repeat="yes" noclean="1">&lt;a 
href=\\&quot;([^&quot;]*bands[^&quot;]*)\\&quot;&gt;([^&lt;]*)&lt;/a&gt;</expression>
+            </RegExp>
+            <expression noclean="1"></expression>
+        </RegExp>
+    </GetArtistSearchResults>
+    <GetArtistDetails dest="3">
+        <RegExp dest="3" output="&lt;details&gt;\1&lt;/details&gt;" 
input="$$5">
+            <RegExp dest="9" output="\1" input="$$1">
+                <expression>bandName = &quot;(.*?)&quot;;</expression>
+            </RegExp>
+            <RegExp dest="5+" output="&lt;name&gt;\1&lt;/name&gt;" input="$$9">
+                <expression/>
+            </RegExp>
+            <RegExp dest="5+" output="&lt;genre&gt;\1&lt;/genre&gt;" 
input="$$1">
+                <expression 
repeat="yes">&lt;dt&gt;Genre:&lt;/dt&gt;[^&gt;]*&gt;(.*?)&lt;/dd&gt;</expression>
+            </RegExp>
+            <RegExp dest="5+" output="&lt;mood&gt;\1&lt;/mood&gt;" input="$$1">
+                <expression repeat="yes">&lt;dt&gt;Lyrical 
themes:&lt;/dt&gt;[^&gt;]*&gt;(.*?)&lt;/dd&gt;</expression>
+            </RegExp>
+            <RegExp dest="5+" 
output="&lt;yearsactive&gt;\1&lt;/yearsactive&gt;" input="$$1">
+                <expression>&lt;dt&gt;Years 
active:&lt;/dt&gt;[^&gt;]*&gt;\s+(.*?)\s+&lt;/dd&gt;</expression>
+            </RegExp>
+            <RegExp dest="5+" output="&lt;formed&gt;\1&lt;/formed&gt;" 
input="$$10">
+                <RegExp dest="10" output="\1" input="$$1">
+                    
<expression>&lt;dt&gt;Location:&lt;/dt&gt;[^&gt;]*&gt;(.+?)&lt;/dd&gt;</expression>
+                </RegExp>
+                <RegExp dest="10+" output=" (\1)" input="$$1">
+                    <expression>&lt;dt&gt;Country of 
origin:&lt;/dt&gt;.+?&quot;&gt;(.+?)&lt;/a&gt;</expression>
+                </RegExp>
+                <RegExp dest="10+" output=" - \1" input="$$1">
+                    <expression>&lt;dt&gt;Formed 
in:&lt;/dt&gt;[^&gt;]*&gt;([0-9]+)&lt;/dd&gt;</expression>
+                </RegExp>
+                <expression/>
+            </RegExp>
+            <RegExp dest="5+" output="&lt;url 
function=&quot;GetLargeBio&quot;&gt;http://www.metal-archives.com/band/read-more/id/\1&lt;/url&gt;";
 input="$$7">
+                <RegExp dest="7" output="\1" input="$$1">
+                    <expression>var bandId = ([0-9]+);</expression>
+                </RegExp>
+                <expression/>
+            </RegExp>
+            <RegExp dest="5+" output="&lt;chain 
function=&quot;GetHTBFanart&quot;&gt;\1&lt;/chain&gt;" input="$$9" 
conditional="htbfanart">
+                <expression/>
+            </RegExp>
+            <RegExp dest="5+" output="&lt;chain 
function=&quot;GetHTBThumbs&quot;&gt;\1&lt;/chain&gt;" input="$$2" 
conditional="htbthumbs">
+                <expression/>
+            </RegExp>
+            <RegExp dest="5+" output="&lt;thumb&gt;\1&lt;/thumb&gt;" 
input="$$1" conditional="maartistthumbs">
+                
<expression>src=&quot;(http://www.metal-archives.com/images[^&quot;]*logo.[jpeginf]+)[^&quot;]?</expression>
+            </RegExp>
+            <RegExp dest="5+" output="&lt;thumb&gt;\1&lt;/thumb&gt;" 
input="$$1" conditional="maartistthumbs">
+                
<expression>src=&quot;(http://www.metal-archives.com/images[^&quot;]*photo.jpg)[^&quot;]?</expression>
+            </RegExp>
+            <RegExp dest="5+" output="&lt;url 
function=&quot;GetAlbum&quot;&gt;\1&lt;/url&gt;" input="$$1">
+                
<expression>href=&quot;(http://www.metal-archives.com/band/discography/id/[0-9]+/tab/all)&quot;&gt;</expression>
+            </RegExp>
+            <expression noclean="1"></expression>
+        </RegExp>
+    </GetArtistDetails>
+    <GetAlbum dest="5">
+        <RegExp dest="5" output="&lt;details&gt;\1&lt;/details&gt;" 
input="$$6">
+            <RegExp dest="6+" 
output="&lt;album&gt;&lt;title&gt;\2&lt;/title&gt;&lt;year&gt;\3&lt;/year&gt;&lt;/album&gt;"
 input="$$1" conditional="!getalldisc">
+                <expression repeat="yes" noclean="1">&quot; 
class=&quot;(album)&quot;&gt;(.*?)&lt;.*?&gt;([0-9]+)&lt;</expression>
+            </RegExp>
+            <RegExp dest="6+" 
output="&lt;album&gt;&lt;title&gt;\2&lt;/title&gt;&lt;year&gt;\3&lt;/year&gt;&lt;/album&gt;"
 input="$$1" conditional="getalldisc">
+                <expression repeat="yes" noclean="1">&quot; 
class=&quot;(album|other|single)&quot;&gt;(.*?)&lt;.*?&gt;([0-9]+)&lt;</expression>
+            </RegExp>
+            <expression noclean="1"></expression>
+        </RegExp>
+    </GetAlbum>
+    <GetLargeBio dest="5">
+        <RegExp dest="5" output="&lt;details&gt;\1&lt;/details&gt;" 
input="$$7">
+            <RegExp dest="7" output="&lt;biography&gt;\1&lt;/biography&gt;" 
input="$$1">
+                <expression>(.*)</expression>
+            </RegExp>
+            <expression noclean="1"></expression>
+        </RegExp>
+    </GetLargeBio>
+</scraper>
\ No newline at end of file
diff --git 
a/metadata.artists.metal-archives.com/resources/language/English/strings.xml 
b/metadata.artists.metal-archives.com/resources/language/English/strings.xml
index a5df22f..4e8e332 100644
--- a/metadata.artists.metal-archives.com/resources/language/English/strings.xml
+++ b/metadata.artists.metal-archives.com/resources/language/English/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <strings>
     <string id="30000">Enable Fanart</string>
-    <string id="30001">Grab artist thumbs from Last.fm</string>
-    <string id="30002">Grab artist thumbs from HTBackdrops</string>
-    <string id="30003">Grab artist thumbs from metal-archives.com</string>
+    <string id="30001">Enable artist thumbs from HTBackdrops</string>
+    <string id="30002">Enable artist thumbs from metal-archives.com</string>
+       <string id="30003">Show Single/EP/Live/Videos in artist discography 
tab</string>
 </strings>
diff --git 
a/metadata.artists.metal-archives.com/resources/language/Hungarian/strings.xml 
b/metadata.artists.metal-archives.com/resources/language/Hungarian/strings.xml
index a1fa053..fff34b3 100644
--- 
a/metadata.artists.metal-archives.com/resources/language/Hungarian/strings.xml
+++ 
b/metadata.artists.metal-archives.com/resources/language/Hungarian/strings.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <strings>
     <string id="30000">Fanartképek engedélyezése</string>
-    <string id="30001">Előadó bélyegképek a Last.fm-ről</string>
-    <string id="30002">Előadó bélyegképek a HTBackdrops-ról</string>
-    <string id="30003">Előadó bélyegképek a 
metal-archives.com-ról</string>
+    <string id="30001">Előadó bélyegképek a HTBackdrops-ról</string>
+    <string id="30002">Előadó bélyegképek a 
metal-archives.com-ról</string>
+       <string id="30003">Megjelenítése Single/EP/live/Videók művész 
diszkográfia fülön</string>
 </strings>
diff --git 
a/metadata.artists.metal-archives.com/resources/language/Polish/strings.xml 
b/metadata.artists.metal-archives.com/resources/language/Polish/strings.xml
index 6ae4d63..3208869 100644
--- a/metadata.artists.metal-archives.com/resources/language/Polish/strings.xml
+++ b/metadata.artists.metal-archives.com/resources/language/Polish/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <strings>
     <string id="30000">Włącz fanart</string>
-    <string id="30001">Pobieraj zdjęcia artystów z Last.fm</string>
-    <string id="30002">Pobieraj zdjęcia artystów z HTBackdrops</string>
-    <string id="30003">Pobieraj zdjęcia artystów z 
metal-archives.com</string>
-</strings>
+    <string id="30001">Pobieraj zdjęcia artystów z HTBackdrops</string>
+    <string id="30002">Pobieraj zdjęcia artystów z 
metal-archives.com</string>
+    <string id="30003">Pokaż Single/EP/live/Filmy w zakładce dyskografia 
artysty</string>
+       </strings>
diff --git a/metadata.artists.metal-archives.com/resources/settings.xml 
b/metadata.artists.metal-archives.com/resources/settings.xml
index 4c90f8a..002aa71 100644
--- a/metadata.artists.metal-archives.com/resources/settings.xml
+++ b/metadata.artists.metal-archives.com/resources/settings.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
     <setting label="30000" type="bool" id="htbfanart" default="true"/>
-    <setting label="30001" type="bool" id="lastfmartistthumbs" 
default="false"/>
-    <setting label="30002" type="bool" id="htbthumbs" default="true"/>
-    <setting label="30003" type="bool" id="maartistthumbs" default="true"/>
+    <setting label="30001" type="bool" id="htbthumbs" default="true"/>
+    <setting label="30002" type="bool" id="maartistthumbs" default="true"/>
+       <setting type="sep" />
+       <setting label="30003" type="bool" id="getalldisc" default="false"/>
 </settings>

http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=51c36470406d327d44b68e9bbe47fedcd243e002

commit 51c36470406d327d44b68e9bbe47fedcd243e002
Author: Martijn Kaijser <[email protected]>
Date:   Sat Aug 16 10:10:04 2014 +0200

    [metadata.albums.metal-archives.com] 2.0.0

diff --git a/metadata.albums.metal-archives.com/addon.xml 
b/metadata.albums.metal-archives.com/addon.xml
index 128294f..6ecf57d 100644
--- a/metadata.albums.metal-archives.com/addon.xml
+++ b/metadata.albums.metal-archives.com/addon.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.albums.metal-archives.com"
        name="Encyclopaedia Metallum"
-       version="1.0.4"
-       provider-name="spiff">
+       version="2.0.0"
+       provider-name="farlight">
   <requires>
-    <import addon="xbmc.metadata" version="1.0"/>
-    <import addon="metadata.common.htbackdrops.com" version="1.0.1"/>
-    <import addon="metadata.common.last.fm" version="1.0.1"/>
+    <import addon="xbmc.metadata" version="2.1.0"/>
   </requires>
   <extension point="xbmc.metadata.scraper.albums"
              language="en"
              library="metal-archives.xml"/>
   <extension point="xbmc.addon.metadata">
-    <summary>Download information about your metal from Encyclopaedia 
Metallum</summary>
+    <summary lang="en">Download information about your metal from 
Encyclopaedia Metallum</summary>
+    <summary lang="es">Descarga información desde Encyclopaedia 
Metallum</summary>
     <summary lang="hu">Encyclopaedia Metallum album információk</summary>
     <summary lang="pl">Pobieraj informacje z Encyklopedii Metallum</summary>
-    <description>Encyclopaedia Metallum: The Metal Archives is a website which 
lists bands from various forms of heavy metal music.
-
-Encyclopaedia Metallum attempts to provide comprehensive information on each 
band, such as a discography, logos, pictures, lyrics, line-ups, biography, 
trivia and user-submitted reviews.
-
-The site also provides a system for submitting bands to the archives, and 
users are encouraged to use it. The site has 73,000+ bands listed, 170,000+ 
releases, 1,196,000+ tracks, 52,000+ reviews and 227,000+ registered users. It 
is one of the top 500 most-visited websites in five countries.</description>
-    <description lang="hu">A Metal Archives egy weboldal ami a heavy metal 
zene különböző formáit listázza.
-Az oldal megpróbál átfogó információkat nyújtani minden egyes 
csapatról, mint a diszkográfia, logók, képek, dalszövegek, felállások, 
életrajzok és felhasználói vélemények.
-Továbbá egy olyan rendszert nyújt melyben a felhasználók bátorítva 
vannak, hogy együtteseket, információkat adjanak hozzá az adatbázishoz. Az 
oldalon 73,000+ együttes van listázva, 1,196,000+ szám, 52,000+ kritika és 
227,000+ regisztrált felhasználó. A webhely benne van az 500 
leglátogatottabb weboldal között öt országban.</description>
+    <description lang="en">Encyclopaedia Metallum: The Metal Archives is a 
website which lists bands from various forms of heavy metal music. 
Encyclopaedia Metallum attempts to provide comprehensive information on each 
band, such as a discography, logos, pictures, lyrics, line-ups, biography, 
trivia and user-submitted reviews. The site also provides a system for 
submitting bands to the archives, and users are encouraged to use it. The site 
has 73,000+ bands listed, 170,000+ releases, 1,196,000+ tracks, 52,000+ reviews 
and 227,000+ registered users. It is one of the top 500 most-visited websites 
in five countries.</description>
+    <description lang="es">Encyclopaedia Metallum: The Metal Archives es un 
lugar donde encontrar información sobre toda la musica heavy metal. 
Encyclopaedia Metallum intenta tener toda la información relevante sobre 
cualquier banda del metal, discografía, logos, imágenes, letras, músicos, 
biografía y reviews de usuarios. La web tiene un sistema para añadir nuevas 
bandas por usuarios que mantienen los propios usuarios. Actualmente contiene 
mas de 73.000 bandas, mas de 170.000 ediciones, mas de 1.196.000 canciones, mas 
de 52.000 reviews y mas de 227.000 usuarios registrados. Es una de las 500 webs 
mas visitadas mundialmente.</description>
+    <description lang="hu">A Metal Archives egy weboldal ami a heavy metal 
zene különböző formáit listázza. Az oldal megpróbál átfogó 
információkat nyújtani minden egyes csapatról, mint a diszkográfia, 
logók, képek, dalszövegek, felállások, életrajzok és felhasználói 
vélemények.Továbbá egy olyan rendszert nyújt melyben a felhasználók 
bátorítva vannak, hogy együtteseket, információkat adjanak hozzá az 
adatbázishoz. Az oldalon 73,000+ együttes van listázva, 1,196,000+ szám, 
52,000+ kritika és 227,000+ regisztrált felhasználó. A webhely benne van az 
500 leglátogatottabb weboldal között öt országban.</description>
     <description lang="pl">Encyklopedia Metallum: Metalowe Archiwa to strona 
skupiająca metalowe kapele. Serwis stara się zbierać wszystkie informacje o 
formacjach metalowych i ich twórczości (dyskografie, logotypy, zdjęcia, 
teksty, biografie, ciekawostki i recenzje użytkowników).</description>
-    <platform>all</platform>
+    <language></language>
+       <platform>all</platform>
+       <website></website>
+    
<source>https://github.com/farlight1/metadata.albums.metal-archives.com</source>
+    <email></email>
+    <forum></forum>
+    <license>GPL v2.0</license>
   </extension>
-</addon>
+</addon>
\ No newline at end of file
diff --git a/metadata.albums.metal-archives.com/changelog.txt 
b/metadata.albums.metal-archives.com/changelog.txt
index a646f80..270274b 100644
--- a/metadata.albums.metal-archives.com/changelog.txt
+++ b/metadata.albums.metal-archives.com/changelog.txt
@@ -1,3 +1,15 @@
+[B]2.0.0[/B]
+Updated Scraper.
+Added type of album EP/Full/Single...
+Added album release date.
+Removed LastFM thumbs
+Removed HBTBackdrop thumbs
+Added Spanish translation.
+First version provided by farlight
+
+[B]1.0.4[/B]
+last release by spiff
+
 [B]1.0.3[/B]
 Added new icon.
 
diff --git a/metadata.albums.metal-archives.com/metal-archives.xml 
b/metadata.albums.metal-archives.com/metal-archives.xml
index e271b4f..d8cdb18 100644
--- a/metadata.albums.metal-archives.com/metal-archives.xml
+++ b/metadata.albums.metal-archives.com/metal-archives.xml
@@ -1,58 +1,64 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<scraper framework="1.1" date="2010-05-25">
-       <NfoUrl dest="3">
-               <RegExp input="$$1" 
output="&lt;url&gt;http://www.\1&lt;/url&gt;"; dest="3">
-                       <expression>(metal-archives.com/.*)</expression>
-               </RegExp>
-       </NfoUrl>
-       <CreateAlbumSearchUrl SearchStringEncoding="iso-8859-1" dest="3">
-               <RegExp input="$$1" 
output="&lt;url&gt;http://www.metal-archives.com/search.php?string=\1&amp;amp;type=album&lt;/url&gt;";
 dest="3">
-                       <expression/>
-               </RegExp>
-       </CreateAlbumSearchUrl>
-       <GetAlbumSearchResults dest="8">
-               <RegExp input="$$5" output="&lt;results&gt;\1&lt;/results&gt;" 
dest="8">
-                       <RegExp input="$$1" 
output="&lt;entity&gt;&lt;artist&gt;\1&lt;/artist&gt;&lt;title&gt;\3&lt;/title&gt;&lt;url&gt;http://www.metal-archives.com/\2&lt;/url&gt;&lt;/entity&gt;";
 dest="5+">
-                               <expression repeat="yes" noclean="2">&lt;a 
href='band.php[^']*'&gt;(.*?)&lt;/a&gt;&lt;/td&gt;&lt;td&gt;&lt;a 
href='(release.php[^']*)'&gt;(.*?)&lt;/a&gt;</expression>
-                       </RegExp>
-                       <expression noclean="1"/>
-               </RegExp>               
-       </GetAlbumSearchResults>
-       <GetAlbumDetails dest="3">
-               <RegExp input="$$5" output="&lt;?xml version=&quot;1.0&quot; 
encoding=&quot;iso-8859-1&quot;?&gt;&lt;details&gt;\1&lt;/details&gt;" dest="3">
-                       <RegExp input="$$1" 
output="&lt;artist&gt;\1&lt;/artist&gt;&lt;title&gt;\2&lt;/title&gt;" dest="5+">
-                               <expression>Encyclopaedia Metallum - (.*?) - 
(.*)&lt;/title&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="\1" dest="8">
-                               <expression encode="1">Encyclopaedia Metallum - 
(.*?) - .*&lt;/title&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="\1" dest="9">
-                               <expression encode="1">Encyclopaedia Metallum - 
.*? - (.*)&lt;/title&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;label&gt;\1&lt;/label&gt;" dest="5+">
-                               <expression trim="1">&lt;td 
valign=&quot;top&quot;&gt;.*?, ([^&lt;]*)&lt;br&gt;.*?.*? 
&lt;b&gt;([0-9]+)&lt;/b&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" 
output="&lt;track&gt;&lt;title&gt;\2&lt;/title&gt;&lt;position&gt;\1&lt;/position&gt;&lt;duration&gt;\3&lt;/duration&gt;&lt;/track&gt;"
 dest="5+">
-                               <expression 
repeat="yes">&lt;td&gt;([0-9]+)\.&lt;/td&gt;&lt;td&gt;([^&lt;]*)&lt;/td&gt;&lt;td
 align='center'&gt;([^&lt;]*)&lt;/td&gt;</expression>
-                       </RegExp>
-                       <RegExp input="$$1" output="&lt;url 
function=&quot;GetAlbumReview&quot;&gt;http://www.metal-archives.com/\1&lt;/url&gt;&lt;rating
 max=&quot;100&quot;&gt;\2&lt;/rating&gt;" dest="5+">
-                               <expression noclean="1">&lt;a 
href='newreview.php[^']*'>.*?&lt;br&gt;\[Average rating for &lt;a 
href='(review.php[^']*)'&gt;.*?&lt;b&gt;([0-9]+)%</expression>
-                       </RegExp>
-                       <RegExp input="$$1" conditional="lastfmalbumthumbs" 
output="&lt;chain 
function=&quot;GetLastFMAlbumThumbs&quot;&gt;$$8::$$9&lt;/chain&gt;" dest="5+">
-                               <expression encode="1"/>
-                       </RegExp>
-                       <RegExp conditional="maalbumthumbs" input="$$1" 
output="&lt;thumb&gt;\1&lt;/thumb&gt;" dest="5+">
-                               <expression noclean="1">&lt;a 
href=&quot;(http://www.metal-archives.com/images[^&quot;]*)&quot;&gt;</expression>
-                       </RegExp>
-                       <expression noclean="1"/>
-               </RegExp>
-       </GetAlbumDetails>
-       <GetAlbumReview dest="3">
-               <RegExp input="$$5" output="&lt;?xml version=&quot;1.0&quot; 
encoding=&quot;iso-8850-1&quot;?>&lt;details&gt;\1&lt;/details&gt;" dest="3">
-                       <RegExp input="$$1" 
output="&lt;review&gt;\1&lt;/review&gt;" dest="5">
-                               <expression trim="1">&lt;table 
width=.*?&lt;/font&gt;(.*?)&lt;/table&gt;</expression>
-                       </RegExp>
-                       <expression noclean="1"/>
-               </RegExp>
-       </GetAlbumReview>
-</scraper>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<scraper thumb="" date="2014-08-12" framework="1.1" name="">
+    <NfoUrl dest="3">
+        <RegExp dest="3" output="&lt;url&gt;http://www.\1&lt;/url&gt;"; 
input="$$1">
+            <expression>(metal-archives.com/.*)</expression>
+        </RegExp>
+    </NfoUrl>
+    <CreateAlbumSearchUrl dest="3" SearchStringEncoding="iso-8859-1">
+        <RegExp dest="3" 
output="&lt;url&gt;http://www.metal-archives.com/search/ajax-album-search/?field=title&amp;amp;query=\1&lt;/url&gt;";
 input="$$1">
+            <expression/>
+        </RegExp>
+    </CreateAlbumSearchUrl>
+    <GetAlbumSearchResults dest="8">
+        <RegExp dest="8" output="&lt;results&gt;\1&lt;/results&gt;" 
input="$$5">
+            <RegExp dest="5+" 
output="&lt;entity&gt;&lt;artist&gt;\1&lt;/artist&gt;&lt;title&gt;\3&lt;/title&gt;&lt;url&gt;\2&lt;/url&gt;&lt;/entity&gt;"
 input="$$1">
+                <expression repeat="yes" 
noclean="2">title=.+?&quot;&gt;([^&lt;]*).+?(http://www.metal-archives.com.+?)\\&quot;&gt;([^&lt;]*)</expression>
+            </RegExp>
+            <expression noclean="1"></expression>
+        </RegExp>
+    </GetAlbumSearchResults>
+    <GetAlbumDetails dest="3">
+        <RegExp dest="3" output="&lt;?xml version=&quot;1.0&quot; 
encoding=&quot;iso-8859-1&quot;?&gt;&lt;details&gt;\1&lt;/details&gt;" 
input="$$5">
+            <RegExp dest="5+" 
output="&lt;title&gt;\2&lt;/title&gt;&lt;artist&gt;\1&lt;/artist&gt;" 
input="$$1">
+                <expression>&lt;title&gt;(.*?) - (.*) - 
Encyclopaedia</expression>
+            </RegExp>
+            <RegExp dest="8" output="\1" input="$$1">
+                <expression encode="1">&lt;title&gt;(.*?) - .* - 
Encyclopaedia</expression>
+            </RegExp>
+            <RegExp dest="9" output="\1" input="$$1">
+                <expression encode="1">&lt;title&gt;.*? - (.*) - 
Encyclopaedia</expression>
+            </RegExp>
+            <RegExp dest="5+" 
output="&lt;releasedate&gt;\1&lt;/releasedate&gt;" input="$$1">
+                <expression trim="1">&lt;dt&gt;Release 
date:&lt;/dt&gt;.+?&lt;dd&gt;(.*?)&lt;/dd&gt;</expression>
+            </RegExp>
+            <RegExp dest="5+" output="&lt;label&gt;\1&lt;/label&gt;" 
input="$$1">
+                <expression 
trim="1">&lt;dt&gt;Label:&lt;/dt&gt;.+?&quot;&gt;(.*?)&lt;/a&gt;</expression>
+            </RegExp>
+            <RegExp dest="5+" output="&lt;type&gt;\1&lt;/type&gt;" input="$$1">
+                <expression 
trim="1">&lt;dt&gt;Type:&lt;/dt&gt;.+?&lt;dd&gt;(.*?)&lt;/dd&gt;</expression>
+            </RegExp>
+            <RegExp dest="5+" output="&lt;year&gt;\1&lt;/year&gt;" input="$$1">
+                <expression trim="1">&lt;dt&gt;Release date:&lt;/dt&gt;.+?, 
(.*?)&lt;/dd&gt;</expression>
+            </RegExp>
+            <RegExp dest="5+" 
output="&lt;track&gt;&lt;title&gt;\2&lt;/title&gt;&lt;position&gt;\1&lt;/position&gt;&lt;duration&gt;\3&lt;/duration&gt;&lt;/track&gt;"
 input="$$1">
+                <expression 
repeat="yes">&lt;/a&gt;([0-9])\.&lt;/td&gt;.+?Words&quot;&gt;\s+(.*?)\s+&lt;/td&gt;.+?&lt;td
 align=&quot;right&quot;&gt;([0-9:]+)&lt;/td&gt;</expression>
+            </RegExp>
+            <RegExp dest="5+" output="&lt;url 
function=&quot;GetAlbumReview&quot;&gt;\1&lt;/url&gt;&lt;rating 
max=&quot;100&quot;&gt;\2&lt;/rating&gt;" input="$$1">
+                <expression noclean="1">&lt;a 
href=&quot;(http://www\.metal-archives.com/reviews.*?)&quot;.+?&lt;td&gt;([0-9]+)%&lt;/td&gt;</expression>
+            </RegExp>
+            <RegExp dest="5+" output="&lt;thumb&gt;\1&lt;/thumb&gt;" 
input="$$1" conditional="maalbumthumbs">
+                <expression 
noclean="1">id=&quot;cover&quot;.+?href=&quot;(.*?)\&quot;</expression>
+            </RegExp>
+            <expression noclean="1"></expression>
+        </RegExp>
+    </GetAlbumDetails>
+    <GetAlbumReview dest="3">
+        <RegExp dest="3" output="&lt;?xml version=&quot;1.0&quot; 
encoding=&quot;iso-8850-1&quot;?&gt;&lt;details&gt;\1&lt;/details&gt;" 
input="$$5">
+            <RegExp dest="5" output="&lt;review&gt;\1&lt;/review&gt;" 
input="$$1">
+                <expression trim="1">&lt;p 
id=&quot;reviewText.+?&gt;(.*?)&lt;/p&gt;</expression>
+            </RegExp>
+            <expression noclean="1"></expression>
+        </RegExp>
+    </GetAlbumReview>
+</scraper>
\ No newline at end of file
diff --git 
a/metadata.albums.metal-archives.com/resources/language/English/strings.xml 
b/metadata.albums.metal-archives.com/resources/language/English/strings.xml
index 38bc724..068fd6f 100644
--- a/metadata.albums.metal-archives.com/resources/language/English/strings.xml
+++ b/metadata.albums.metal-archives.com/resources/language/English/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <strings>
-    <string id="30000">Grab album thumbs from metal-archives.com</string>
-    <string id="30001">Grab album thumbs from Last.fm</string>
+    <string id="30000">Enable album thumbs from metal-archives.com</string>
 </strings>
diff --git 
a/metadata.albums.metal-archives.com/resources/language/Hungarian/strings.xml 
b/metadata.albums.metal-archives.com/resources/language/Hungarian/strings.xml
index 21046d5..12813f3 100644
--- 
a/metadata.albums.metal-archives.com/resources/language/Hungarian/strings.xml
+++ 
b/metadata.albums.metal-archives.com/resources/language/Hungarian/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <strings>
     <string id="30000">Album bélyegképek letöltése a 
metal-archives.com-ról</string>
-    <string id="30001">Album bélyegképek letöltése a Last.fm-ről</string>
 </strings>
diff --git 
a/metadata.albums.metal-archives.com/resources/language/Polish/strings.xml 
b/metadata.albums.metal-archives.com/resources/language/Polish/strings.xml
index f34ce0c..3c4c117 100644
--- a/metadata.albums.metal-archives.com/resources/language/Polish/strings.xml
+++ b/metadata.albums.metal-archives.com/resources/language/Polish/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <strings>
     <string id="30000">Pobieraj okładki albumów z metal-archives.com</string>
-    <string id="30001">Pobieraj okładki albumów z Last.fm</string>
 </strings>
diff --git a/metadata.albums.metal-archives.com/resources/settings.xml 
b/metadata.albums.metal-archives.com/resources/settings.xml
index 826eab9..c825a39 100644
--- a/metadata.albums.metal-archives.com/resources/settings.xml
+++ b/metadata.albums.metal-archives.com/resources/settings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
     <setting label="30000" type="bool" id="maalbumthumbs" default="true"/>
-    <setting label="30001" type="bool" id="lastfmalbumthumbs" default="false"/>
 </settings>

-----------------------------------------------------------------------

Summary of changes:
 .../LICENSE                                        |    1 -
 metadata.albums.metal-archives.com/README.md       |    4 +
 metadata.albums.metal-archives.com/addon.xml       |   32 ++--
 metadata.albums.metal-archives.com/changelog.txt   |   12 ++
 .../metal-archives.xml                             |  122 ++++++++-------
 .../resources/language/English/strings.xml         |    3 +-
 .../resources/language/Hungarian/strings.xml       |    3 +-
 .../resources/language/Polish/strings.xml          |    1 -
 .../resources/language/Spanish/strings.xml         |    4 +
 .../resources/settings.xml                         |    1 -
 .../LICENSE                                        |    1 -
 metadata.artists.metal-archives.com/README.md      |    4 +
 metadata.artists.metal-archives.com/addon.xml      |   29 ++--
 metadata.artists.metal-archives.com/changelog.txt  |   11 ++
 .../metal-archives.xml                             |  161 +++++++++++--------
 .../resources/language/English/strings.xml         |    6 +-
 .../resources/language/Hungarian/strings.xml       |    8 +-
 .../resources/language/Polish/strings.xml          |    8 +-
 .../resources/language/Spanish/strings.xml         |    7 +
 .../resources/settings.xml                         |    7 +-
 20 files changed, 247 insertions(+), 178 deletions(-)
 copy metadata.atmovies.com.tw/LICENSE.txt => 
metadata.albums.metal-archives.com/LICENSE (99%)
 create mode 100644 metadata.albums.metal-archives.com/README.md
 create mode 100644 
metadata.albums.metal-archives.com/resources/language/Spanish/strings.xml
 copy metadata.atmovies.com.tw/LICENSE.txt => 
metadata.artists.metal-archives.com/LICENSE (99%)
 create mode 100644 metadata.artists.metal-archives.com/README.md
 create mode 100644 
metadata.artists.metal-archives.com/resources/language/Spanish/strings.xml


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to