From 7539d8dc23189000351edfddacf61491ab09c3ad Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Wed, 19 Feb 2020 18:10:56 +0100 Subject: [PATCH] PICARD-1751: Provide a ~releasecountries variable --- picard/mbjson.py | 1 + test/data/ws_data/release.json | 12 ++++++++++++ test/test_mbjson.py | 1 + 3 files changed, 14 insertions(+) diff --git a/picard/mbjson.py b/picard/mbjson.py index 7969d6946..95d68de3b 100644 --- a/picard/mbjson.py +++ b/picard/mbjson.py @@ -462,6 +462,7 @@ def release_to_metadata(node, m, album=None): m['~releaselanguage'] = value['language'] if 'script' in value: m['script'] = value['script'] + m['~releasecountries'] = countries_from_node(node) add_genres_from_node(node, album) diff --git a/test/data/ws_data/release.json b/test/data/ws_data/release.json index 849903415..960570327 100644 --- a/test/data/ws_data/release.json +++ b/test/data/ws_data/release.json @@ -164,6 +164,18 @@ "id": "8a754a16-0027-3a29-b6d7-2b40ea0481ed", "name": "United Kingdom" } + }, + { + "area": { + "sort-name": "New Zealand", + "name": "New Zealand", + "iso-3166-1-codes": [ + "NZ" + ], + "disambiguation": "", + "id": "8524c7d9-f472-3890-a458-f28d5081d9c4" + }, + "date": "1973" } ], "quality": "normal", diff --git a/test/test_mbjson.py b/test/test_mbjson.py index 78c0b5798..17bf6ee5b 100644 --- a/test/test_mbjson.py +++ b/test/test_mbjson.py @@ -66,6 +66,7 @@ class ReleaseTest(MBJSONTest): self.assertEqual(m['~albumartists'], 'Pink Floyd') self.assertEqual(m['~albumartists_sort'], 'Pink Floyd') self.assertEqual(m['~releaselanguage'], 'eng') + self.assertEqual(m.getall('~releasecountries'), ['GB', 'NZ']) self.assertEqual(a.genres, { 'genre1': 6, 'genre2': 3, 'tag1': 6, 'tag2': 3})