fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-12 02:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

PICARD-2584: Avoid loading same recording ID twice in RecordingResolver

Browse Source
This commit is contained in:
Philipp Wolfer
2023-12-21 23:56:08 +01:00
parent 221c4990e1
commit 0567433099
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
picard/acoustid/recordings.py
View File

@@ -65,6 +65,7 @@ class RecordingResolver:
self._doc = doc
self._callback = callback
self._recording_map = defaultdict(dict)
self._recording_cache = dict()
self._missing_metadata = deque()
def resolve(self) -> None:
@@ -74,16 +75,19 @@ class RecordingResolver:
result_score = get_score(result)
acoustid = result.get('id')
for recording in recordings:
mbid = recording.get('id')
sources = recording.get('sources', 1)
if recording_has_metadata(recording):
mb_recording = parse_recording(recording)
self._recording_cache[mbid] = mb_recording
self._recording_map[acoustid][recording['id']] = Recording(
recording=parse_recording(recording),
recording=mb_recording,
result_score=result_score,
sources=sources,
)
else:
self._missing_metadata.append(IncompleteRecording(
mbid=recording.get('id'),
mbid=mbid,
acoustid=acoustid,
result_score=result_score,
sources=sources,
@@ -99,11 +103,16 @@ class RecordingResolver:
self._send_results()
return
self._mbapi.get_track_by_id(
self._missing_metadata[0].mbid,
self._recording_request_finished,
inc=['release-groups', 'releases'],
)
mbid = self._missing_metadata[0].mbid
if mbid in self._recording_cache:
mb_recording = self._recording_cache[mbid]
self._recording_request_finished(mb_recording, None, None)
else:
self._mbapi.get_track_by_id(
self._missing_metadata[0].mbid,
self._recording_request_finished,
inc=['release-groups', 'releases'],
)
def _recording_request_finished(self, mb_recording, http, error):
recording = self._missing_metadata.popleft()
@@ -118,6 +127,7 @@ class RecordingResolver:
mbid = mb_recording.get('id')
recording_dict = self._recording_map[recording.acoustid]
if mbid:
self._recording_cache[mbid] = mb_recording
if mbid not in recording_dict:
recording_dict[mbid] = Recording(
recording=mb_recording,