diff options
Diffstat (limited to 'addons/metadata.common.allmusic.com/allmusic.xml')
-rw-r--r-- | addons/metadata.common.allmusic.com/allmusic.xml | 91 |
1 files changed, 44 insertions, 47 deletions
diff --git a/addons/metadata.common.allmusic.com/allmusic.xml b/addons/metadata.common.allmusic.com/allmusic.xml index a0484f7ef4..adea10abae 100644 --- a/addons/metadata.common.allmusic.com/allmusic.xml +++ b/addons/metadata.common.allmusic.com/allmusic.xml @@ -1,8 +1,8 @@ <scraperfunctions> <GetAMGDiscography dest="5"> <RegExp input="$$2$$3" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<album><year>\1</year><title>\3</title><label>\5</label></album>" dest="2"> - <expression repeat="yes" clear="yes" noclean="1,3,4">sorted-cell">([0-9]+)</td><td[^>]*>(<a href=[^>]*><img [^>]*/></a>|[^<]*)?</td><td[^>]*><a href=[^>]*>([^<]*)</a></td><td[^<]*[^>]*>[^>]*>(</a></td><td[^>]*>)?([^<]+)</td></expression> + <RegExp input="$$1" output="<album><year>\1</year><title>\2</title><label>\3</label></album>" dest="2"> + <expression repeat="yes" clear="yes" noclean="1,3,4"><td class="sorted cell">([^<]*)</td>.*?<td class="cell"><a href="[^>]*>([^<]*)<.*?<td class="cell">([^<]*)<</expression> </RegExp> <RegExp input="$$2" output="\1&amp;\2" dest="3"> <expression repeat="yes" noclean="1,2">(.*?)&(.+)</expression> @@ -16,7 +16,7 @@ <GetAMGBiography dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<biography>\1</biography>" dest="2"> - <expression clear="yes">Biography</td>.*?<p>(.*?)</p></expression> + <expression clear="yes">Biography</h2>.*?</p>(.*?)</p></expression> </RegExp> <expression noclean="1"/> </RegExp> @@ -24,124 +24,121 @@ <GetAMGReview dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<review>\1</review>" dest="2"> - <expression>Review</td>.*?<p>(.*?)</p></expression> + <expression><h2 class="title">Review</h2>.*?</p>(.*?)</p></expression> </RegExp> - <expression noclean="1"/> + <expression noclean="1" /> </RegExp> </GetAMGReview> <ParseAMGArtist dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$1" output="<name>\1</name>" dest="5"> - <expression noclean="1"><TITLE>allmusic[ (]+ ([^>]*) > Overview</expression> + <expression noclean="1"><meta name="title" content="([^"]*)</expression> </RegExp> <RegExp input="$$1" output="<born>\1</born>" dest="5+"> - <expression><span>Born.*?;">(.*?)</td></expression> + <expression><h3>Born[^>]*>[^>]*>(.*?)</p></expression> </RegExp> <RegExp input="$$1" output="<died>\1</died>" dest="5+"> - <expression><span>Died.*?;">(.*?)</td></expression> + <expression><h3>Died[^>]*>[^>]*>(.*?)</p></expression> </RegExp> <RegExp input="$$1" output="<formed>\1</formed>" dest="5+"> - <expression><span>Formed.*?;">(.*?)</td></expression> + <expression><h3>Formed[^>]*>[^>]*>(.*?)</p></expression> </RegExp> <RegExp input="$$1" output="<disbanded>\1</disbanded>" dest="5+"> - <expression><span>Disbanded.*?;">(.*?)</td></expression> + <expression><h3>Disbanded[^>]*>[^>]*>(.*?)</p></expression> </RegExp> <RegExp input="$$1" output="\1" dest="6"> - <expression noclean="1">Years Active-->([^!]*)<!--Years Active</expression> + <expression noclean="1"><h3>Years Active</h3>(.*?)</p></expression> </RegExp> - <RegExp input="$$6" output="\1's/" dest="7+"> - <expression repeat="yes"><div class="timeline-sub-active">([0-9]+)</div></expression> + <RegExp input="$$6" output="\1's/" dest="7+"> + <expression repeat="yes"><span class="active">([0-9]+)</span></expression> </RegExp> <RegExp input="$$7" output="<yearsactive>\1</yearsactive>" dest="5+"> <expression noclean="1">(.+)/</expression> - </RegExp> + </RegExp> <RegExp input="$$1" output="\1" dest="6"> - <expression noclean="1">Genre Listing-->([^!]*)<!--Genre Listing</expression> + <expression noclean="1"><h3>Genres</h3>(.*?)</div></expression> </RegExp> - <RegExp input="$$6" output="<genre>\1</genre>" dest="5+"> - <expression noclean="1" repeat="yes"><li>[^>]*>([^<]*)</a></li></expression> + <RegExp input="$$6" output="<genre>\2</genre>" dest="5+"> + <expression repeat="yes" noclean="1"><a href="/explore/genre/[^>]*>(<strong>)?([^<]*)</expression> </RegExp> <RegExp input="$$1" output="\1" dest="7"> - <expression noclean="1">Style Listing-->([^!]*)<!--Style Listing</expression> + <expression noclean="1"><h3>Styles</h3>(.*?)</div></expression> </RegExp> <RegExp input="$$7" output="<style>\1</style>" dest="5+"> - <expression noclean="1" repeat="yes"><li>[^>]*>([^<]*)</a></li></expression> + <expression repeat="yes" noclean="1"><li>[^>]*>([^<]*)</a></li></expression> </RegExp> <RegExp input="$$1" output="\1" dest="8"> - <expression noclean="1">Moods Listing-->([^!]*)<!--Moods Listing</expression> + <expression noclean="1"><h3>Moods</h3>(.*?)</div></expression> </RegExp> <RegExp input="$$8" output="<mood>\1</mood>" dest="5+"> - <expression noclean="1" repeat="yes"><li>[^>]*>([^<]*)</a></li></expression> + <expression repeat="yes" noclean="1"><li>[^>]*>([^<]*)</a></li></expression> </RegExp> <RegExp input="$$1" output="\1" dest="9"> - <expression noclean="1">Instruments Listing-->([^!]*)<!--Instruments Listing</expression> + <expression noclean="1"><h3>Instruments</h3>(.*?)</div></expression> </RegExp> <RegExp input="$$9" output="<instruments>\1</instruments>" dest="5+"> - <expression noclean="1" repeat="yes"><li>[^>]*>([^<]*)</a></li></expression> - </RegExp> - <RegExp input="$$1" conditional="allmusicartistthumbs" output="<thumb>\1</thumb>" dest="5+"> - <expression noclean="1"><img src="([^"]*)" id="Picture"</expression> + <expression repeat="yes" noclean="1"><li>[^>]*>([^<]*)</a></li></expression> </RegExp> - <RegExp input="$$1" conditional="allmusicartistthumbs" output="<thumb>http://image.allmusic.com/00/amg/pic200/dr\1\200/\1\2\3\4/\1\2\3\4\5.jpg</thumb>" dest="5+"> - <expression noclean="1" repeat="yes">"([A-Z^])([0-9^])([0-9^])([0-9^])([^"]*)"</expression> + <RegExp conditional="allmusicartistthumbs" input="$$1" output="<thumb>\1</thumb>" dest="5+"> + <expression noclean="1"><img id="artist_image" src="([^"]*)"</expression> </RegExp> - <expression noclean="1"/> + <expression noclean="1" /> </RegExp> </ParseAMGArtist> <ParseAMGAlbum dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$1" output="<title>\1</title>" dest="5"> - <expression noclean="1"><TITLE>allmusic[ (]+ ([^>]*) > Overview</expression> + <expression trim="1" noclean="1"><meta name="title" content="([^-]*)-[^<]*" /></expression> </RegExp> <RegExp input="$$1" output="<artist>\1</artist>" dest="5+"> - <expression noclean="1"><span>Artist</span>[^;]*[^>]*>[^>]*>([^<]*)</expression> + <expression noclean="1"><meta name="title" content="[^-]*- ([^<]*)" /></expression> </RegExp> <RegExp input="$$1" output="<rating>\1</rating>" dest="5+"> - <expression noclean="1"><span>Rating</span>[^_]*_r([0-9^]*)</expression> + <expression noclean="1"><h3>Rating</h3>[^_]*_r([0-9^]*)</expression> </RegExp> <RegExp input="$$1" output="<label>\1</label>" dest="5+"> - <expression noclean="1"><span>Label</span>[^;]*[^>]*>([^<]*)</expression> + <expression noclean="1"><h3>Label</h3>[^>]*>([^<]*)</expression> </RegExp> <RegExp input="$$1" output="<type>\1</type>" dest="5+"> - <expression noclean="1"><span>Type</span>[^;]*[^>]*>([^<]*)</expression> + <expression noclean="1"><h3>Type</h3>[^>]*>([^<]*)</expression> </RegExp> <RegExp input="$$1" output="<releasedate>\1</releasedate>" dest="5+"> - <expression noclean="1"><span>Release Date</span>[^;]*[^>]*>([^<]*)</expression> + <expression noclean="1"><h3>Release Date</h3>[^>]*>([^<]*)</expression> </RegExp> <RegExp input="$$1" output="<year>\1</year>" dest="5+"> <expression noclean="1"><span>Release Date.*?([0-9]+)</</expression> </RegExp> <RegExp input="$$1" output="\1" dest="6"> - <expression noclean="1">Genre[s]* Listing-->([^!]*)<!--Genre[s]* Listing</expression> + <expression noclean="1"><h3>Genre[s]?</h3>(.*?)</div></expression> </RegExp> <RegExp input="$$6" output="<genre>\1</genre>" dest="5+"> - <expression noclean="1" repeat="yes"><li>[^>]*>([^<]*)</a></li></expression> + <expression repeat="yes" trim="1" noclean="1"><li>[^>]*>([^<]*)</a></li></expression> </RegExp> <RegExp input="$$1" output="\1" dest="7"> - <expression noclean="1">Style[s]* Listing-->([^!]*)<!--Style[s]* Listing</expression> + <expression noclean="1"><h3>Style[s]?</h3>(.*?)</div></expression> </RegExp> <RegExp input="$$7" output="<style>\1</style>" dest="5+"> - <expression noclean="1" repeat="yes"><li>[^>]*>([^<]*)</a></li></expression> + <expression repeat="yes" trim="1" noclean="1"><li>[^>]*>([^<]*)</a></li></expression> </RegExp> <RegExp input="$$1" output="\1" dest="8"> - <expression noclean="1">Mood[s]* Listing-->([^!]*)<!--Mood[s]* Listing</expression> + <expression trim="1" noclean="1"><h3>Mood[s]?</h3>(.*?)</div></expression> </RegExp> <RegExp input="$$8" output="<mood>\1</mood>" dest="5+"> - <expression noclean="1" repeat="yes"><li>[^>]*>([^<]*)</a></li></expression> + <expression repeat="yes" noclean="1"><li>[^>]*>([^<]*)</a></li></expression> </RegExp> <RegExp input="$$1" output="\1" dest="9"> - <expression noclean="1">Theme[s]* Listing-->([^!]*)<!--Theme[s]* Listing</expression> + <expression noclean="1"><h3>Theme[s]?</h3>(.*?)</div></expression> </RegExp> <RegExp input="$$9" output="<theme>\1</theme>" dest="5+"> - <expression noclean="1" repeat="yes"><li>[^>]*>([^<]*)</a></li></expression> + <expression repeat="yes" noclean="1"><li>[^>]*>([^<]*)</a></li></expression> </RegExp> - <RegExp input="$$1" output="<track><position>\1</position><title>\3</title><duration>\4</duration></track>" dest="5+"> - <expression noclean="1,2,3" repeat="yes">"cell">([0-9]+)</.*?sql=([0-9:a-z]*)">(.*?)</a>.*?"right".*?>(.*?)</</expression> + <RegExp input="$$1" output="<track><position>\1</position><title>\2</title><duration>\3</duration></track>" dest="5+"> + <expression repeat="yes" noclean="1,2,3">"cell">([0-9]+)<.*?<td class="cell">[^>]*>([^<]*)</a></td>.*?<td class="cell">([0-9]*:[0-9]*)</td></expression> </RegExp> - <RegExp input="$$1" conditional="allmusicalbumthumbs" output="<thumb>http://image.allmusic.com/\1</thumb>" dest="5+"> + <RegExp conditional="allmusicalbumthumbs" input="$$1" output="<thumb>http://image.allmusic.com/\1</thumb>" dest="5+"> <expression noclean="1">http://image.allmusic.com/([^"]*)"</expression> </RegExp> - <expression noclean="1"/> + <expression noclean="1" /> </RegExp> </ParseAMGAlbum> </scraperfunctions> |