From 1f2f375cd4c4ec991538631db7d8d5804e5d31c9 Mon Sep 17 00:00:00 2001 From: nadasb Date: Sat, 23 Oct 2010 07:15:57 +0000 Subject: sync with scrapers git git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@34960 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 --- addons/metadata.albums.allmusic.com/addon.xml | 4 +- addons/metadata.albums.allmusic.com/allmusic.xml | 35 ++++----- .../resources/settings.xml | 2 +- addons/metadata.artists.allmusic.com/addon.xml | 4 +- addons/metadata.artists.allmusic.com/allmusic.xml | 26 +++---- addons/metadata.common.allmusic.com/addon.xml | 2 +- addons/metadata.common.allmusic.com/allmusic.xml | 91 +++++++++++----------- 7 files changed, 79 insertions(+), 85 deletions(-) (limited to 'addons') diff --git a/addons/metadata.albums.allmusic.com/addon.xml b/addons/metadata.albums.allmusic.com/addon.xml index 284d2e61f6..abc705ac57 100644 --- a/addons/metadata.albums.allmusic.com/addon.xml +++ b/addons/metadata.albums.allmusic.com/addon.xml @@ -1,12 +1,12 @@ - + - + (allmusic.com/cg/.*) - - + + - - <TITLE>allmusic[ (]+ ([^>]*) > Overview + + <td class="text-center">[^<]*<a href.*?www.allmusic.com/album/([^"]*)">([^<]*).*?<td>([^<]*)</td>.*?<td>.*?<td>([^<]*) - - >([0-9]+)?[^>]*>[^>]*>([^<]*)</TD><td class="cell-img.*?sql=([0-9:a-z]*)">(.*?)<. - - - >([0-9]+)?</.*?>([a-zA-Z0-9].*?)<.*?sql=([0-9:a-z]*)">(.*?)<. + + <td class="text-center">[^<]*</td>.*?www.allmusic.com/album/([^"]*)">([^<]*).*?<td>([^<]*)</td>.*?<td>.*?<td>([^<]*) @@ -27,21 +24,21 @@ - <TITLE>allmusic[ (]+ ([^>]*) > Overview + <h1 class="title">([^<]*)</h1> - <span>Artist</span>[^;]*[^>]*>[^>]*>([^<]*) + allmusic.com/artist/[^"]*">([^<]*)</a></div> - - sql=([^"]*)">Overview + + <meta name="title" content="([^-]*)- ([^<]*)" /> - - sql=([^"]*)">Review + + allmusic.com/artist/([^"]*)">[^<]*</a></div> - - <span class="title">[ ]*([^<]*)</span>.*<a href="[^"]+" class="subtitle">[ ]*([^<]*)</a> + + allmusic.com/artist/([^"]*)">[^<]*</a></div> - + diff --git a/addons/metadata.albums.allmusic.com/resources/settings.xml b/addons/metadata.albums.allmusic.com/resources/settings.xml index 89eb2274a2..3071c6d2bf 100644 --- a/addons/metadata.albums.allmusic.com/resources/settings.xml +++ b/addons/metadata.albums.allmusic.com/resources/settings.xml @@ -1,5 +1,5 @@ - + diff --git a/addons/metadata.artists.allmusic.com/addon.xml b/addons/metadata.artists.allmusic.com/addon.xml index 04b1ea1812..9071ce1e05 100644 --- a/addons/metadata.artists.allmusic.com/addon.xml +++ b/addons/metadata.artists.allmusic.com/addon.xml @@ -1,12 +1,12 @@ - + - + (allmusic.com/cg/.*) - + - - <TITLE>allmusic[ (]+ ([^>]*) > Overview + + <meta name="title" content="([^"]*)".*?<a href="http://www.allmusic.com/artist/([^/]*)/discography" - - style="[^=]*<a href="[^"]*sql=([^"]*)">([^<]*)</a>[^-]*[^>]*>([^<]*)</TD>[^>]*>(&nbsp;)?([^<]*)</td> + + <td><a href="http://www.allmusic.com/artist/([^"]*)">([^<]*)</a></td>[^>]*>([^<]*)</td>[^>]*>([^<]*)</td> - + - - sql=([^"]*)">Biography + + http://www.allmusic.com/artist/([^&"/]*) @@ -35,11 +35,11 @@ - - sql=([^"]*)">Biography + + <a href="http://www.allmusic.com/artist/([^/]*)/biography" - - sql=([^"]*)">Discography + + <a href="http://www.allmusic.com/artist/([^/]*)/discography" diff --git a/addons/metadata.common.allmusic.com/addon.xml b/addons/metadata.common.allmusic.com/addon.xml index a2dc608305..427f5fae4f 100644 --- a/addons/metadata.common.allmusic.com/addon.xml +++ b/addons/metadata.common.allmusic.com/addon.xml @@ -1,7 +1,7 @@  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 @@ - - sorted-cell">([0-9]+)</td><td[^>]*>(<a href=[^>]*><img [^>]*/></a>|[^<]*)?</td><td[^>]*><a href=[^>]*>([^<]*)</a></td><td[^<]*[^>]*>[^>]*>(</a></td><td[^>]*>)?([^<]+)</td> + + <td class="sorted cell">([^<]*)</td>.*?<td class="cell"><a href="[^>]*>([^<]*)<.*?<td class="cell">([^<]*)< (.*?)&(.+) @@ -16,7 +16,7 @@ - Biography</td>.*?<p>(.*?)</p> + Biography</h2>.*?</p>(.*?)</p> @@ -24,124 +24,121 @@ - Review</td>.*?<p>(.*?)</p> + <h2 class="title">Review</h2>.*?</p>(.*?)</p> - + - <TITLE>allmusic[ (]+ ([^>]*) > Overview + <meta name="title" content="([^"]*) - <span>Born.*?;">(.*?)</td> + <h3>Born[^>]*>[^>]*>(.*?)</p> - <span>Died.*?;">(.*?)</td> + <h3>Died[^>]*>[^>]*>(.*?)</p> - <span>Formed.*?;">(.*?)</td> + <h3>Formed[^>]*>[^>]*>(.*?)</p> - <span>Disbanded.*?;">(.*?)</td> + <h3>Disbanded[^>]*>[^>]*>(.*?)</p> - Years Active-->([^!]*)<!--Years Active + <h3>Years Active</h3>(.*?)</p> - - <div class="timeline-sub-active">([0-9]+)</div> + + <span class="active">([0-9]+)</span> (.+)/ - + - Genre Listing-->([^!]*)<!--Genre Listing + <h3>Genres</h3>(.*?)</div> - - <li>[^>]*>([^<]*)</a></li> + + <a href="/explore/genre/[^>]*>(<strong>)?([^<]*) - Style Listing-->([^!]*)<!--Style Listing + <h3>Styles</h3>(.*?)</div> - <li>[^>]*>([^<]*)</a></li> + <li>[^>]*>([^<]*)</a></li> - Moods Listing-->([^!]*)<!--Moods Listing + <h3>Moods</h3>(.*?)</div> - <li>[^>]*>([^<]*)</a></li> + <li>[^>]*>([^<]*)</a></li> - Instruments Listing-->([^!]*)<!--Instruments Listing + <h3>Instruments</h3>(.*?)</div> - <li>[^>]*>([^<]*)</a></li> - - - <img src="([^"]*)" id="Picture" + <li>[^>]*>([^<]*)</a></li> - - "([A-Z^])([0-9^])([0-9^])([0-9^])([^"]*)" + + <img id="artist_image" src="([^"]*)" - + - <TITLE>allmusic[ (]+ ([^>]*) > Overview + <meta name="title" content="([^-]*)-[^<]*" /> - <span>Artist</span>[^;]*[^>]*>[^>]*>([^<]*) + <meta name="title" content="[^-]*- ([^<]*)" /> - <span>Rating</span>[^_]*_r([0-9^]*) + <h3>Rating</h3>[^_]*_r([0-9^]*) - <span>Label</span>[^;]*[^>]*>([^<]*) + <h3>Label</h3>[^>]*>([^<]*) - <span>Type</span>[^;]*[^>]*>([^<]*) + <h3>Type</h3>[^>]*>([^<]*) - <span>Release Date</span>[^;]*[^>]*>([^<]*) + <h3>Release Date</h3>[^>]*>([^<]*) <span>Release Date.*?([0-9]+)</ - Genre[s]* Listing-->([^!]*)<!--Genre[s]* Listing + <h3>Genre[s]?</h3>(.*?)</div> - <li>[^>]*>([^<]*)</a></li> + <li>[^>]*>([^<]*)</a></li> - Style[s]* Listing-->([^!]*)<!--Style[s]* Listing + <h3>Style[s]?</h3>(.*?)</div> - <li>[^>]*>([^<]*)</a></li> + <li>[^>]*>([^<]*)</a></li> - Mood[s]* Listing-->([^!]*)<!--Mood[s]* Listing + <h3>Mood[s]?</h3>(.*?)</div> - <li>[^>]*>([^<]*)</a></li> + <li>[^>]*>([^<]*)</a></li> - Theme[s]* Listing-->([^!]*)<!--Theme[s]* Listing + <h3>Theme[s]?</h3>(.*?)</div> - <li>[^>]*>([^<]*)</a></li> + <li>[^>]*>([^<]*)</a></li> - - "cell">([0-9]+)</.*?sql=([0-9:a-z]*)">(.*?)</a>.*?"right".*?>(.*?)</ + + "cell">([0-9]+)<.*?<td class="cell">[^>]*>([^<]*)</a></td>.*?<td class="cell">([0-9]*:[0-9]*)</td> - + http://image.allmusic.com/([^"]*)" - + -- cgit v1.2.3