Fixed detected_text to use image orientation if available

CHANGELOG.md

@@ -4,6 +4,14 @@ 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.42.82](https://github.com/RhetTbull/osxphotos/compare/v0.42.80...v0.42.82)
+
+> 14 September 2021
+
+- Fix for #515 [`93bf0c2`](https://github.com/RhetTbull/osxphotos/commit/93bf0c210cf01f351611427662025c86955ac373)
+- Fix for #515, updated tests [`59c31ff`](https://github.com/RhetTbull/osxphotos/commit/59c31ff88d099b251cf1b571279d7a28a0aac138)
+- Updated docs [`773dca8`](https://github.com/RhetTbull/osxphotos/commit/773dca849424c61a7447cb1bb87140708ab0a07c)
+
 #### [v0.42.80](https://github.com/RhetTbull/osxphotos/compare/v0.42.79...v0.42.80)
 
 > 29 August 2021

README.md

@@ -1702,7 +1702,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.42.82'
+{osxphotos_version}             The osxphotos version, e.g. '0.42.83'
 {osxphotos_cmd_line}            The full command line used to run osxphotos
 
 The following substitutions may result in multiple values. Thus if specified for
@@ -3561,7 +3561,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.42.82'|
+|{osxphotos_version}|The osxphotos version, e.g. '0.42.83'|
 |{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|

osxphotos/_version.py

@@ -1,3 +1,3 @@
 """ version info """
 
-__version__ = "0.42.82"
+__version__ = "0.42.83"

osxphotos/photoinfo/photoinfo.py

@@ -1054,15 +1054,15 @@ class PhotoInfo:
             return self._info["orientation"]
 
         # For Photos 5+, try to get the adjusted orientation
-        if self.hasadjustments:
-            if self.adjustments:
-                return self.adjustments.adj_orientation
-            else:
-                # can't reliably determine orientation for edited photo if adjustmentinfo not available
-                return 0
-        else:
+        if not self.hasadjustments:
             return self._info["orientation"]
 
+        if self.adjustments:
+            return self.adjustments.adj_orientation
+        else:
+            # can't reliably determine orientation for edited photo if adjustmentinfo not available
+            return 0
+
     @property
     def original_height(self):
         """returns height of the original photo version in pixels"""
@@ -1156,7 +1156,8 @@ class PhotoInfo:
         md = OSXMetaData(path)
         detected_text = md.get_attribute("osxphotos_detected_text")
         if detected_text is None:
-            detected_text = detect_text(path)
+            orientation = self.orientation or None
+            detected_text = detect_text(path, orientation)
             md.set_attribute("osxphotos_detected_text", detected_text)
         return detected_text
 

osxphotos/text_detection.py

@@ -1,7 +1,7 @@
 """ Use Apple's Vision Framework via PyObjC to perform text detection on images (macOS 10.15+ only) """
 
 import logging
-from typing import List
+from typing import List, Optional
 
 import objc
 import Quartz
@@ -22,8 +22,13 @@ else:
     vision = True
 
 
-def detect_text(img_path: str) -> List:
-    """process image at img_path with VNRecognizeTextRequest and return list of results"""
+def detect_text(img_path: str, orientation: Optional[int] = None) -> List:
+    """process image at img_path with VNRecognizeTextRequest and return list of results
+
+    Args:
+        img_path: path to the image file
+        orientation: optional EXIF orientation (if known, passing orientation may improve quality of results)
+    """
     if not vision:
         logging.warning(f"detect_text not implemented for this version of macOS")
         return []
@@ -40,9 +45,18 @@ def detect_text(img_path: str) -> List:
             input_image = Quartz.CIImage.imageWithContentsOfURL_(input_url)
 
         vision_options = NSDictionary.dictionaryWithDictionary_({})
-        vision_handler = Vision.VNImageRequestHandler.alloc().initWithCIImage_options_(
-            input_image, vision_options
-        )
+        if orientation is not None:
+            if not 1 <= orientation <= 8:
+                raise ValueError("orientation must be between 1 and 8")
+            vision_handler = Vision.VNImageRequestHandler.alloc().initWithCIImage_orientation_options_(
+                input_image, orientation, vision_options
+            )
+        else:
+            vision_handler = (
+                Vision.VNImageRequestHandler.alloc().initWithCIImage_options_(
+                    input_image, vision_options
+                )
+            )
         results = []
         handler = make_request_handler(results)
         vision_request = (

requirements_dev.txt

@@ -4,4 +4,5 @@ pytest-mock
 m2r2
 pyinstaller==4.4
 sphinx_rtd_theme
-
+wheel
+twine