Skip to content

Commit 123eaba

Browse files
authored
Initial support for Sequoia / Photos 10 (#1573)
1 parent 9b87ec2 commit 123eaba

26 files changed

+385
-355
lines changed

.bumpversion.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.68.0
2+
current_version = 0.68.1
33
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
44
serialize = {major}.{minor}.{patch}
55

API_README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2564,7 +2564,7 @@ cog.out("\n"+get_template_field_table()+"\n")
25642564
|{cr}|A carriage return: '\r'|
25652565
|{crlf}|A carriage return + line feed: '\r\n'|
25662566
|{tab}|:A tab: '\t'|
2567-
|{osxphotos_version}|The osxphotos version, e.g. '0.68.0'|
2567+
|{osxphotos_version}|The osxphotos version, e.g. '0.68.1'|
25682568
|{osxphotos_cmd_line}|The full command line used to run osxphotos|
25692569
|{album}|Album(s) photo is contained in|
25702570
|{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder|

README.md

+268-268
Large diffs are not rendered by default.

docs/.buildinfo

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: a70be9d0707ca82d46f2fab3689cdf5a
3+
config: 12bb478b94804bd4652e03fc45537eec
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/API_README.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="OSXPhotos Python Reference" href="reference.html" /><link rel="prev" title="OSXPhotos Python Package Overview" href="package_overview.html" />
77

88
<!-- Generated with Sphinx 7.3.7 and Furo 2023.09.10 -->
9-
<title>OSXPhotos Python API - osxphotos 0.68.0 documentation</title>
9+
<title>OSXPhotos Python API - osxphotos 0.68.1 documentation</title>
1010
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=a746c00c" />
1111
<link rel="stylesheet" type="text/css" href="_static/styles/furo.css?v=135e06be" />
1212
<link rel="stylesheet" type="text/css" href="_static/copybutton.css?v=76b2166b" />
@@ -124,7 +124,7 @@
124124
</label>
125125
</div>
126126
<div class="header-center">
127-
<a href="index.html"><div class="brand">osxphotos 0.68.0 documentation</div></a>
127+
<a href="index.html"><div class="brand">osxphotos 0.68.1 documentation</div></a>
128128
</div>
129129
<div class="header-right">
130130
<div class="theme-toggle-container theme-toggle-header">
@@ -147,7 +147,7 @@
147147
<div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
148148

149149

150-
<span class="sidebar-brand-text">osxphotos 0.68.0 documentation</span>
150+
<span class="sidebar-brand-text">osxphotos 0.68.1 documentation</span>
151151

152152
</a><form class="sidebar-search-container" method="get" action="search.html" role="search">
153153
<input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -2822,7 +2822,7 @@ <h3>Template System<a class="headerlink" href="#id166" title="Link to this headi
28222822
</td>
28232823
</tr>
28242824
<tr class="row-odd"><td><p>{osxphotos_version}</p></td>
2825-
<td><p>The osxphotos version, e.g. ‘0.68.0</p></td>
2825+
<td><p>The osxphotos version, e.g. ‘0.68.1</p></td>
28262826
</tr>
28272827
<tr class="row-even"><td><p>{osxphotos_cmd_line}</p></td>
28282828
<td><p>The full command line used to run osxphotos</p></td>
@@ -3679,7 +3679,7 @@ <h2>Additional Examples<a class="headerlink" href="#id174" title="Link to this h
36793679

36803680
</aside>
36813681
</div>
3682-
</div><script src="_static/documentation_options.js?v=c67ccf4f"></script>
3682+
</div><script src="_static/documentation_options.js?v=62044b56"></script>
36833683
<script src="_static/doctools.js?v=9a2dae69"></script>
36843684
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
36853685
<script src="_static/scripts/furo.js?v=32e29ea5"></script>

docs/_modules/index.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../genindex.html" /><link rel="search" title="Search" href="../search.html" />
66

77
<!-- Generated with Sphinx 7.3.7 and Furo 2023.09.10 -->
8-
<title>Overview: module code - osxphotos 0.68.0 documentation</title>
8+
<title>Overview: module code - osxphotos 0.68.1 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=a746c00c" />
1010
<link rel="stylesheet" type="text/css" href="../_static/styles/furo.css?v=135e06be" />
1111
<link rel="stylesheet" type="text/css" href="../_static/copybutton.css?v=76b2166b" />
@@ -123,7 +123,7 @@
123123
</label>
124124
</div>
125125
<div class="header-center">
126-
<a href="../index.html"><div class="brand">osxphotos 0.68.0 documentation</div></a>
126+
<a href="../index.html"><div class="brand">osxphotos 0.68.1 documentation</div></a>
127127
</div>
128128
<div class="header-right">
129129
<div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
146146
<div class="sidebar-sticky"><a class="sidebar-brand" href="../index.html">
147147

148148

149-
<span class="sidebar-brand-text">osxphotos 0.68.0 documentation</span>
149+
<span class="sidebar-brand-text">osxphotos 0.68.1 documentation</span>
150150

151151
</a><form class="sidebar-search-container" method="get" action="../search.html" role="search">
152152
<input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -251,7 +251,7 @@ <h1>All modules for which code is available</h1>
251251

252252
</aside>
253253
</div>
254-
</div><script src="../_static/documentation_options.js?v=c67ccf4f"></script>
254+
</div><script src="../_static/documentation_options.js?v=62044b56"></script>
255255
<script src="../_static/doctools.js?v=9a2dae69"></script>
256256
<script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
257257
<script src="../_static/scripts/furo.js?v=32e29ea5"></script>

docs/_modules/osxphotos/_constants.html

+33-6
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<meta name="viewport" content="width=device-width,initial-scale=1"/>
55
<meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../../genindex.html" /><link rel="search" title="Search" href="../../search.html" />
66

7-
<!-- Generated with Sphinx 7.2.6 and Furo 2023.09.10 -->
8-
<title>osxphotos._constants - osxphotos 0.67.10 documentation</title>
7+
<!-- Generated with Sphinx 7.3.7 and Furo 2023.09.10 -->
8+
<title>osxphotos._constants - osxphotos 0.68.1 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=a746c00c" />
1010
<link rel="stylesheet" type="text/css" href="../../_static/styles/furo.css?v=135e06be" />
1111
<link rel="stylesheet" type="text/css" href="../../_static/copybutton.css?v=76b2166b" />
@@ -123,7 +123,7 @@
123123
</label>
124124
</div>
125125
<div class="header-center">
126-
<a href="../../index.html"><div class="brand">osxphotos 0.67.10 documentation</div></a>
126+
<a href="../../index.html"><div class="brand">osxphotos 0.68.1 documentation</div></a>
127127
</div>
128128
<div class="header-right">
129129
<div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
146146
<div class="sidebar-sticky"><a class="sidebar-brand" href="../../index.html">
147147

148148

149-
<span class="sidebar-brand-text">osxphotos 0.67.10 documentation</span>
149+
<span class="sidebar-brand-text">osxphotos 0.68.1 documentation</span>
150150

151151
</a><form class="sidebar-search-container" method="get" action="../../search.html" role="search">
152152
<input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -251,6 +251,7 @@ <h1>Source code for osxphotos._constants</h1><div class="highlight"><pre>
251251
<span class="n">_PHOTOS_7_MODEL_VERSION</span> <span class="o">=</span> <span class="p">[</span><span class="mi">15000</span><span class="p">,</span> <span class="mi">15999</span><span class="p">]</span> <span class="c1"># Dev preview: 15134, 12.1: 15331</span>
252252
<span class="n">_PHOTOS_8_MODEL_VERSION</span> <span class="o">=</span> <span class="p">[</span><span class="mi">16000</span><span class="p">,</span> <span class="mi">16999</span><span class="p">]</span> <span class="c1"># Ventura dev preview: 16119</span>
253253
<span class="n">_PHOTOS_9_MODEL_VERSION</span> <span class="o">=</span> <span class="p">[</span><span class="mi">17000</span><span class="p">,</span> <span class="mi">17999</span><span class="p">]</span> <span class="c1"># Sonoma dev preview: 17120</span>
254+
<span class="n">_PHOTOS_10_MODEL_VERSION</span> <span class="o">=</span> <span class="p">[</span><span class="mi">18000</span><span class="p">,</span> <span class="mi">18999</span><span class="p">]</span> <span class="c1"># Sequoia dev preview: 18164</span>
254255

255256
<span class="c1"># the preview versions of 12.0.0 had a difference schema for syndication info so need to check model version before processing</span>
256257
<span class="n">_PHOTOS_SYNDICATION_MODEL_VERSION</span> <span class="o">=</span> <span class="mi">15323</span> <span class="c1"># 12.0.1</span>
@@ -273,6 +274,8 @@ <h1>Source code for osxphotos._constants</h1><div class="highlight"><pre>
273274
<span class="s2">&quot;HDR_TYPE&quot;</span><span class="p">:</span> <span class="s2">&quot;ZCUSTOMRENDEREDVALUE&quot;</span><span class="p">,</span>
274275
<span class="s2">&quot;DETECTED_FACE_PERSON_FK&quot;</span><span class="p">:</span> <span class="s2">&quot;ZDETECTEDFACE.ZPERSON&quot;</span><span class="p">,</span>
275276
<span class="s2">&quot;DETECTED_FACE_ASSET_FK&quot;</span><span class="p">:</span> <span class="s2">&quot;ZDETECTEDFACE.ZASSET&quot;</span><span class="p">,</span>
277+
<span class="s2">&quot;MASTER_FINGERPRINT&quot;</span><span class="p">:</span> <span class="s2">&quot;ZADDITIONALASSETATTRIBUTES.ZMASTERFINGERPRINT&quot;</span><span class="p">,</span>
278+
<span class="s2">&quot;HAS_ADJUSTMENTS&quot;</span><span class="p">:</span> <span class="s2">&quot;ZGENERICASSET.ZHASADJUSTMENTS&quot;</span><span class="p">,</span>
276279
<span class="p">},</span>
277280
<span class="mi">6</span><span class="p">:</span> <span class="p">{</span>
278281
<span class="s2">&quot;ASSET&quot;</span><span class="p">:</span> <span class="s2">&quot;ZASSET&quot;</span><span class="p">,</span>
@@ -287,6 +290,8 @@ <h1>Source code for osxphotos._constants</h1><div class="highlight"><pre>
287290
<span class="s2">&quot;HDR_TYPE&quot;</span><span class="p">:</span> <span class="s2">&quot;ZCUSTOMRENDEREDVALUE&quot;</span><span class="p">,</span>
288291
<span class="s2">&quot;DETECTED_FACE_PERSON_FK&quot;</span><span class="p">:</span> <span class="s2">&quot;ZDETECTEDFACE.ZPERSON&quot;</span><span class="p">,</span>
289292
<span class="s2">&quot;DETECTED_FACE_ASSET_FK&quot;</span><span class="p">:</span> <span class="s2">&quot;ZDETECTEDFACE.ZASSET&quot;</span><span class="p">,</span>
293+
<span class="s2">&quot;MASTER_FINGERPRINT&quot;</span><span class="p">:</span> <span class="s2">&quot;ZADDITIONALASSETATTRIBUTES.ZMASTERFINGERPRINT&quot;</span><span class="p">,</span>
294+
<span class="s2">&quot;HAS_ADJUSTMENTS&quot;</span><span class="p">:</span> <span class="s2">&quot;ZASSET.ZHASADJUSTMENTS&quot;</span><span class="p">,</span>
290295
<span class="p">},</span>
291296
<span class="mi">7</span><span class="p">:</span> <span class="p">{</span>
292297
<span class="s2">&quot;ASSET&quot;</span><span class="p">:</span> <span class="s2">&quot;ZASSET&quot;</span><span class="p">,</span>
@@ -301,6 +306,8 @@ <h1>Source code for osxphotos._constants</h1><div class="highlight"><pre>
301306
<span class="s2">&quot;HDR_TYPE&quot;</span><span class="p">:</span> <span class="s2">&quot;ZHDRTYPE&quot;</span><span class="p">,</span>
302307
<span class="s2">&quot;DETECTED_FACE_PERSON_FK&quot;</span><span class="p">:</span> <span class="s2">&quot;ZDETECTEDFACE.ZPERSON&quot;</span><span class="p">,</span>
303308
<span class="s2">&quot;DETECTED_FACE_ASSET_FK&quot;</span><span class="p">:</span> <span class="s2">&quot;ZDETECTEDFACE.ZASSET&quot;</span><span class="p">,</span>
309+
<span class="s2">&quot;MASTER_FINGERPRINT&quot;</span><span class="p">:</span> <span class="s2">&quot;ZADDITIONALASSETATTRIBUTES.ZMASTERFINGERPRINT&quot;</span><span class="p">,</span>
310+
<span class="s2">&quot;HAS_ADJUSTMENTS&quot;</span><span class="p">:</span> <span class="s2">&quot;ZASSET.ZHASADJUSTMENTS&quot;</span><span class="p">,</span>
304311
<span class="p">},</span>
305312
<span class="mi">8</span><span class="p">:</span> <span class="p">{</span>
306313
<span class="s2">&quot;ASSET&quot;</span><span class="p">:</span> <span class="s2">&quot;ZASSET&quot;</span><span class="p">,</span>
@@ -315,6 +322,8 @@ <h1>Source code for osxphotos._constants</h1><div class="highlight"><pre>
315322
<span class="s2">&quot;HDR_TYPE&quot;</span><span class="p">:</span> <span class="s2">&quot;ZHDRTYPE&quot;</span><span class="p">,</span>
316323
<span class="s2">&quot;DETECTED_FACE_PERSON_FK&quot;</span><span class="p">:</span> <span class="s2">&quot;ZDETECTEDFACE.ZPERSON&quot;</span><span class="p">,</span>
317324
<span class="s2">&quot;DETECTED_FACE_ASSET_FK&quot;</span><span class="p">:</span> <span class="s2">&quot;ZDETECTEDFACE.ZASSET&quot;</span><span class="p">,</span>
325+
<span class="s2">&quot;MASTER_FINGERPRINT&quot;</span><span class="p">:</span> <span class="s2">&quot;ZADDITIONALASSETATTRIBUTES.ZMASTERFINGERPRINT&quot;</span><span class="p">,</span>
326+
<span class="s2">&quot;HAS_ADJUSTMENTS&quot;</span><span class="p">:</span> <span class="s2">&quot;ZASSET.ZHASADJUSTMENTS&quot;</span><span class="p">,</span>
318327
<span class="p">},</span>
319328
<span class="mi">9</span><span class="p">:</span> <span class="p">{</span>
320329
<span class="s2">&quot;ASSET&quot;</span><span class="p">:</span> <span class="s2">&quot;ZASSET&quot;</span><span class="p">,</span>
@@ -329,6 +338,24 @@ <h1>Source code for osxphotos._constants</h1><div class="highlight"><pre>
329338
<span class="s2">&quot;HDR_TYPE&quot;</span><span class="p">:</span> <span class="s2">&quot;ZHDRTYPE&quot;</span><span class="p">,</span>
330339
<span class="s2">&quot;DETECTED_FACE_PERSON_FK&quot;</span><span class="p">:</span> <span class="s2">&quot;ZDETECTEDFACE.ZPERSONFORFACE&quot;</span><span class="p">,</span>
331340
<span class="s2">&quot;DETECTED_FACE_ASSET_FK&quot;</span><span class="p">:</span> <span class="s2">&quot;ZDETECTEDFACE.ZASSETFORFACE&quot;</span><span class="p">,</span>
341+
<span class="s2">&quot;MASTER_FINGERPRINT&quot;</span><span class="p">:</span> <span class="s2">&quot;ZADDITIONALASSETATTRIBUTES.ZMASTERFINGERPRINT&quot;</span><span class="p">,</span>
342+
<span class="s2">&quot;HAS_ADJUSTMENTS&quot;</span><span class="p">:</span> <span class="s2">&quot;ZASSET.ZHASADJUSTMENTS&quot;</span><span class="p">,</span>
343+
<span class="p">},</span>
344+
<span class="mi">10</span><span class="p">:</span> <span class="p">{</span>
345+
<span class="s2">&quot;ASSET&quot;</span><span class="p">:</span> <span class="s2">&quot;ZASSET&quot;</span><span class="p">,</span>
346+
<span class="s2">&quot;KEYWORD_JOIN&quot;</span><span class="p">:</span> <span class="s2">&quot;Z_1KEYWORDS.Z_48KEYWORDS&quot;</span><span class="p">,</span>
347+
<span class="s2">&quot;ALBUM_JOIN&quot;</span><span class="p">:</span> <span class="s2">&quot;Z_31ASSETS.Z_3ASSETS&quot;</span><span class="p">,</span>
348+
<span class="s2">&quot;ALBUM_SORT_ORDER&quot;</span><span class="p">:</span> <span class="s2">&quot;Z_31ASSETS.Z_FOK_3ASSETS&quot;</span><span class="p">,</span>
349+
<span class="s2">&quot;IMPORT_FOK&quot;</span><span class="p">:</span> <span class="s2">&quot;null&quot;</span><span class="p">,</span>
350+
<span class="s2">&quot;DEPTH_STATE&quot;</span><span class="p">:</span> <span class="s2">&quot;ZASSET.ZDEPTHTYPE&quot;</span><span class="p">,</span>
351+
<span class="s2">&quot;UTI_ORIGINAL&quot;</span><span class="p">:</span> <span class="s2">&quot;ZINTERNALRESOURCE.ZCOMPACTUTI&quot;</span><span class="p">,</span>
352+
<span class="s2">&quot;ASSET_ALBUM_JOIN&quot;</span><span class="p">:</span> <span class="s2">&quot;Z_31ASSETS.Z_31ALBUMS&quot;</span><span class="p">,</span>
353+
<span class="s2">&quot;ASSET_ALBUM_TABLE&quot;</span><span class="p">:</span> <span class="s2">&quot;Z_31ASSETS&quot;</span><span class="p">,</span>
354+
<span class="s2">&quot;HDR_TYPE&quot;</span><span class="p">:</span> <span class="s2">&quot;ZHDRTYPE&quot;</span><span class="p">,</span>
355+
<span class="s2">&quot;DETECTED_FACE_PERSON_FK&quot;</span><span class="p">:</span> <span class="s2">&quot;ZDETECTEDFACE.ZPERSONFORFACE&quot;</span><span class="p">,</span>
356+
<span class="s2">&quot;DETECTED_FACE_ASSET_FK&quot;</span><span class="p">:</span> <span class="s2">&quot;ZDETECTEDFACE.ZASSETFORFACE&quot;</span><span class="p">,</span>
357+
<span class="s2">&quot;MASTER_FINGERPRINT&quot;</span><span class="p">:</span> <span class="s2">&quot;ZADDITIONALASSETATTRIBUTES.ZORIGINALSTABLEHASH&quot;</span><span class="p">,</span>
358+
<span class="s2">&quot;HAS_ADJUSTMENTS&quot;</span><span class="p">:</span> <span class="s2">&quot;ZASSET.ZADJUSTMENTSSTATE&quot;</span><span class="p">,</span>
332359
<span class="p">},</span>
333360
<span class="p">}</span>
334361

@@ -760,8 +787,8 @@ <h1>Source code for osxphotos._constants</h1><div class="highlight"><pre>
760787

761788
</aside>
762789
</div>
763-
</div><script src="../../_static/documentation_options.js?v=1337ec41"></script>
764-
<script src="../../_static/doctools.js?v=888ff710"></script>
790+
</div><script src="../../_static/documentation_options.js?v=62044b56"></script>
791+
<script src="../../_static/doctools.js?v=9a2dae69"></script>
765792
<script src="../../_static/sphinx_highlight.js?v=dc90522c"></script>
766793
<script src="../../_static/scripts/furo.js?v=32e29ea5"></script>
767794
<script src="../../_static/clipboard.min.js?v=a7894cd8"></script>

0 commit comments

Comments
 (0)