Merge pull request #47 from metabrainz/general-cleanup

General cleanup
metabrainz · Apr 11, 2022 · 4879eb1 · 4879eb1
2 parents 77d1048 + dc1b7f9
commit 4879eb1
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 353 deletions.
diff --git a/troi/acousticbrainz/__init__.py b/troi/acousticbrainz/__init__.py
diff --git a/troi/acousticbrainz/annoy.py b/troi/acousticbrainz/annoy.py
diff --git a/troi/acousticbrainz/bpm_lookup.py b/troi/acousticbrainz/bpm_lookup.py
diff --git a/troi/acousticbrainz/mood_lookup.py b/troi/acousticbrainz/mood_lookup.py
diff --git a/troi/acousticbrainz/tests/test_annoy.py b/troi/acousticbrainz/tests/test_annoy.py
diff --git a/troi/internal/README.md b/troi/internal/README.md
@@ -0,0 +1,3 @@
+This directory contains patches that we use to create the Year in Music reviews at the end of the year.
+Given the limited use, they've been moved away from the other patches in order to not confuse the normal
+flow of the other patches
diff --git a/troi/patches/top_discoveries_for_year.py → troi/internal/top_discoveries_for_year.py b/troi/patches/top_discoveries_for_year.py → troi/internal/top_discoveries_for_year.py
diff --git a/...patches/top_missed_recordings_for_year.py → ...nternal/top_missed_recordings_for_year.py b/...patches/top_missed_recordings_for_year.py → ...nternal/top_missed_recordings_for_year.py
diff --git a/...ew_recordings_you_listened_to_for_year.py → ...ew_recordings_you_listened_to_for_year.py b/...ew_recordings_you_listened_to_for_year.py → ...ew_recordings_you_listened_to_for_year.py
diff --git a/troi/patches/top_recordings_for_year.py → troi/internal/top_recordings_for_year.py b/troi/patches/top_recordings_for_year.py → troi/internal/top_recordings_for_year.py
diff --git a/...tches/top_sitewide_recordings_for_year.py → ...ernal/top_sitewide_recordings_for_year.py b/...tches/top_sitewide_recordings_for_year.py → ...ernal/top_sitewide_recordings_for_year.py
diff --git a/troi/patches/yim_patch_runner.py → troi/internal/yim_patch_runner.py b/troi/patches/yim_patch_runner.py → troi/internal/yim_patch_runner.py
diff --git a/troi/musicbrainz/mbid_mapping.py b/troi/musicbrainz/mbid_mapping.py
@@ -48,6 +48,7 @@ def read(self, inputs):
                 r.add_note("recording mbid %s overwritten by mbid_lookup" % (r.mbid))
             r.mbid = row['recording_mbid']
             r.name = row['recording_name']
+            r.year = row['year']
 
             if r.artist.artist_credit_id:
                 r.artist.add_note("artist_credit_id %d overwritten by mbid_lookup" % (r.artist.artist_credit_id))

diff --git a/troi/musicbrainz/tests/test_mbid_mapping.py b/troi/musicbrainz/tests/test_mbid_mapping.py
@@ -15,19 +15,33 @@
         "recording_mbid": "97e69767-5d34-4c97-b36a-f3b2b1ef9dae",
         "recording_name": "Trigger Hippie",
         "release_mbid": "9db51cd6-38f6-3b42-8ad5-559963d68f35",
-        "release_name": "Who Can You Trust?"
+        "release_name": "Who Can You Trust?",
+        "year": 1996
     }
 ]
 
+
+def mocked_requests_post(*args, **kwargs):
+    class MockResponse:
+        def __init__(self, json_data, status_code):
+            self.json_data = json_data
+            self.status_code = status_code
+
+        def json(self):
+            return self.json_data
+
+    e = troi.musicbrainz.mbid_mapping.MBIDMappingLookupElement()
+    if args[0] == e.SERVER_URL:
+        return MockResponse(return_data, 200)
+
+    return MockResponse(None, 404)
+
+
 class TestMBIDMapping(unittest.TestCase):
 
-    @unittest.mock.patch('requests.post')
+    @unittest.mock.patch('requests.post', side_effect=mocked_requests_post)
     def test_read(self, req):
 
-        mock = unittest.mock.MagicMock()
-        mock.status_code = 200
-        mock.text = json.dumps(return_data)
-        req.return_value = mock
         e = troi.musicbrainz.mbid_mapping.MBIDMappingLookupElement()
 
         r = [ troi.Recording("trigger hippie", artist=troi.Artist("morcheeba")) ]
@@ -41,6 +55,7 @@ def test_read(self, req):
         assert entities[0].release.name == "Who Can You Trust?"
         assert entities[0].mbid == "97e69767-5d34-4c97-b36a-f3b2b1ef9dae"
         assert entities[0].name == "Trigger Hippie"
+        assert entities[0].year == 1996
 
 
     @unittest.mock.patch('requests.post')