Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update artresizer's ImageMagick commands to use the magick binary #3236

Merged
merged 9 commits into from
Apr 30, 2019
Merged

Update artresizer's ImageMagick commands to use the magick binary #3236

merged 9 commits into from
Apr 30, 2019

Commits on Apr 23, 2019

  1. Update artresizer's ImageMagick commands to use the magick binary

    Updated artresizer's ImageMagick commands to use the magick binary
    added in ImageMagick 7.x, rather than the legacy utilities ('convert',
    'identify', etc.) This resolves an issue where beets is failing to
    detect or use ImageMagick on Windows even when it is set correctly
    on the PATH, which in turn restores functionality to the fetchart and
    embedart plugins on Windows.
    
    Closes #2093
    kassisaf committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    ad9f256 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2019

  1. Added fallback to ImageMagick's legacy utilities

    When the `magick` binary is not available, artresizer will fall back
    to the "legacy" binaries (`convert`, `identify`, etc.)
    kassisaf committed Apr 24, 2019
    Configuration menu
    Copy the full SHA
    f15f8a0 View commit details
    Browse the repository at this point in the history
  2. Fix whitespace for flake8 compliance

    Fixed various whitespace issues and a global variable reference to
    comply with flake8 linting.
    kassisaf committed Apr 24, 2019
    Configuration menu
    Copy the full SHA
    1a6e0a7 View commit details
    Browse the repository at this point in the history
  3. Refactor to eliminate use of global variable

    `get_im_version` now returns an additional bool `isLegacy`, which
    indicates whether the the `magick` binary is accessible. It is stored
    in `self.im_legacy` on initialization of an `ArtResizer` object, and
    can be accessed via `ArtResizer.shared.im_legacy`
    kassisaf committed Apr 24, 2019
    Configuration menu
    Copy the full SHA
    666790b View commit details
    Browse the repository at this point in the history
  4. Handle TypeError exception when no ImageMagick install is present

    Fixes an error introduced in 1a6e0a7 where a TypeError exception was
    raised when calling `_check_method()` with no ImageMagick installation
    present.
    kassisaf committed Apr 24, 2019
    Configuration menu
    Copy the full SHA
    e00640e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a8f137b View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2019

  1. Make requested changes for PR 3236

    - Refactored convert and identify command names to an ArtResizer
    member variable, set on ArtResizer init. Functions that use this info
    will now access it from there.
    - Changed the way `cmd` variables are written so that the command name
    and command args are assigned directly to `cmd`, rather than doing
    `command_output(cmd + args)`
    - `get_im_version()` will now always return a tuple containing two
    values: a tuple representing the version, and either a bool or None
    flag representing whether we should send legacy commands to ImageMagick
    - Improved readability of successful return value in `get_im_version()`
    kassisaf committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    48be3a7 View commit details
    Browse the repository at this point in the history
  2. Make get_im_version() return same types across all conditions

    `get_im_version` should now always return a tuple containing:
    - index 0: a tuple representing the version
    - index 1: a bool or None, representing legacy status
    kassisaf committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    09abd98 View commit details
    Browse the repository at this point in the history
  3. Make more requested changes for PR 3236

    - Moved several variable assignments outside of try blocks
    - Added and clarified various comments and docstrings
    - Modified the command loop in `get_im_version()` to a slightly more
    readable approach
    - `get_im_version()` now returns None when ImageMagick is unavailable
    - Updated `ArtResizer._check_method` to handle our new returns in a way
    that is more readable
    - Fixed an issue where `get_im_version()` could crash if the regex
    search failed to find a match
    kassisaf committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    278d87f View commit details
    Browse the repository at this point in the history