mirror of
https://github.com/beetbox/beets.git
synced 2025-12-06 16:42:42 +01:00
07b5e69f40
Squashed from the PR, relevant commit messages follow below: Added file size option to artresizer - In line with comments on PR, adjusted the ArtResizer API to add functionality to "resize to X bytes" through `max_filesize` arg - Adjustment to changelog.rst to include max_filesize change to ArtResizer and addition of new plugin. Added explicit tests for PIL & Imagemagick Methods - Checks new resizing functions do reduce the filesize of images Expose max_filesize logic to fetchart plugin - Add syspath escaping for OS cross compatibility - Return smaller PIL image even if max filesize not reached. - Test resize logic against known smaller filesize (//2) - Pass integer (not float) quality argument to PIL - Remove Pillow from dependencies - Implement "max_filesize" fetchart option, including logic to resize and rescale if maxwidth is also set. Added tests & documentation for fetchart additions. Tests now check that a target filesize is reached with a higher initial quality (a difficult check to pass). With a starting quality of 95% PIL takes 4 iterations to succeed in lowering the example cover image to 90% its original size. To cover all bases, the PIL loop has been changed to 5 iterations in the worst case, and the documentation altered to reflect the 50% loss in quality this implies. This seems reasonable as users concerned about performance would most likely be persuaded to install ImageMagick, or remove the maximum filesize constraint. The previous 30% figure was arbitrary.
110 lines
3.5 KiB
Python
110 lines
3.5 KiB
Python
# -*- coding: utf-8 -*-
|
|
# This file is part of beets.
|
|
# Copyright 2020, David Swarbrick.
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining
|
|
# a copy of this software and associated documentation files (the
|
|
# "Software"), to deal in the Software without restriction, including
|
|
# without limitation the rights to use, copy, modify, merge, publish,
|
|
# distribute, sublicense, and/or sell copies of the Software, and to
|
|
# permit persons to whom the Software is furnished to do so, subject to
|
|
# the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be
|
|
# included in all copies or substantial portions of the Software.
|
|
|
|
"""Tests for image resizing based on filesize."""
|
|
|
|
from __future__ import division, absolute_import, print_function
|
|
|
|
|
|
import unittest
|
|
import os
|
|
|
|
from test import _common
|
|
from test.helper import TestHelper
|
|
from beets.util import syspath
|
|
from beets.util.artresizer import (
|
|
pil_resize,
|
|
im_resize,
|
|
get_im_version,
|
|
get_pil_version,
|
|
)
|
|
|
|
|
|
class ArtResizerFileSizeTest(_common.TestCase, TestHelper):
|
|
"""Unittest test case for Art Resizer to a specific filesize."""
|
|
|
|
IMG_225x225 = os.path.join(_common.RSRC, b"abbey.jpg")
|
|
IMG_225x225_SIZE = os.stat(syspath(IMG_225x225)).st_size
|
|
|
|
def setUp(self):
|
|
"""Called before each test, setting up beets."""
|
|
self.setup_beets()
|
|
|
|
def tearDown(self):
|
|
"""Called after each test, unloading all plugins."""
|
|
self.teardown_beets()
|
|
|
|
def _test_img_resize(self, resize_func):
|
|
"""Test resizing based on file size, given a resize_func."""
|
|
# Check quality setting unaffected by new parameter
|
|
im_95_qual = resize_func(
|
|
225,
|
|
self.IMG_225x225,
|
|
quality=95,
|
|
max_filesize=0,
|
|
)
|
|
# check valid path returned - max_filesize hasn't broken resize command
|
|
self.assertExists(im_95_qual)
|
|
|
|
# Attempt a lower filesize with same quality
|
|
im_a = resize_func(
|
|
225,
|
|
self.IMG_225x225,
|
|
quality=95,
|
|
max_filesize=0.9 * os.stat(syspath(im_95_qual)).st_size,
|
|
)
|
|
self.assertExists(im_a)
|
|
# target size was achieved
|
|
self.assertLess(os.stat(syspath(im_a)).st_size,
|
|
os.stat(syspath(im_95_qual)).st_size)
|
|
|
|
# Attempt with lower initial quality
|
|
im_75_qual = resize_func(
|
|
225,
|
|
self.IMG_225x225,
|
|
quality=75,
|
|
max_filesize=0,
|
|
)
|
|
self.assertExists(im_75_qual)
|
|
|
|
im_b = resize_func(
|
|
225,
|
|
self.IMG_225x225,
|
|
quality=95,
|
|
max_filesize=0.9 * os.stat(syspath(im_75_qual)).st_size,
|
|
)
|
|
self.assertExists(im_b)
|
|
# Check high (initial) quality still gives a smaller filesize
|
|
self.assertLess(os.stat(syspath(im_b)).st_size,
|
|
os.stat(syspath(im_75_qual)).st_size)
|
|
|
|
@unittest.skipUnless(get_pil_version(), "PIL not available")
|
|
def test_pil_file_resize(self):
|
|
"""Test PIL resize function is lowering file size."""
|
|
self._test_img_resize(pil_resize)
|
|
|
|
@unittest.skipUnless(get_im_version(), "ImageMagick not available")
|
|
def test_im_file_resize(self):
|
|
"""Test IM resize function is lowering file size."""
|
|
self._test_img_resize(im_resize)
|
|
|
|
|
|
def suite():
|
|
"""Run this suite of tests."""
|
|
return unittest.TestLoader().loadTestsFromName(__name__)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main(defaultTest="suite")
|