diff options
author | DaveTBlake <oak99sky@yahoo.co.uk> | 2020-07-03 23:57:15 +0100 |
---|---|---|
committer | DaveTBlake <oak99sky@yahoo.co.uk> | 2020-07-03 23:57:15 +0100 |
commit | e1664a1b7f43050c272201574b073c33a0c98eca (patch) | |
tree | eb13d718de6cc8bd2b3192d3f7b8844f6c206b3b /addons/metadata.common.allmusic.com | |
parent | 7d6f7f812c6593b0ed4113e52fe354f6b61b856f (diff) |
[scrapers]Sync with repo
Diffstat (limited to 'addons/metadata.common.allmusic.com')
-rw-r--r-- | addons/metadata.common.allmusic.com/addon.xml | 4 | ||||
-rw-r--r-- | addons/metadata.common.allmusic.com/allmusic.xml | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/addons/metadata.common.allmusic.com/addon.xml b/addons/metadata.common.allmusic.com/addon.xml index 3099cb809c..effc5bb1cd 100644 --- a/addons/metadata.common.allmusic.com/addon.xml +++ b/addons/metadata.common.allmusic.com/addon.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.allmusic.com" name="AllMusic Scraper Library" - version="3.2.0" + version="3.2.2" provider-name="Team Kodi"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> diff --git a/addons/metadata.common.allmusic.com/allmusic.xml b/addons/metadata.common.allmusic.com/allmusic.xml index e431cf5051..0493875859 100644 --- a/addons/metadata.common.allmusic.com/allmusic.xml +++ b/addons/metadata.common.allmusic.com/allmusic.xml @@ -68,17 +68,17 @@ <RegExp input="" output="" dest="2"> <expression /> </RegExp> - <RegExp input="$$1" output="<born>\1 \2</born>" dest="2"> - <expression trim="1,2"><h4>\s*Born\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)?</expression> + <RegExp input="$$1" output="<born>\1 \3</born>" dest="2"> + <expression trim="1,2"><h4>\s.+Born.*?birthdate/[^"]+">([^<]*)(.*?"/birthplace/[^"]+">([^<]*))?</expression> </RegExp> - <RegExp input="$$1" output="<died>\1 \2</died>" dest="2+"> - <expression trim="1,2"><h4>\s*Died\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)?</expression> + <RegExp input="$$1" output="<died>\1 \3</died>" dest="2+"> + <expression trim="1,2"><h4>\s.+Died.*?deathdate/[^"]+">([^<]*)(.*?"/deathplace/[^"]+">([^<]*))?</expression> </RegExp> <RegExp input="$$1" output="<formed>\1</formed>" dest="2"> - <expression trim="1,2"><h4>\s*Formed\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)?</expression> + <expression trim="1,2"><h4>\s.+Formed.*?birthdate/[^"]+">([^<]*)</expression> </RegExp> <RegExp input="$$1" output="<disbanded>\1</disbanded>" dest="2+"> - <expression trim="1,2"><h4>\s*Disbanded\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)?</expression> + <expression trim="1,2"><h4>\s.+Disbanded.*?deathdate/[^"]+[^"]+">([^<]*)</expression> </RegExp> <expression noclean="1"/> </RegExp> @@ -362,7 +362,7 @@ </GetAMGAlbumThumbsByAMGID> <ParseAMGAlbumThumbs dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<thumb>https://cdn-s3.allmusic.com/release-covers/500/\1</thumb>" dest="2"> + <RegExp input="$$1" output="<thumb aspect="thumb">https://cdn-s3.allmusic.com/release-covers/500/\1</thumb>" dest="2"> <expression noclean="1"><img src="https://cdn-s3.allmusic.com/release-covers/500/([^"]*)</expression> </RegExp> <expression noclean="1" /> |