From 2c100a021adfdb4915cb4af40f4aacf5ca12e921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alban=20F=C3=A9ron?= Date: Sun, 22 Nov 2020 18:09:15 +0100 Subject: [PATCH] Properly release resources Hunting for the last ResourceWarnings --- supysonic/api/media.py | 26 ++++++++++++++------------ tests/api/test_media.py | 25 ++++++++++--------------- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/supysonic/api/media.py b/supysonic/api/media.py index 28e7477..dc9cc41 100644 --- a/supysonic/api/media.py +++ b/supysonic/api/media.py @@ -195,7 +195,9 @@ def stream_media(): raise finally: if dec_proc != None: + dec_proc.stdout.close() dec_proc.wait() + proc.stdout.close() proc.wait() resp_content = cache.set_generated(cache_key, handle_transcoding) @@ -303,19 +305,19 @@ def cover_art(): else: return send_file(cover_path) - im = Image.open(cover_path) - mimetype = "image/{}".format(im.format.lower()) - if size > im.width and size > im.height: - return send_file(cover_path, mimetype=mimetype) + with Image.open(cover_path) as im: + mimetype = "image/{}".format(im.format.lower()) + if size > im.width and size > im.height: + return send_file(cover_path, mimetype=mimetype) - cache_key = "{}-cover-{}".format(eid, size) - try: - return send_file(cache.get(cache_key), mimetype=mimetype) - except CacheMiss: - im.thumbnail([size, size], Image.ANTIALIAS) - with cache.set_fileobj(cache_key) as fp: - im.save(fp, im.format) - return send_file(cache.get(cache_key), mimetype=mimetype) + cache_key = "{}-cover-{}".format(eid, size) + try: + return send_file(cache.get(cache_key), mimetype=mimetype) + except CacheMiss: + im.thumbnail([size, size], Image.ANTIALIAS) + with cache.set_fileobj(cache_key) as fp: + im.save(fp, im.format) + return send_file(cache.get(cache_key), mimetype=mimetype) @api.route("/getLyrics.view", methods=["GET", "POST"]) diff --git a/tests/api/test_media.py b/tests/api/test_media.py index d88ce26..819f935 100644 --- a/tests/api/test_media.py +++ b/tests/api/test_media.py @@ -135,6 +135,11 @@ class MediaTestCase(ApiTestBase): self.assertEqual(rv.status_code, 200) self.assertEqual(rv.mimetype, "application/zip") + def __assert_image_data(self, resp, format, size): + with Image.open(BytesIO(resp.data)) as im: + self.assertEqual(im.format, format) + self.assertEqual(im.size, (size, size)) + def test_get_cover_art(self): self._make_request("getCoverArt", error=10) self._make_request("getCoverArt", {"id": "string"}, error=0) @@ -150,9 +155,7 @@ class MediaTestCase(ApiTestBase): ) as rv: self.assertEqual(rv.status_code, 200) self.assertEqual(rv.mimetype, "image/jpeg") - im = Image.open(BytesIO(rv.data)) - self.assertEqual(im.format, "JPEG") - self.assertEqual(im.size, (420, 420)) + self.__assert_image_data(rv, "JPEG", 420) args["size"] = 600 with closing( @@ -160,9 +163,7 @@ class MediaTestCase(ApiTestBase): ) as rv: self.assertEqual(rv.status_code, 200) self.assertEqual(rv.mimetype, "image/jpeg") - im = Image.open(BytesIO(rv.data)) - self.assertEqual(im.format, "JPEG") - self.assertEqual(im.size, (420, 420)) + self.__assert_image_data(rv, "JPEG", 420) args["size"] = 120 with closing( @@ -170,9 +171,7 @@ class MediaTestCase(ApiTestBase): ) as rv: self.assertEqual(rv.status_code, 200) self.assertEqual(rv.mimetype, "image/jpeg") - im = Image.open(BytesIO(rv.data)) - self.assertEqual(im.format, "JPEG") - self.assertEqual(im.size, (120, 120)) + self.__assert_image_data(rv, "JPEG", 120) # rerequest, just in case with closing( @@ -180,9 +179,7 @@ class MediaTestCase(ApiTestBase): ) as rv: self.assertEqual(rv.status_code, 200) self.assertEqual(rv.mimetype, "image/jpeg") - im = Image.open(BytesIO(rv.data)) - self.assertEqual(im.format, "JPEG") - self.assertEqual(im.size, (120, 120)) + self.__assert_image_data(rv, "JPEG", 120) # TODO test non square covers @@ -193,9 +190,7 @@ class MediaTestCase(ApiTestBase): ) as rv: self.assertEqual(rv.status_code, 200) self.assertEqual(rv.mimetype, "image/png") - im = Image.open(BytesIO(rv.data)) - self.assertEqual(im.format, "PNG") - self.assertEqual(im.size, (120, 120)) + self.__assert_image_data(rv, "PNG", 120) def test_get_avatar(self): self._make_request("getAvatar", error=0)