Beginning support of AVIF; fix some image bugs (#797)

CHANGELOG.md

@@ -5,6 +5,8 @@
 
 * Experimental feature: Given an option to use Musicbrainz to fill in missing
   metadata based only on artist and title (and album if available).
+* Add support for AVIF graphics. At some point, all of the templates will be
+  updated to handle multiple formats so be prepared!
 * On Windows, the ability to read from Windows Media Transport compatible
   software, such as Amazon Music, Soundcloud, and likely others. (Ironically,
   Windows Media Player doesn't appear to use it for whatever reason.)

nowplaying/utils.py

@@ -16,6 +16,7 @@
 import jinja2
 import normality
 import PIL.Image
+import pillow_avif  # pylint: disable=unused-import
 
 STRIPWORDLIST = ['clean', 'dirty', 'explicit', 'official music video']
 STRIPRELIST = [
@@ -145,13 +146,38 @@ def image2png(rawdata):
         return rawdata
 
     try:
-        origimage = rawdata
-        imgbuffer = io.BytesIO(origimage)
+        imgbuffer = io.BytesIO(rawdata)
         logging.getLogger('PIL.TiffImagePlugin').setLevel(logging.CRITICAL + 1)
         logging.getLogger('PIL.PngImagePlugin').setLevel(logging.CRITICAL + 1)
         image = PIL.Image.open(imgbuffer)
+        imgbuffer = io.BytesIO(rawdata)
         if image.format != 'PNG':
-            image.convert(mode='RGB').save(imgbuffer, format='png')
+            image.convert(mode='RGB').save(imgbuffer, format='PNG')
+    except Exception as error:  #pylint: disable=broad-except
+        logging.debug(error)
+        return None
+    logging.debug("Leaving image2png")
+    return imgbuffer.getvalue()
+
+
+def image2avif(rawdata):
+    ''' convert an image to png '''
+
+    if not rawdata:
+        return None
+
+    if rawdata.startswith(b'\x00\x00\x00 ftypavif'):
+        logging.debug('already AVIF, skipping convert')
+        return rawdata
+
+    try:
+        imgbuffer = io.BytesIO(rawdata)
+        logging.getLogger('PIL.TiffImagePlugin').setLevel(logging.CRITICAL + 1)
+        logging.getLogger('PIL.PngImagePlugin').setLevel(logging.CRITICAL + 1)
+        image = PIL.Image.open(imgbuffer)
+        imgbuffer = io.BytesIO(rawdata)
+        if image.format != 'AVIF':
+            image.convert(mode='RGB').save(imgbuffer, format='AVIF')
     except Exception as error:  #pylint: disable=broad-except
         logging.debug(error)
         return None

requirements-run.txt

@@ -11,6 +11,7 @@ nltk==3.8.1
 normality==2.4.0
 pid==3.0.4
 pillow==9.5.0
+pillow_avif_plugin==1.3.1
 pyacoustid==1.2.2
 pypresence==4.2.1
 PySide6==6.5.0
@@ -43,4 +44,4 @@ python-dateutil
 #
 # required to install
 #
-versioningit==2.2.0
+versioningit==2.2.0

tests/test_utils.py

@@ -158,3 +158,28 @@ def test_basicstrip_ovm4():
     title = nowplaying.utils.titlestripper_basic(title=metadata['title'])
     assert metadata['title'] == 'Clean - Official Music Video'
     assert title == 'Clean'
+
+
+def test_image2png(getroot):
+    ''' check png image conversion '''
+    filename = getroot.joinpath('tests', 'images', '1x1.jpg')
+    with open(filename, 'rb') as fhin:
+        image = fhin.read()
+
+    pngdata = nowplaying.utils.image2png(image)
+
+    pngdata2 = nowplaying.utils.image2png(pngdata)
+    assert pngdata.startswith(b'\211PNG\r\n\032\n')
+    assert pngdata2 == pngdata
+
+
+def test_image2avif(getroot):
+    ''' check png image conversion '''
+    filename = getroot.joinpath('tests', 'images', '1x1.jpg')
+    with open(filename, 'rb') as fhin:
+        image = fhin.read()
+
+    avifdata = nowplaying.utils.image2avif(image)
+    avifdata2 = nowplaying.utils.image2avif(avifdata)
+    assert avifdata.startswith(b'\x00\x00\x00 ftypavif')
+    assert avifdata2 == avifdata