From b904b039d9d60729ebda9c8986aa3deaa49f341c Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Sun, 11 Sep 2022 17:32:01 +0200 Subject: [PATCH] PICARD-2539: Always call _run_album_metadata_processors before lowering album._requests --- picard/album.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/picard/album.py b/picard/album.py index 0842277d5..fbce97ee5 100644 --- a/picard/album.py +++ b/picard/album.py @@ -336,9 +336,9 @@ class Album(DataObject, Item): ) def _recordings_request_finished(self, document, http, error): - self._requests -= 1 if error: self.error_append(http.errorString()) + self._requests -= 1 self._finalize_loading(error) else: for recording in document.get('recordings', []): @@ -349,11 +349,13 @@ class Album(DataObject, Item): offset = document.get('recording-offset', 0) next_offset = offset + RECORDING_QUERY_LIMIT if next_offset < count: + self._requests -= 1 self._request_recording_relationships(offset=next_offset) else: # Merge separately loaded recording relationships into release node self._merge_release_recording_relationships() self._run_album_metadata_processors() + self._requests -= 1 self._finalize_loading(error) def _merge_recording_relationships(self, track_node): @@ -530,7 +532,7 @@ class Album(DataObject, Item): import inspect stack = inspect.stack() args = [self] - msg = 'Album._finalize_loading called for already loaded album % r' + msg = 'Album._finalize_loading called for already loaded album %r' if len(stack) > 1: f = stack[1] msg += ' at %s:%d in %s'