Fix for accented characters in album names, #561

.all-contributorsrc

@@ -293,7 +293,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/6291?v=4",
       "profile": "https://hyfen.net",
       "contributions": [
-        "doc"
+        "doc", "code"
       ]
     },
     {

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+** Before submitting a bug report, please ensure you are running the most recent version of osxphotos and that the bug is reproducible on the latest version **
+
+- If you installed with pipx: `pipx upgrade osxphotos`
+- If you installed with pip: `pip install --upgrade osxphotos`
+- If you installed the pre-built binary, download and install the latest [release](https://github.com/RhetTbull/osxphotos/releases)
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. What' the full command line you used with osxphotos?
+2. What was the error output?
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. which version of macOS]
+ - osxphotos version (`osxphotos --version`)
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature request
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

CHANGELOG.md

@@ -4,6 +4,19 @@ 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.43.6](https://github.com/RhetTbull/osxphotos/compare/v0.43.5...v0.43.6)
+
+> 10 December 2021
+
+- Fixes typo in README [`#548`](https://github.com/RhetTbull/osxphotos/pull/548)
+- docs: add alandefreitas as a contributor for bug [`#551`](https://github.com/RhetTbull/osxphotos/pull/551)
+- docs: add dgleich as a contributor for code [`#541`](https://github.com/RhetTbull/osxphotos/pull/541)
+- Updated docs [`197e566`](https://github.com/RhetTbull/osxphotos/commit/197e5663df058a013ce2d6f8c5fd7ff71a5cc46e)
+- Added test library for Monterey on M1 [`3e038bf`](https://github.com/RhetTbull/osxphotos/commit/3e038bf124b98d6b74f19dd4db0f8f1e3c48e787)
+- Updated docs [skip ci] [`f6dedaa`](https://github.com/RhetTbull/osxphotos/commit/f6dedaa6197dc244616c5b4e9e8ce42ce6b7a252)
+- Added MomentInfo for Photos 5+, #71 [`a52b4d2`](https://github.com/RhetTbull/osxphotos/commit/a52b4d2f43970086bf25659bd58dc8479b841704)
+- Fixed error for missing photo path, #547 [`0906dbe`](https://github.com/RhetTbull/osxphotos/commit/0906dbe6370922b4c9649350014ed8a21d29c4fd)
+
 #### [v0.43.5](https://github.com/RhetTbull/osxphotos/compare/v0.43.4...v0.43.5)
 
 > 25 November 2021

README.md

@@ -139,20 +139,22 @@ Options:
   -h, --help                   Show this message and exit.
 
 Commands:
-  about     Print information about osxphotos including license.
-  albums    Print out albums found in the Photos library.
-  dump      Print list of all photos & associated info from the Photos...
-  export    Export photos from the Photos database.
-  help      Print help; for help on commands: help <command>.
-  info      Print out descriptive info of the Photos library database.
-  keywords  Print out keywords found in the Photos library.
-  labels    Print out image classification labels found in the Photos...
-  list      Print list of Photos libraries found on the system.
-  persons   Print out persons (faces) found in the Photos library.
-  places    Print out places found in the Photos library.
-  query     Query the Photos database using 1 or more search options; if...
-  repl      Run interactive osxphotos shell
-  tutorial  Display osxphotos tutorial.
+  about      Print information about osxphotos including license.
+  albums     Print out albums found in the Photos library.
+  dump       Print list of all photos & associated info from the Photos...
+  export     Export photos from the Photos database.
+  help       Print help; for help on commands: help <command>.
+  info       Print out descriptive info of the Photos library database.
+  install    Install Python packages into the same environment as osxphotos
+  keywords   Print out keywords found in the Photos library.
+  labels     Print out image classification labels found in the Photos...
+  list       Print list of Photos libraries found on the system.
+  persons    Print out persons (faces) found in the Photos library.
+  places     Print out places found in the Photos library.
+  query      Query the Photos database using 1 or more search options; if...
+  repl       Run interactive osxphotos REPL shell (useful for debugging,...
+  tutorial   Display osxphotos tutorial.
+  uninstall  Uninstall Python packages from the osxphotos environment
 ```
 
 To get help on a specific command, use `osxphotos help <command_name>`
@@ -729,6 +731,15 @@ Options:
                                   repeating '--regex' with different arguments.
   --selected                      Filter for photos that are currently selected
                                   in Photos.
+  --exif EXIF_TAG VALUE           Search for photos where EXIF_TAG exists in
+                                  photo's EXIF data and contains VALUE. For
+                                  example, to find photos created by Adobe
+                                  Photoshop: `--exif Software 'Adobe Photoshop'
+                                  `or to find all photos shot on a Canon camera:
+                                  `--exif Make Canon`. EXIF_TAG can be any valid
+                                  exiftool tag, with or without group name, e.g.
+                                  `EXIF:Make` or `Make`. To use --exif, exiftool
+                                  must be installed and in the path.
   --query-eval CRITERIA           Evaluate CRITERIA to filter photos. CRITERIA
                                   will be evaluated in context of the following
                                   python list comprehension: `photos = [photo
@@ -1703,7 +1714,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.43.6'
+{osxphotos_version}             The osxphotos version, e.g. '0.43.8'
 {osxphotos_cmd_line}            The full command line used to run osxphotos
 
 The following substitutions may result in multiple values. Thus if specified for
@@ -1862,13 +1873,13 @@ Both the '{shell_quote}' template and the '|shell_quote' template filter are
 available for this purpose.  For example, the following command outputs the full
 path of newly exported files to file 'new.txt':
 
---post-command new "echo {filepath.name|shell_quote} >> {shell_quote,{export_dir}/exported.txt}"
+--post-command new "echo {filepath|shell_quote} >> {shell_quote,{export_dir}/exported.txt}"
 
-In the above command, the 'shell_quote' filter is used to ensure
-'{filepath.name}' is properly quoted and the '{shell_quote}' template ensures
-the constructed path of '{exported_dir}/exported.txt' is properly quoted. If
-'{filepath.name}' is 'IMG 1234.jpeg' and '{export_dir}' is '/Volumes/Photo
-Export', the command thus renders to:
+In the above command, the 'shell_quote' filter is used to ensure '{filepath}' is
+properly quoted and the '{shell_quote}' template ensures the constructed path of
+'{exported_dir}/exported.txt' is properly quoted. If '{filepath}' is 'IMG
+1234.jpeg' and '{export_dir}' is '/Volumes/Photo Export', the command thus
+renders to:
 
 echo 'IMG 1234.jpeg' >> '/Volumes/Photo Export/exported.txt'
 
@@ -3573,7 +3584,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.43.6'|
+|{osxphotos_version}|The osxphotos version, e.g. '0.43.8'|
 |{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|
@@ -3678,13 +3689,6 @@ Returns path to last opened Photo Library as string.
 
 Returns list of Photos libraries found on the system.  **Note**: On MacOS 10.15, this appears to list all libraries. On older systems, it may not find some libraries if they are not located in ~/Pictures.  Provided for convenience but do not rely on this to find all libraries on the system.
 
-#### `dd_to_dms_str(lat, lon)`
-Convert latitude, longitude in degrees to degrees, minutes, seconds as string.
-- `lat`: latitude in degrees
-- `lon`: longitude in degrees
-returns: string tuple in format ("51 deg 30' 12.86\\" N", "0 deg 7' 54.50\\" W")
-This is the same format used by exiftool's json format.
-
 
 ## Examples
 
@@ -3803,7 +3807,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://www.cs.purdue.edu/homes/dgleich"><img src="https://avatars.githubusercontent.com/u/33995?v=4?s=75" width="75px;" alt=""/><br /><sub><b>David Gleich</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=dgleich" title="Code">💻</a></td>
     <td align="center"><a href="https://alandefreitas.github.io/alandefreitas/"><img src="https://avatars.githubusercontent.com/u/5369819?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Alan de Freitas</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/issues?q=author%3Aalandefreitas" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://hyfen.net"><img src="https://avatars.githubusercontent.com/u/6291?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Andrew Louis</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=hyfen" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://hyfen.net"><img src="https://avatars.githubusercontent.com/u/6291?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Andrew Louis</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=hyfen" title="Documentation">📖</a> <a href="https://github.com/RhetTbull/osxphotos/commits?author=hyfen" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/neebah"><img src="https://avatars.githubusercontent.com/u/71442026?v=4?s=75" width="75px;" alt=""/><br /><sub><b>neebah</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/issues?q=author%3Aneebah" title="Bug reports">🐛</a></td>
   </tr>
 </table>

dev_requirements.txt

@@ -1,7 +1,10 @@
+build
+m2r2
+pyinstaller==4.4
+pytest-mock
 pytest==6.2.4
-pytest-mock==3.6.1
-Sphinx==4.0.2
-sphinx-rtd-theme==0.5.2
-wheel==0.36.2
-twine==3.4.1
-pyinstaller==4.3
+sphinx_click
+sphinx_rtd_theme
+twine
+wheel
+Sphinx

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: cdd46109afb0efbfdb2b6d0f2dea647d
+config: 72fd70158d2f5a08b80c8c23b4740046
 tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/_modules/index.html

@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Overview: module code &#8212; osxphotos 0.43.6 documentation</title>
+    <title>Overview: module code &#8212; osxphotos 0.43.8 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>
@@ -93,7 +93,7 @@
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.2.0</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.3.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
     </div>

docs/_modules/osxphotos/photosdb/photosdb.html

@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos.photosdb.photosdb &#8212; osxphotos 0.43.6 documentation</title>
+    <title>osxphotos.photosdb.photosdb &#8212; osxphotos 0.43.8 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>
@@ -45,6 +45,7 @@
 <span class="kn">import</span> <span class="nn">sys</span>
 <span class="kn">import</span> <span class="nn">tempfile</span>
 <span class="kn">from</span> <span class="nn">collections</span> <span class="kn">import</span> <span class="n">OrderedDict</span>
+<span class="kn">from</span> <span class="nn">collections.abc</span> <span class="kn">import</span> <span class="n">Iterable</span>
 <span class="kn">from</span> <span class="nn">datetime</span> <span class="kn">import</span> <span class="n">datetime</span><span class="p">,</span> <span class="n">timedelta</span><span class="p">,</span> <span class="n">timezone</span>
 <span class="kn">from</span> <span class="nn">pprint</span> <span class="kn">import</span> <span class="n">pformat</span>
 <span class="kn">from</span> <span class="nn">typing</span> <span class="kn">import</span> <span class="n">List</span>
@@ -3503,6 +3504,34 @@
                 <span class="c1"># selection only works if photos selected in main media browser</span>
                 <span class="n">photos</span> <span class="o">=</span> <span class="p">[]</span>
 
+        <span class="k">if</span> <span class="n">options</span><span class="o">.</span><span class="n">exif</span><span class="p">:</span>
+            <span class="n">matching_photos</span> <span class="o">=</span> <span class="p">[]</span>
+            <span class="k">for</span> <span class="n">p</span> <span class="ow">in</span> <span class="n">photos</span><span class="p">:</span>
+                <span class="k">if</span> <span class="ow">not</span> <span class="n">p</span><span class="o">.</span><span class="n">exiftool</span><span class="p">:</span>
+                    <span class="k">continue</span>
+                <span class="n">exifdata</span> <span class="o">=</span> <span class="n">p</span><span class="o">.</span><span class="n">exiftool</span><span class="o">.</span><span class="n">asdict</span><span class="p">(</span><span class="n">normalized</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
+                <span class="n">exifdata</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">p</span><span class="o">.</span><span class="n">exiftool</span><span class="o">.</span><span class="n">asdict</span><span class="p">(</span><span class="n">tag_groups</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">normalized</span><span class="o">=</span><span class="kc">True</span><span class="p">))</span>
+                <span class="k">for</span> <span class="n">exiftag</span><span class="p">,</span> <span class="n">exifvalue</span> <span class="ow">in</span> <span class="n">options</span><span class="o">.</span><span class="n">exif</span><span class="p">:</span>
+                    <span class="k">if</span> <span class="n">options</span><span class="o">.</span><span class="n">ignore_case</span><span class="p">:</span>
+                        <span class="n">exifvalue</span> <span class="o">=</span> <span class="n">exifvalue</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span>
+                        <span class="n">exifdata_value</span> <span class="o">=</span> <span class="n">exifdata</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="n">exiftag</span><span class="o">.</span><span class="n">lower</span><span class="p">(),</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
+                        <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">exifdata_value</span><span class="p">,</span> <span class="nb">str</span><span class="p">):</span>
+                            <span class="n">exifdata_value</span> <span class="o">=</span> <span class="n">exifdata_value</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span>
+                        <span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">exifdata_value</span><span class="p">,</span> <span class="n">Iterable</span><span class="p">):</span>
+                            <span class="n">exifdata_value</span> <span class="o">=</span> <span class="p">[</span><span class="n">v</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span> <span class="k">for</span> <span class="n">v</span> <span class="ow">in</span> <span class="n">exifdata_value</span><span class="p">]</span>
+                        <span class="k">else</span><span class="p">:</span>
+                            <span class="n">exifdata_value</span> <span class="o">=</span> <span class="nb">str</span><span class="p">(</span><span class="n">exifdata_value</span><span class="p">)</span>
+
+                        <span class="k">if</span> <span class="n">exifvalue</span> <span class="ow">in</span> <span class="n">exifdata_value</span><span class="p">:</span>
+                            <span class="n">matching_photos</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">p</span><span class="p">)</span>
+                    <span class="k">else</span><span class="p">:</span>
+                        <span class="n">exifdata_value</span> <span class="o">=</span> <span class="n">exifdata</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="n">exiftag</span><span class="o">.</span><span class="n">lower</span><span class="p">(),</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
+                        <span class="k">if</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">exifdata_value</span><span class="p">,</span> <span class="p">(</span><span class="nb">str</span><span class="p">,</span> <span class="n">Iterable</span><span class="p">)):</span>
+                            <span class="n">exifdata_value</span> <span class="o">=</span> <span class="nb">str</span><span class="p">(</span><span class="n">exifdata_value</span><span class="p">)</span>
+                        <span class="k">if</span> <span class="n">exifvalue</span> <span class="ow">in</span> <span class="n">exifdata_value</span><span class="p">:</span>
+                            <span class="n">matching_photos</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">p</span><span class="p">)</span>
+            <span class="n">photos</span> <span class="o">=</span> <span class="n">matching_photos</span>
+
         <span class="k">if</span> <span class="n">options</span><span class="o">.</span><span class="n">function</span><span class="p">:</span>
             <span class="k">for</span> <span class="n">function</span> <span class="ow">in</span> <span class="n">options</span><span class="o">.</span><span class="n">function</span><span class="p">:</span>
                 <span class="n">photos</span> <span class="o">=</span> <span class="n">function</span><span class="p">[</span><span class="mi">0</span><span class="p">](</span><span class="n">photos</span><span class="p">)</span>
@@ -3630,7 +3659,7 @@
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.2.0</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.3.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
     </div>

docs/_static/documentation_options.js

@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '0.43.6',
+    VERSION: '0.43.8',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

docs/_static/pygments.css

@@ -1,7 +1,7 @@
 pre { line-height: 125%; }
-td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
-span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
-td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+td.linenos pre { color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; }
+span.linenos { color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; }
+td.linenos pre.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
 span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
 .highlight .hll { background-color: #ffffcc }
 .highlight { background: #f8f8f8; }

docs/index.html

@@ -4,9 +4,8 @@
 <html>
   <head>
     <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.43.6 documentation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.43.8 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>
@@ -32,30 +31,30 @@
 
           <div class="body" role="main">
             
-  <section id="welcome-to-osxphotos-s-documentation">
+  <div class="section" id="welcome-to-osxphotos-s-documentation">
 <h1>Welcome to osxphotos’s documentation!<a class="headerlink" href="#welcome-to-osxphotos-s-documentation" title="Permalink to this headline">¶</a></h1>
-</section>
-<section id="osxphotos">
+</div>
+<div class="section" id="osxphotos">
 <h1>OSXPhotos<a class="headerlink" href="#osxphotos" title="Permalink to this headline">¶</a></h1>
-<section id="what-is-osxphotos">
+<div class="section" id="what-is-osxphotos">
 <h2>What is osxphotos?<a class="headerlink" href="#what-is-osxphotos" title="Permalink to this headline">¶</a></h2>
 <p>OSXPhotos provides both the ability to interact with and query Apple’s Photos.app library on macOS directly from your python code
 as well as a very flexible command line interface (CLI) app for exporting photos.
 You can query the Photos library database – for example, file name, file path, and metadata such as keywords/tags, persons/faces, albums, etc.
 You can also easily export both the original and edited photos.</p>
-</section>
-<section id="supported-operating-systems">
+</div>
+<div class="section" id="supported-operating-systems">
 <h2>Supported operating systems<a class="headerlink" href="#supported-operating-systems" title="Permalink to this headline">¶</a></h2>
 <p>Only works on macOS (aka Mac OS X). Tested on macOS Sierra (10.12.6) through macOS Big Sur (11.3).</p>
 <p>If you have access to macOS 12 / Monterey beta and would like to help ensure osxphotos is compatible, please contact me via GitHub.</p>
 <p>This package will read Photos databases for any supported version on any supported macOS version.
 E.g. you can read a database created with Photos 5.0 on MacOS 10.15 on a machine running macOS 10.12 and vice versa.</p>
 <p>Requires python &gt;= <code class="docutils literal notranslate"><span class="pre">3.7</span></code>.</p>
-</section>
-<section id="installation">
+</div>
+<div class="section" id="installation">
 <h2>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h2>
 <p>If you are new to python and just want to use the command line application, I recommend you to install using pipx. See other advanced options below.</p>
-<section id="installation-using-pipx">
+<div class="section" id="installation-using-pipx">
 <h3>Installation using pipx<a class="headerlink" href="#installation-using-pipx" title="Permalink to this headline">¶</a></h3>
 <p>If you aren’t familiar with installing python applications, I recommend you install <code class="docutils literal notranslate"><span class="pre">osxphotos</span></code> with <a class="reference external" href="https://github.com/pipxproject/pipx">pipx</a>. If you use <code class="docutils literal notranslate"><span class="pre">pipx</span></code>, you will not need to create a virtual environment as <code class="docutils literal notranslate"><span class="pre">pipx</span></code> takes care of this. The easiest way to do this on a Mac is to use <a class="reference external" href="https://brew.sh/">homebrew</a>:</p>
 <ul class="simple">
@@ -65,15 +64,15 @@ E.g. you can read a database created with Photos 5.0 on MacOS 10.15 on a machine
 <li><p>Then type this: <code class="docutils literal notranslate"><span class="pre">pipx</span> <span class="pre">install</span> <span class="pre">osxphotos</span></code></p></li>
 <li><p>Now you should be able to run <code class="docutils literal notranslate"><span class="pre">osxphotos</span></code> by typing: <code class="docutils literal notranslate"><span class="pre">osxphotos</span></code></p></li>
 </ul>
-</section>
-<section id="installation-using-pip">
+</div>
+<div class="section" id="installation-using-pip">
 <h3>Installation using pip<a class="headerlink" href="#installation-using-pip" title="Permalink to this headline">¶</a></h3>
 <p>You can also install directly from <a class="reference external" href="https://pypi.org/project/osxphotos/">pypi</a>:</p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">pip</span> <span class="n">install</span> <span class="n">osxphotos</span>
 </pre></div>
 </div>
-</section>
-<section id="installation-from-git-repository">
+</div>
+<div class="section" id="installation-from-git-repository">
 <h3>Installation from git repository<a class="headerlink" href="#installation-from-git-repository" title="Permalink to this headline">¶</a></h3>
 <p>OSXPhotos uses setuptools, thus simply run:</p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">clone</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">github</span><span class="o">.</span><span class="n">com</span><span class="o">/</span><span class="n">RhetTbull</span><span class="o">/</span><span class="n">osxphotos</span><span class="o">.</span><span class="n">git</span>
@@ -88,9 +87,9 @@ I recommend you install the latest version from <a class="reference external" hr
 libraries. If you just want to use the command line utility, you can download a pre-built executable of the latest
 <a class="reference external" href="https://github.com/RhetTbull/osxphotos/releases">release</a> or you can install via <code class="docutils literal notranslate"><span class="pre">pip</span></code> which also installs the command line app.
 If you aren’t comfortable with running python on your Mac, start with the pre-built executable or <code class="docutils literal notranslate"><span class="pre">pipx</span></code> as described above.</p>
-</section>
-</section>
-<section id="command-line-usage">
+</div>
+</div>
+<div class="section" id="command-line-usage">
 <h2>Command Line Usage<a class="headerlink" href="#command-line-usage" title="Permalink to this headline">¶</a></h2>
 <p>This package will install a command line utility called <code class="docutils literal notranslate"><span class="pre">osxphotos</span></code> that allows you to query the Photos database and export photos.
 Alternatively, you can also run the command line utility like this: <code class="docutils literal notranslate"><span class="pre">python3</span> <span class="pre">-m</span> <span class="pre">osxphotos</span></code></p>
@@ -128,38 +127,38 @@ Alternatively, you can also run the command line utility like this: <code class=
 </pre></div>
 </div>
 <p>To get help on a specific command, use <code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">help</span> <span class="pre">&lt;command_name&gt;</span></code></p>
-<section id="command-line-examples">
+<div class="section" id="command-line-examples">
 <h3>Command line examples<a class="headerlink" href="#command-line-examples" title="Permalink to this headline">¶</a></h3>
-<section id="export-all-photos-to-desktop-export-group-in-folders-by-date-created">
+<div class="section" id="export-all-photos-to-desktop-export-group-in-folders-by-date-created">
 <h4>export all photos to ~/Desktop/export group in folders by date created<a class="headerlink" href="#export-all-photos-to-desktop-export-group-in-folders-by-date-created" title="Permalink to this headline">¶</a></h4>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">export</span> <span class="pre">--export-by-date</span> <span class="pre">~/Pictures/Photos\</span> <span class="pre">Library.photoslibrary</span> <span class="pre">~/Desktop/export</span></code></p>
 <p><strong>Note</strong>: Photos library/database path can also be specified using <code class="docutils literal notranslate"><span class="pre">--db</span></code> option:</p>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">export</span> <span class="pre">--export-by-date</span> <span class="pre">--db</span> <span class="pre">~/Pictures/Photos\</span> <span class="pre">Library.photoslibrary</span> <span class="pre">~/Desktop/export</span></code></p>
-</section>
-<section id="find-all-photos-with-keyword-kids-and-output-results-to-json-file-named-results-json">
+</div>
+<div class="section" id="find-all-photos-with-keyword-kids-and-output-results-to-json-file-named-results-json">
 <h4>find all photos with keyword “Kids” and output results to json file named results.json:<a class="headerlink" href="#find-all-photos-with-keyword-kids-and-output-results-to-json-file-named-results-json" title="Permalink to this headline">¶</a></h4>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">query</span> <span class="pre">--keyword</span> <span class="pre">Kids</span> <span class="pre">--json</span> <span class="pre">~/Pictures/Photos\</span> <span class="pre">Library.photoslibrary</span> <span class="pre">&gt;results.json</span></code></p>
-</section>
-<section id="export-photos-to-file-structure-based-on-4-digit-year-and-full-name-of-month-of-photo-s-creation-date">
+</div>
+<div class="section" id="export-photos-to-file-structure-based-on-4-digit-year-and-full-name-of-month-of-photo-s-creation-date">
 <h4>export photos to file structure based on 4-digit year and full name of month of photo’s creation date:<a class="headerlink" href="#export-photos-to-file-structure-based-on-4-digit-year-and-full-name-of-month-of-photo-s-creation-date" title="Permalink to this headline">¶</a></h4>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">export</span> <span class="pre">~/Desktop/export</span> <span class="pre">--directory</span> <span class="pre">&quot;{created.year}/{created.month}&quot;</span></code></p>
 <p>(by default, it will attempt to use the system library)</p>
-</section>
-<section id="export-photos-to-file-structure-based-on-4-digit-year-of-photo-s-creation-date-and-add-keywords-for-media-type-and-labels-labels-are-only-awailable-on-photos-5-and-higher">
+</div>
+<div class="section" id="export-photos-to-file-structure-based-on-4-digit-year-of-photo-s-creation-date-and-add-keywords-for-media-type-and-labels-labels-are-only-awailable-on-photos-5-and-higher">
 <h4>export photos to file structure based on 4-digit year of photo’s creation date and add keywords for media type and labels (labels are only awailable on Photos 5 and higher):<a class="headerlink" href="#export-photos-to-file-structure-based-on-4-digit-year-of-photo-s-creation-date-and-add-keywords-for-media-type-and-labels-labels-are-only-awailable-on-photos-5-and-higher" title="Permalink to this headline">¶</a></h4>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">export</span> <span class="pre">~/Desktop/export</span> <span class="pre">--directory</span> <span class="pre">&quot;{created.year}&quot;</span> <span class="pre">--keyword-template</span> <span class="pre">&quot;{label}&quot;</span> <span class="pre">--keyword-template</span> <span class="pre">&quot;{media_type}&quot;</span></code></p>
-</section>
-<section id="export-default-library-using-country-name-year-as-output-directory-but-use-nocountry-year-if-country-not-specified-add-persons-album-names-and-year-as-keywords-write-exif-metadata-to-files-when-exporting-update-only-changed-files-print-verbose-ouput">
+</div>
+<div class="section" id="export-default-library-using-country-name-year-as-output-directory-but-use-nocountry-year-if-country-not-specified-add-persons-album-names-and-year-as-keywords-write-exif-metadata-to-files-when-exporting-update-only-changed-files-print-verbose-ouput">
 <h4>export default library using ‘country name/year’ as output directory (but use “NoCountry/year” if country not specified), add persons, album names, and year as keywords, write exif metadata to files when exporting, update only changed files, print verbose ouput<a class="headerlink" href="#export-default-library-using-country-name-year-as-output-directory-but-use-nocountry-year-if-country-not-specified-add-persons-album-names-and-year-as-keywords-write-exif-metadata-to-files-when-exporting-update-only-changed-files-print-verbose-ouput" title="Permalink to this headline">¶</a></h4>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">export</span> <span class="pre">~/Desktop/export</span> <span class="pre">--directory</span> <span class="pre">&quot;{place.name.country,NoCountry}/{created.year}&quot;</span>&#160; <span class="pre">--person-keyword</span> <span class="pre">--album-keyword</span> <span class="pre">--keyword-template</span> <span class="pre">&quot;{created.year}&quot;</span> <span class="pre">--exiftool</span> <span class="pre">--update</span> <span class="pre">--verbose</span></code></p>
-</section>
-<section id="find-all-videos-larger-than-200mb-and-add-them-to-photos-album-big-videos-creating-the-album-if-necessary">
+</div>
+<div class="section" id="find-all-videos-larger-than-200mb-and-add-them-to-photos-album-big-videos-creating-the-album-if-necessary">
 <h4>find all videos larger than 200MB and add them to Photos album “Big Videos” creating the album if necessary<a class="headerlink" href="#find-all-videos-larger-than-200mb-and-add-them-to-photos-album-big-videos-creating-the-album-if-necessary" title="Permalink to this headline">¶</a></h4>
 <p><code class="docutils literal notranslate"><span class="pre">osxphotos</span> <span class="pre">query</span> <span class="pre">--only-movies</span> <span class="pre">--min-size</span> <span class="pre">200MB</span> <span class="pre">--add-to-album</span> <span class="pre">&quot;Big</span> <span class="pre">Videos&quot;</span></code></p>
-</section>
-</section>
-</section>
-<section id="example-uses-of-the-package">
+</div>
+</div>
+</div>
+<div class="section" id="example-uses-of-the-package">
 <h2>Example uses of the package<a class="headerlink" href="#example-uses-of-the-package" title="Permalink to this headline">¶</a></h2>
 <div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="sd">&quot;&quot;&quot; Simple usage of the package &quot;&quot;&quot;</span>
 <span class="kn">import</span> <span class="nn">osxphotos</span>
@@ -275,29 +274,50 @@ Alternatively, you can also run the command line utility like this: <code class=
     <span class="n">export</span><span class="p">()</span>  <span class="c1"># pylint: disable=no-value-for-parameter</span>
 </pre></div>
 </div>
-</section>
-<section id="package-interface">
+</div>
+<div class="section" id="package-interface">
 <h2>Package Interface<a class="headerlink" href="#package-interface" title="Permalink to this headline">¶</a></h2>
 <p>Reference full documentation on <a class="reference external" href="https://github.com/RhetTbull/osxphotos/blob/master/README.md">GitHub</a></p>
 <div class="toctree-wrapper compound">
 <ul>
-<li class="toctree-l1"><a class="reference internal" href="cli.html">osxphotos command line interface (CLI)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="cli.html">osxphotos command line interface (CLI)</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="cli.html#osxphotos">osxphotos</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-about">about</a></li>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-albums">albums</a></li>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-dump">dump</a></li>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-export">export</a></li>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-help">help</a></li>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-info">info</a></li>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-install">install</a></li>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-keywords">keywords</a></li>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-labels">labels</a></li>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-list">list</a></li>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-persons">persons</a></li>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-places">places</a></li>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-query">query</a></li>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-repl">repl</a></li>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-tutorial">tutorial</a></li>
+<li class="toctree-l3"><a class="reference internal" href="cli.html#osxphotos-uninstall">uninstall</a></li>
+</ul>
+</li>
+</ul>
+</li>
 <li class="toctree-l1"><a class="reference internal" href="reference.html">osxphotos package</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="reference.html#osxphotos-module">osxphotos module</a></li>
 </ul>
 </li>
 </ul>
 </div>
-</section>
-</section>
-<section id="indices-and-tables">
+</div>
+</div>
+<div class="section" id="indices-and-tables">
 <h1>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Permalink to this headline">¶</a></h1>
 <ul class="simple">
 <li><p><a class="reference internal" href="genindex.html"><span class="std std-ref">Index</span></a></p></li>
 <li><p><a class="reference internal" href="py-modindex.html"><span class="std std-ref">Module Index</span></a></p></li>
 <li><p><a class="reference internal" href="search.html"><span class="std std-ref">Search Page</span></a></p></li>
 </ul>
-</section>
+</div>
 
 
           </div>
@@ -355,7 +375,7 @@ Alternatively, you can also run the command line utility like this: <code class=
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.3.1</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.3.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
       |

docs/modules.html

@@ -4,9 +4,8 @@
 <html>
   <head>
     <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.43.6 documentation</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>osxphotos &#8212; osxphotos 0.43.8 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>
@@ -31,11 +30,11 @@
 
           <div class="body" role="main">
             
-  <section id="osxphotos">
+  <div class="section" id="osxphotos">
 <h1>osxphotos<a class="headerlink" href="#osxphotos" title="Permalink to this headline">¶</a></h1>
 <div class="toctree-wrapper compound">
 </div>
-</section>
+</div>
 
 
           </div>
@@ -92,7 +91,7 @@
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.3.1</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.3.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
       |

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.43.6 documentation</title>
+    <title>Search &#8212; osxphotos 0.43.8 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
     
@@ -111,7 +111,7 @@
       &copy;2021, Rhet Turnbull.
       
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.3.1</a>
+      Powered by <a href="http://sphinx-doc.org/">Sphinx 4.3.2</a>
       &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
       
     </div>

osxphotos/_constants.py

@@ -30,6 +30,8 @@ _TESTED_DB_VERSIONS = ["6000", "4025", "4016", "3301", "2622"]
 # Photos 6 (10.16.0 Beta) == 14104
 _TEST_MODEL_VERSIONS = ["13537", "13703", "14104"]
 
+_PHOTOS_2_VERSION = "2622"
+
 # only version 3 - 4 have RKVersion.selfPortrait
 _PHOTOS_3_VERSION = "3301"
 

osxphotos/_version.py

@@ -1,3 +1,3 @@
 """ version info """
 
-__version__ = "0.43.6"
+__version__ = "0.43.9"

osxphotos/cli.py

@@ -20,6 +20,7 @@ import photoscript
 import rich.traceback
 import yaml
 from rich import pretty
+from runpy import run_module
 
 import osxphotos
 
@@ -62,7 +63,7 @@ from .phototemplate import PhotoTemplate, RenderOptions
 from .pyrepl import embed_repl
 from .queryoptions import QueryOptions
 from .uti import get_preferred_uti_extension
-from .utils import expand_and_validate_filepath, load_function
+from .utils import expand_and_validate_filepath, load_function, normalize_fs_path
 
 # global variable to control verbose output
 # set via --verbose/-V
@@ -542,6 +543,17 @@ def QUERY_OPTIONS(f):
             is_flag=True,
             help="Filter for photos that are currently selected in Photos.",
         ),
+        o(
+            "--exif",
+            metavar="EXIF_TAG VALUE",
+            nargs=2,
+            multiple=True,
+            help="Search for photos where EXIF_TAG exists in photo's EXIF data and contains VALUE. "
+            "For example, to find photos created by Adobe Photoshop: `--exif Software 'Adobe Photoshop' `"
+            "or to find all photos shot on a Canon camera: `--exif Make Canon`. "
+            "EXIF_TAG can be any valid exiftool tag, with or without group name, e.g. `EXIF:Make` or `Make`. "
+            "To use --exif, exiftool must be installed and in the path.",
+        ),
         o(
             "--query-eval",
             metavar="CRITERIA",
@@ -1189,6 +1201,7 @@ def export(
     max_size,
     regex,
     selected,
+    exif,
     query_eval,
     query_function,
     duplicate,
@@ -1353,6 +1366,7 @@ def export(
         max_size = cfg.max_size
         regex = cfg.regex
         selected = cfg.selected
+        exif = cfg.exif
         query_eval = cfg.query_eval
         query_function = cfg.query_function
         duplicate = cfg.duplicate
@@ -1672,6 +1686,7 @@ def export(
         max_size=max_size,
         regex=regex,
         selected=selected,
+        exif=exif,
         query_eval=query_eval,
         function=query_function,
         duplicate=duplicate,
@@ -2084,6 +2099,7 @@ def query(
     max_size,
     regex,
     selected,
+    exif,
     query_eval,
     query_function,
     add_to_album,
@@ -2119,6 +2135,7 @@ def query(
         max_size,
         regex,
         selected,
+        exif,
         duplicate,
     ]
     exclusive = [
@@ -2250,6 +2267,7 @@ def query(
         function=query_function,
         regex=regex,
         selected=selected,
+        exif=exif,
         duplicate=duplicate,
     )
 
@@ -2789,8 +2807,7 @@ def _render_suffix_template(
         rendered_suffix, unmatched = photo.render_template(suffix_template, options)
     except ValueError as e:
         raise click.BadOptionUsage(
-            var_name,
-            f"Invalid template for {option_name} '{suffix_template}': {e}",
+            var_name, f"Invalid template for {option_name} '{suffix_template}': {e}",
         )
     if not rendered_suffix or unmatched:
         raise click.BadOptionUsage(
@@ -2969,7 +2986,7 @@ def export_photo_to_directory(
                 break
             else:
                 click.echo(
-                    "Retrying export for photo ({photo.uuid}: {photo.original_filename})"
+                    f"Retrying export for photo ({photo.uuid}: {photo.original_filename})"
                 )
         except Exception as e:
             click.echo(
@@ -3358,11 +3375,13 @@ def cleanup_files(dest_path, files_to_keep, fileutil):
     Returns:
         tuple of (list of files deleted, list of directories deleted)
     """
-    keepers = {str(filename).lower(): 1 for filename in files_to_keep}
+    keepers = {
+        normalize_fs_path(str(filename).lower()): 1 for filename in files_to_keep
+    }
 
     deleted_files = []
     for p in pathlib.Path(dest_path).rglob("*"):
-        path = str(p).lower()
+        path = normalize_fs_path(str(p).lower())
         if p.is_file() and path not in keepers:
             verbose_(f"Deleting {p}")
             fileutil.unlink(p)
@@ -3480,12 +3499,7 @@ def write_finder_tags(
 
 
 def write_extended_attributes(
-    photo,
-    files,
-    xattr_template,
-    strip=False,
-    export_dir=None,
-    export_db=None,
+    photo, files, xattr_template, strip=False, export_dir=None, export_db=None,
 ):
     """Writes extended attributes to exported files
 
@@ -3602,6 +3616,30 @@ def run_post_command(
                             )
 
 
+@cli.command()
+@click.argument("packages", nargs=-1, required=True)
+@click.option(
+    "-U", "--upgrade", is_flag=True, help="Upgrade packages to latest version"
+)
+def install(packages, upgrade):
+    """Install Python packages into the same environment as osxphotos"""
+    args = ["pip", "install"]
+    if upgrade:
+        args += ["--upgrade"]
+    args += list(packages)
+    sys.argv = args
+    run_module("pip", run_name="__main__")
+
+
+@cli.command()
+@click.argument("packages", nargs=-1, required=True)
+@click.option("-y", "--yes", is_flag=True, help="Don't ask for confirmation")
+def uninstall(packages, yes):
+    """Uninstall Python packages from the osxphotos environment"""
+    sys.argv = ["pip", "uninstall"] + list(packages) + (["-y"] if yes else [])
+    run_module("pip", run_name="__main__")
+
+
 @cli.command(hidden=True)
 @DB_OPTION
 @DB_ARGUMENT
@@ -4047,9 +4085,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMA
 
 @cli.command(name="tutorial")
 @click.argument(
-    "WIDTH",
-    nargs=-1,
-    type=click.INT,
+    "WIDTH", nargs=-1, type=click.INT,
 )
 @click.pass_obj
 @click.pass_context

osxphotos/cli_help.py

@@ -224,13 +224,13 @@ The following attributes may be used with '--xattr-template':
         )
         formatter.write("\n")
         formatter.write(
-            '--post-command new "echo {filepath.name|shell_quote} >> {shell_quote,{export_dir}/exported.txt}"'
+            '--post-command new "echo {filepath|shell_quote} >> {shell_quote,{export_dir}/exported.txt}"'
         )
         formatter.write("\n\n")
         formatter.write_text(
-            "In the above command, the 'shell_quote' filter is used to ensure '{filepath.name}' is properly quoted "
+            "In the above command, the 'shell_quote' filter is used to ensure '{filepath}' is properly quoted "
             + "and the '{shell_quote}' template ensures the constructed path of '{exported_dir}/exported.txt' is properly quoted. "
-            "If '{filepath.name}' is 'IMG 1234.jpeg' and '{export_dir}' is '/Volumes/Photo Export', the command "
+            "If '{filepath}' is 'IMG 1234.jpeg' and '{export_dir}' is '/Volumes/Photo Export', the command "
             "thus renders to: "
         )
         formatter.write("\n")

osxphotos/photosdb/photosdb.py

@@ -12,6 +12,7 @@ import re
 import sys
 import tempfile
 from collections import OrderedDict
+from collections.abc import Iterable
 from datetime import datetime, timedelta, timezone
 from pprint import pformat
 from typing import List
@@ -3470,6 +3471,34 @@ class PhotosDB:
                 # selection only works if photos selected in main media browser
                 photos = []
 
+        if options.exif:
+            matching_photos = []
+            for p in photos:
+                if not p.exiftool:
+                    continue
+                exifdata = p.exiftool.asdict(normalized=True)
+                exifdata.update(p.exiftool.asdict(tag_groups=False, normalized=True))
+                for exiftag, exifvalue in options.exif:
+                    if options.ignore_case:
+                        exifvalue = exifvalue.lower()
+                        exifdata_value = exifdata.get(exiftag.lower(), "")
+                        if isinstance(exifdata_value, str):
+                            exifdata_value = exifdata_value.lower()
+                        elif isinstance(exifdata_value, Iterable):
+                            exifdata_value = [v.lower() for v in exifdata_value]
+                        else:
+                            exifdata_value = str(exifdata_value)
+
+                        if exifvalue in exifdata_value:
+                            matching_photos.append(p)
+                    else:
+                        exifdata_value = exifdata.get(exiftag.lower(), "")
+                        if not isinstance(exifdata_value, (str, Iterable)):
+                            exifdata_value = str(exifdata_value)
+                        if exifvalue in exifdata_value:
+                            matching_photos.append(p)
+            photos = matching_photos
+
         if options.function:
             for function in options.function:
                 photos = function[0](photos)

osxphotos/photosdb/photosdb_utils.py

@@ -4,7 +4,11 @@ import logging
 import plistlib
 
 from .._constants import (
+    _PHOTOS_2_VERSION,
+    _PHOTOS_3_VERSION,
+    _PHOTOS_4_VERSION,
     _PHOTOS_5_MODEL_VERSION,
+    _PHOTOS_5_VERSION,
     _PHOTOS_6_MODEL_VERSION,
     _PHOTOS_7_MODEL_VERSION,
     _TESTED_DB_VERSIONS,
@@ -83,3 +87,32 @@ def get_db_model_version(db_file):
         logging.warning(f"Unknown model version: {model_ver}")
         # cross our fingers and try latest version
         return 7
+
+
+class UnknownLibraryVersion(Exception):
+    pass
+
+
+def get_photos_library_version(library_path):
+    """Return int indicating which Photos version a library was created with """
+    library_path = pathlib.Path(library_path)
+    db_ver = get_db_version(str(library_path / "database" / "photos.db"))
+    db_ver = int(db_ver)
+    if db_ver == int(_PHOTOS_2_VERSION):
+        return 2
+    if db_ver == int(_PHOTOS_3_VERSION):
+        return 3
+    if db_ver == int(_PHOTOS_4_VERSION):
+        return 4
+    if db_ver != int(_PHOTOS_5_VERSION):
+        raise UnknownLibraryVersion(f"db_ver = {db_ver}")
+
+    model_ver = get_model_version(str(library_path / "database" / "Photos.sqlite"))
+    model_ver = int(model_ver)
+    if _PHOTOS_5_MODEL_VERSION[0] <= model_ver <= _PHOTOS_5_MODEL_VERSION[1]:
+        return 5
+    if _PHOTOS_6_MODEL_VERSION[0] <= model_ver <= _PHOTOS_6_MODEL_VERSION[1]:
+        return 6
+    if _PHOTOS_7_MODEL_VERSION[0] <= model_ver <= _PHOTOS_7_MODEL_VERSION[1]:
+        return 7
+    raise UnknownLibraryVersion(f"db_ver = {db_ver}, model_ver = {model_ver}")

osxphotos/queryoptions.py

@@ -84,6 +84,7 @@ class QueryOptions:
     no_location: Optional[bool] = None
     function: Optional[List[Tuple[callable, str]]] = None
     selected: Optional[bool] = None
+    exif: Optional[Iterable[Tuple[str, str]]] = None
 
     def asdict(self):
         return asdict(self)

osxphotos/uti.py

@@ -528,35 +528,38 @@ def _get_uti_from_mdls(extension):
     # mdls -name kMDItemContentType foo.3fr
     # kMDItemContentType = "com.hasselblad.3fr-raw-image"
 
-    with tempfile.NamedTemporaryFile(suffix="." + extension) as temp:
-        output = subprocess.check_output(
-            [
-                "/usr/bin/mdls",
-                "-name",
-                "kMDItemContentType",
-                temp.name,
-            ]
-        ).splitlines()
-        output = output[0].decode("UTF-8") if output else None
-        if not output:
-            return None
+    try:
+        with tempfile.NamedTemporaryFile(suffix="." + extension) as temp:
+            output = subprocess.check_output(
+                [
+                    "/usr/bin/mdls",
+                    "-name",
+                    "kMDItemContentType",
+                    temp.name,
+                ]
+            ).splitlines()
+            output = output[0].decode("UTF-8") if output else None
+            if not output:
+                return None
 
-        match = re.match(r'kMDItemContentType\s+\=\s+"(.*)"', output)
-        if match:
-            return match.group(1)
+            match = re.match(r'kMDItemContentType\s+\=\s+"(.*)"', output)
+            if match:
+                return match.group(1)
+            return None
+    except Exception:
         return None
 
 
 def _get_uti_from_ext_dict(ext):
     try:
-        return EXT_UTI_DICT[ext]
+        return EXT_UTI_DICT[ext.lower()]
     except KeyError:
         return None
 
 
 def _get_ext_from_uti_dict(uti):
     try:
-        return UTI_EXT_DICT[uti]
+        return UTI_EXT_DICT[uti.lower()]
     except KeyError:
         return None
 

requirements_dev.txt

@@ -1,9 +0,0 @@
-build
-m2r2
-pyinstaller==4.4
-pytest-mock
-pytest==6.2.4
-sphinx_click
-sphinx_rtd_theme
-twine
-wheel

tests/test_cli.py

@@ -1,6 +1,7 @@
 r""" Test the command line interface (CLI) """
 
 import os
+import tempfile
 
 import pytest
 from click.testing import CliRunner
@@ -59,17 +60,19 @@ CLI_OUTPUT_NO_SUBCOMMAND = [
     "-v, --version                Show the version and exit.",
     "-h, --help                   Show this message and exit.",
     "Commands:",
-    "  albums    Print out albums found in the Photos library.",
-    "  dump      Print list of all photos & associated info from the Photos",
-    "  export    Export photos from the Photos database.",
-    "  help      Print help; for help on commands: help <command>.",
-    "  info      Print out descriptive info of the Photos library database.",
-    "  keywords  Print out keywords found in the Photos library.",
-    "  labels    Print out image classification labels found in the Photos",
-    "  list      Print list of Photos libraries found on the system.",
-    "  persons   Print out persons (faces) found in the Photos library.",
-    "  places    Print out places found in the Photos library.",
-    "  query     Query the Photos database using 1 or more search options; if",
+    "  albums     Print out albums found in the Photos library.",
+    "  dump       Print list of all photos & associated info from the Photos",
+    "  export     Export photos from the Photos database.",
+    "  help       Print help; for help on commands: help <command>.",
+    "  info       Print out descriptive info of the Photos library database.",
+    "  install    Install Python packages into the same environment as osxphotos",
+    "  keywords   Print out keywords found in the Photos library",
+    "  labels     Print out image classification labels found in the Photos",
+    "  list       Print list of Photos libraries found on the system.",
+    "  persons    Print out persons (faces) found in the Photos library.",
+    "  places     Print out places found in the Photos library.",
+    "  query      Query the Photos database using 1 or more search options; if",
+    "  uninstall  Uninstall Python packages from the osxphotos environment",
 ]
 
 CLI_OUTPUT_QUERY_UUID = '[{"uuid": "D79B8D77-BFFC-460B-9312-034F2877D35B", "filename": "D79B8D77-BFFC-460B-9312-034F2877D35B.jpeg", "original_filename": "Pumkins2.jpg", "date": "2018-09-28T16:07:07-04:00", "description": "Girl holding pumpkin", "title": "I found one!", "keywords": ["Kids"], "albums": ["Pumpkin Farm", "Test Album", "Multi Keyword"], "persons": ["Katie"], "path": "/tests/Test-10.15.7.photoslibrary/originals/D/D79B8D77-BFFC-460B-9312-034F2877D35B.jpeg", "ismissing": false, "hasadjustments": false, "external_edit": false, "favorite": false, "hidden": false, "latitude": 41.256566, "longitude": -95.940257, "path_edited": null, "shared": false, "isphoto": true, "ismovie": false, "uti": "public.jpeg", "burst": false, "live_photo": false, "path_live_photo": null, "iscloudasset": false, "incloud": null}]'
@@ -884,6 +887,13 @@ EXPORT_UNICODE_TITLE_FILENAMES = [
     "Frítest (3).jpg",
 ]
 
+# data for --exif
+QUERY_EXIF_DATA = [("EXIF:Make", "FUJIFILM", ["6191423D-8DB8-4D4C-92BE-9BBBA308AAC4"])]
+QUERY_EXIF_DATA_CASE_INSENSITIVE = [
+    ("Make", "Fujifilm", ["6191423D-8DB8-4D4C-92BE-9BBBA308AAC4"])
+]
+EXPORT_EXIF_DATA = [("EXIF:Make", "FUJIFILM", ["Tulips.jpg", "Tulips_edited.jpeg"])]
+
 
 def modify_file(filename):
     """appends data to a file to modify it"""
@@ -1249,8 +1259,7 @@ def test_query_duplicate():
     runner = CliRunner()
     cwd = os.getcwd()
     result = runner.invoke(
-        query,
-        ["--json", "--db", os.path.join(cwd, CLI_PHOTOS_DB), "--duplicate"],
+        query, ["--json", "--db", os.path.join(cwd, CLI_PHOTOS_DB), "--duplicate"],
     )
     assert result.exit_code == 0
 
@@ -1271,8 +1280,7 @@ def test_query_location():
     runner = CliRunner()
     cwd = os.getcwd()
     result = runner.invoke(
-        query,
-        ["--json", "--db", os.path.join(cwd, CLI_PHOTOS_DB), "--location"],
+        query, ["--json", "--db", os.path.join(cwd, CLI_PHOTOS_DB), "--location"],
     )
     assert result.exit_code == 0
 
@@ -1294,8 +1302,7 @@ def test_query_no_location():
     runner = CliRunner()
     cwd = os.getcwd()
     result = runner.invoke(
-        query,
-        ["--json", "--db", os.path.join(cwd, CLI_PHOTOS_DB), "--no-location"],
+        query, ["--json", "--db", os.path.join(cwd, CLI_PHOTOS_DB), "--no-location"],
     )
     assert result.exit_code == 0
 
@@ -1306,6 +1313,71 @@ def test_query_no_location():
     assert UUID_LOCATION not in uuid_got
 
 
+@pytest.mark.skipif(exiftool is None, reason="exiftool not installed")
+@pytest.mark.parametrize("exiftag,exifvalue,uuid_expected", QUERY_EXIF_DATA)
+def test_query_exif(exiftag, exifvalue, uuid_expected):
+    """Test query with --exif"""
+    import json
+    import os
+    import os.path
+
+    from osxphotos.cli import query
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    result = runner.invoke(
+        query,
+        [
+            "--json",
+            "--db",
+            os.path.join(cwd, CLI_PHOTOS_DB),
+            "--exif",
+            exiftag,
+            exifvalue,
+        ],
+    )
+    assert result.exit_code == 0
+
+    # build list of uuids we got from the output JSON
+    json_got = json.loads(result.output)
+    uuid_got = [photo["uuid"] for photo in json_got]
+    assert sorted(uuid_got) == sorted(uuid_expected)
+
+
+@pytest.mark.skipif(exiftool is None, reason="exiftool not installed")
+@pytest.mark.parametrize(
+    "exiftag,exifvalue,uuid_expected", QUERY_EXIF_DATA_CASE_INSENSITIVE
+)
+def test_query_exif_case_insensitive(exiftag, exifvalue, uuid_expected):
+    """Test query with --exif -i"""
+    import json
+    import os
+    import os.path
+
+    from osxphotos.cli import query
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    result = runner.invoke(
+        query,
+        [
+            "--json",
+            "--db",
+            os.path.join(cwd, CLI_PHOTOS_DB),
+            "--exif",
+            exiftag,
+            exifvalue,
+            "-i",
+        ],
+    )
+    assert result.exit_code == 0
+
+    # build list of uuids we got from the output JSON
+    json_got = json.loads(result.output)
+    uuid_got = [photo["uuid"] for photo in json_got]
+    assert sorted(uuid_got) == sorted(uuid_expected)
+
+
 def test_export():
     import glob
     import os
@@ -4160,6 +4232,29 @@ def test_export_error(monkeypatch):
         assert "Error exporting" in result.output
 
 
+@pytest.mark.skipif(exiftool is None, reason="exiftool not installed")
+@pytest.mark.parametrize("exiftag,exifvalue,files_expected", EXPORT_EXIF_DATA)
+def test_export_exif(exiftag, exifvalue, files_expected):
+    """Test export --exif query """
+    import glob
+    import os
+    import os.path
+
+    import osxphotos
+    from osxphotos.cli import export
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        result = runner.invoke(
+            export,
+            [os.path.join(cwd, CLI_PHOTOS_DB), ".", "--exif", exiftag, exifvalue, "-V"],
+        )
+        files = glob.glob("*")
+        assert sorted(files) == sorted(files_expected)
+
+
 def test_places():
     import json
     import os
@@ -5815,6 +5910,34 @@ def test_export_cleanup_empty_album():
             assert "Deleted: 1 file" in result.output
 
 
+def test_export_cleanup_accented_album_name():
+    """test export with --cleanup flag and photos in album with accented unicode characters (#561)"""
+    import pathlib
+
+    from osxphotos.cli import export
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with tempfile.TemporaryDirectory() as tempdir:
+        result = runner.invoke(export, [os.path.join(cwd, CLI_PHOTOS_DB), ".", "-V"])
+        assert result.exit_code == 0
+
+        result = runner.invoke(
+            export,
+            [
+                os.path.join(cwd, CLI_PHOTOS_DB),
+                tempdir,
+                "-V",
+                "--update",
+                "--cleanup",
+                "--directory",
+                "{folder_album}",
+            ],
+        )
+        assert "Deleted: 0 files, 0 directories" in result.output
+
+
 def test_save_load_config():
     """test --save-config, --load-config"""
     import glob