Updated tests and docs

ImageConverter now uses generic context; #562
Updated docs [skip ci]
2021-12-31 20:31:15 -08:00 · 2021-12-31 17:34:41 -08:00 · 2021-12-31 09:45:42 -08:00 · 2021-12-31 09:45:19 -08:00
12 changed files with 30 additions and 25 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. Dates are d
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### [v0.44.2](https://github.com/RhetTbull/osxphotos/compare/v0.44.1...v0.44.2)
 > 31 December 2021
 - Bug fix for #559 [`42426b9`](https://github.com/RhetTbull/osxphotos/commit/42426b95ee786b2d53482d3d931a0b962a4db20d)
 #### [v0.44.1](https://github.com/RhetTbull/osxphotos/compare/v0.44.0...v0.44.1)
 > 31 December 2021
--- a/README.md
+++ b/README.md
@@ -1721,7 +1721,7 @@ Substitution                    Description
 {lf}                            A line feed: '\n', alias for {newline}
 {cr}                            A carriage return: '\r'
 {crlf}                          a carriage return + line feed: '\r\n'
-{osxphotos_version}             The osxphotos version, e.g. '0.44.1'
+{osxphotos_version}             The osxphotos version, e.g. '0.44.3'
 {osxphotos_cmd_line}            The full command line used to run osxphotos
 The following substitutions may result in multiple values. Thus if specified for
@@ -3623,7 +3623,7 @@ The following template field substitutions are availabe for use the templating s
 |{lf}|A line feed: '\n', alias for {newline}|
 |{cr}|A carriage return: '\r'|
 |{crlf}|a carriage return + line feed: '\r\n'|
-|{osxphotos_version}|The osxphotos version, e.g. '0.44.1'|
+|{osxphotos_version}|The osxphotos version, e.g. '0.44.3'|
 |{osxphotos_cmd_line}|The full command line used to run osxphotos|
 |{album}|Album(s) photo is contained in|
 |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder|
--- a/docs/.buildinfo
+++ b/docs/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 58505ca56d322ccc59c38bc440ccc347
+config: 8dc04ce2ac089dfa0c5fc3a14c14ed6e
 tags: 645f666f9bcd5a90fca523b33c5a78b7
--- a/docs/_static/documentation_options.js
+++ b/docs/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
    URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '0.44.1',
+    VERSION: '0.44.3',
    LANGUAGE: 'None',
    COLLAPSE_INDEX: false,
    BUILDER: 'html',
--- a/docs/cli.html
+++ b/docs/cli.html
@@ -6,7 +6,7 @@
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
-    <title>osxphotos command line interface (CLI) &#8212; osxphotos 0.44.1 documentation</title>
+    <title>osxphotos command line interface (CLI) &#8212; osxphotos 0.44.3 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
--- a/docs/genindex.html
+++ b/docs/genindex.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Index &#8212; osxphotos 0.44.1 documentation</title>
+    <title>Index &#8212; osxphotos 0.44.3 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
--- a/docs/index.html
+++ b/docs/index.html
@@ -6,7 +6,7 @@
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
-    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.44.1 documentation</title>
+    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.44.3 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
--- a/docs/modules.html
+++ b/docs/modules.html
@@ -6,7 +6,7 @@
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
-    <title>osxphotos &#8212; osxphotos 0.44.1 documentation</title>
+    <title>osxphotos &#8212; osxphotos 0.44.3 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
--- a/docs/reference.html
+++ b/docs/reference.html
@@ -6,7 +6,7 @@
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
-    <title>osxphotos package &#8212; osxphotos 0.44.1 documentation</title>
+    <title>osxphotos package &#8212; osxphotos 0.44.3 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
--- a/docs/search.html
+++ b/docs/search.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Search &#8212; osxphotos 0.44.1 documentation</title>
+    <title>Search &#8212; osxphotos 0.44.3 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,3 +1,3 @@
 """ version info """
-__version__ = "0.44.2"
+__version__ = "0.44.3"
--- a/osxphotos/imageconverter.py
+++ b/osxphotos/imageconverter.py
@@ -17,25 +17,25 @@ from wurlitzer import pipes
 class ImageConversionError(Exception):
-    """Base class for exceptions in this module. """
+    """Base class for exceptions in this module."""
    pass
 class ImageConverter:
-    """ Convert images to jpeg.  This class is a singleton
+    """Convert images to jpeg.  This class is a singleton
-        which will re-use the Core Image CIContext to avoid
+    which will re-use the Core Image CIContext to avoid
-        creating a new context for every conversion. """
+    creating a new context for every conversion."""
    def __new__(cls, *args, **kwargs):
-        """ create new object or return instance of already created singleton """
+        """create new object or return instance of already created singleton"""
        if not hasattr(cls, "instance") or not cls.instance:
            cls.instance = super().__new__(cls)
        return cls.instance
    def __init__(self):
-        """ return existing singleton or create a new one """
+        """return existing singleton or create a new one"""
        if hasattr(self, "context"):
            return
@@ -47,13 +47,10 @@ class ImageConverter:
                "workingFormat": Quartz.kCIFormatRGBAh,
            }
        )
-        mtldevice = Metal.MTLCreateSystemDefaultDevice()
+        self.context = Quartz.CIContext.contextWithOptions_(context_options)
        self.context = Quartz.CIContext.contextWithMTLDevice_options_(
            mtldevice, context_options
        )
    def write_jpeg(self, input_path, output_path, compression_quality=1.0):
-        """ convert image to jpeg and write image to output_path
+        """convert image to jpeg and write image to output_path
        Args:
            input_path: path to input image (e.g. '/path/to/import/file.CR2') as str or pathlib.Path
@@ -104,8 +101,11 @@ class ImageConverter:
            if input_image is None:
                raise ImageConversionError(f"Could not create CIImage for {input_path}")
-            output_colorspace = input_image.colorSpace() or Quartz.CGColorSpaceCreateWithName(
+            output_colorspace = (
-                Quartz.CoreGraphics.kCGColorSpaceSRGB
+                input_image.colorSpace()
                or Quartz.CGColorSpaceCreateWithName(
                    Quartz.CoreGraphics.kCGColorSpaceSRGB
                )
            )
            output_options = NSDictionary.dictionaryWithDictionary_(
@@ -123,4 +123,3 @@ class ImageConverter:
                raise ImageConversionError(
                    f"Error converting file {input_path} to jpeg at {output_path}: {error}"
                )
Author	SHA1	Message	Date
Rhet Turnbull	1391675a3a	Updated tests and docs	2021-12-31 20:31:15 -08:00
Rhet Turnbull	a3b2784f31	ImageConverter now uses generic context; #562	2021-12-31 17:34:41 -08:00
Rhet Turnbull	cbe79ee98c	Updated docs [skip ci]	2021-12-31 09:45:42 -08:00
Rhet Turnbull	eb7a2988bf	Updated CHANGELOG.md [skip ci]	2021-12-31 09:45:19 -08:00
`@@ -1,3 +1,3 @@`
	`""" version info """`	`""" version info """`

	`__version__ = "0.44.2"`	`__version__ = "0.44.3"`