diff --git a/API_README.md b/API_README.md
index fc4e7fd3..4e7b3608 100644
--- a/API_README.md
+++ b/API_README.md
@@ -1943,7 +1943,7 @@ cog.out(get_template_field_table())
|{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.48.2'|
+|{osxphotos_version}|The osxphotos version, e.g. '0.48.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|
diff --git a/README.md b/README.md
index e095d0f0..d3bcf7db 100644
--- a/README.md
+++ b/README.md
@@ -472,6 +472,10 @@ You can also export photos in a certain date range:
`osxphotos export /path/to/export --from-date "2020-01-01" --to-date "2020-02-28"`
+or photos added to the library in the last week:
+
+`osxphotos export /path/to/export --added-in-last "1 week"`
+
#### Converting images to JPEG on export
Photos can store images in many different formats. osxphotos can convert non-JPEG images (for example, RAW photos) to JPEG on export using the `--convert-to-jpeg` option. You can specify the JPEG quality (0: worst, 1.0: best) using `--jpeg-quality`. For example:
@@ -742,6 +746,26 @@ Options:
--year 2022 to find all photos from the year
2022. May be repeated to search multiple
years.
+ --added-before DATE Search for items added to the library before a
+ specific date/time, e.g. --added-before e.g.
+ 2000-01-12T12:00:00,
+ 2001-01-12T12:00:00-07:00, or 2000-12-31 (ISO
+ 8601 with/without timezone).
+ --added-after DATE Search for items added to the libray after a
+ specific date/time, e.g. --added-after e.g.
+ 2000-01-12T12:00:00,
+ 2001-01-12T12:00:00-07:00, or 2000-12-31 (ISO
+ 8601 with/without timezone).
+ --added-in-last TIME_DELTA Search for items added to the library in the
+ last TIME_DELTA, where TIME_DELTA is a string
+ like '12 hrs', '1 day', '1d', '1 week',
+ '2weeks', '1 month', '1 year'. for example,
+ `--added-in-last 7d` and `--added-in-last '1
+ week'` are equivalent. months are assumed to
+ be 30 days and years are assumed to be 365
+ days. Common English abbreviations are
+ accepted, e.g. d, day, days or m, min,
+ minutes.
--has-comment Search for photos that have comments.
--no-comment Search for photos with no comments.
--has-likes Search for photos that have likes.
@@ -1807,7 +1831,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.48.2'
+{osxphotos_version} The osxphotos version, e.g. '0.48.3'
{osxphotos_cmd_line} The full command line used to run osxphotos
The following substitutions may result in multiple values. Thus if specified
@@ -3970,7 +3994,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.48.2'|
+|{osxphotos_version}|The osxphotos version, e.g. '0.48.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|
diff --git a/docs/.buildinfo b/docs/.buildinfo
index c8e30ee3..6f627643 100644
--- 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: 80f83a536e4014ef4d71db9e7d4e82e8
+config: 7bb2c9249a5178c80045917234b5db0f
tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/_modules/index.html b/docs/_modules/index.html
index 260fc5a7..7d0bd96f 100644
--- a/docs/_modules/index.html
+++ b/docs/_modules/index.html
@@ -5,7 +5,7 @@
- Overview: module code - osxphotos 0.48.2 documentation
+ Overview: module code - osxphotos 0.48.3 documentation
@@ -123,7 +123,7 @@
@@ -210,158 +211,163 @@
"""QueryOptions class for PhotosDB.query Attributes:
- keyword: list of keywords to search for
- person: list of person names to search for
+ added_after: search for photos added after a given date
+ added_before: search for photos added before a given date
+ added_in_last: search for photos added in last X datetime.timedelta album: list of album names to search for
- folder: list of folder names to search for
- uuid: list of uuids to search for
- title: list of titles to search for
- no_title: search for photos with no title
+ burst_photos: search for burst photos
+ burst: search for burst photos
+ cloudasset: search for photos that are managed by iCloud
+ deleted_only: search only for deleted photos
+ deleted: also include deleted photos description: list of descriptions to search for
- no_description: search for photos with no description
- ignore_case: ignore case when searching
+ duplicate: search for duplicate photos edited: search for edited photos
+ exif: search for photos with EXIF tags that matches the given data external_edit: search for photos edited in external apps favorite: search for favorite photos
- not_favorite: search for non-favorite photos
- hidden: search for hidden photos
- not_hidden: search for non-hidden photos
- missing: search for missing photos
- not_missing: search for non-missing photos
- shared: search for shared photos
- not_shared: search for non-shared photos
- photos: search for photos
- movies: search for movies
- uti: list of UTIs to search for
- burst: search for burst photos
- not_burst: search for non-burst photos
- live: search for live photos
- not_live: search for non-live photos
- cloudasset: search for photos that are managed by iCloud
- not_cloudasset: search for photos that are not managed by iCloud
- incloud: search for cloud assets that are synched to iCloud
- not_incloud: search for cloud asset photos that are not yet synched to iCloud
+ folder: list of folder names to search for from_date: search for photos taken on or after this date
- to_date: search for photos taken on or before this date
- portrait: search for portrait photos
- not_portrait: search for non-portrait photos
- screenshot: search for screenshot photos
- not_screenshot: search for non-screenshot photos
- slow_mo: search for slow-mo photos
- not_slow_mo: search for non-slow-mo photos
- time_lapse: search for time-lapse photos
- not_time_lapse: search for non-time-lapse photos
- hdr: search for HDR photos
- not_hdr: search for non-HDR photos
- selfie: search for selfie photos
- not_selfie: search for non-selfie photos
- panorama: search for panorama photos
- not_panorama: search for non-panorama photos
- has_raw: search for photos with associated raw files
- place: list of place names to search for
- no_place: search for photos with no place
- label: list of labels to search for
- deleted: also include deleted photos
- deleted_only: search only for deleted photos
- has_comment: search for photos with comments
- no_comment: search for photos with no comments
- has_likes: search for shared photos with likes
- no_likes: search for shared photos with no likes
- is_reference: search for photos stored by reference (that is, they are not managed by Photos)
- in_album: search for photos in an album
- not_in_album: search for photos not in an album
- burst_photos: search for burst photos
- missing_bursts: for burst photos, also include burst photos that are missing
- name: list of names to search for
- min_size: minimum size of photos to search for
- max_size: maximum size of photos to search for
- regex: list of regular expressions to search for
- query_eval: list of query expressions to evaluate
- duplicate: search for duplicate photos
- location: search for photos with a location
- no_location: search for photos with no location function: list of query functions to evaluate
+ has_comment: search for photos with comments
+ has_likes: search for shared photos with likes
+ has_raw: search for photos with associated raw files
+ hdr: search for HDR photos
+ hidden: search for hidden photos
+ ignore_case: ignore case when searching
+ in_album: search for photos in an album
+ incloud: search for cloud assets that are synched to iCloud
+ is_reference: search for photos stored by reference (that is, they are not managed by Photos)
+ keyword: list of keywords to search for
+ label: list of labels to search for
+ live: search for live photos
+ location: search for photos with a location
+ max_size: maximum size of photos to search for
+ min_size: minimum size of photos to search for
+ missing_bursts: for burst photos, also include burst photos that are missing
+ missing: search for missing photos
+ movies: search for movies
+ name: list of names to search for
+ no_comment: search for photos with no comments
+ no_description: search for photos with no description
+ no_likes: search for shared photos with no likes
+ no_location: search for photos with no location
+ no_place: search for photos with no place
+ no_title: search for photos with no title
+ not_burst: search for non-burst photos
+ not_cloudasset: search for photos that are not managed by iCloud
+ not_favorite: search for non-favorite photos
+ not_hdr: search for non-HDR photos
+ not_hidden: search for non-hidden photos
+ not_in_album: search for photos not in an album
+ not_incloud: search for cloud asset photos that are not yet synched to iCloud
+ not_live: search for non-live photos
+ not_missing: search for non-missing photos
+ not_panorama: search for non-panorama photos
+ not_portrait: search for non-portrait photos
+ not_screenshot: search for non-screenshot photos
+ not_selfie: search for non-selfie photos
+ not_shared: search for non-shared photos
+ not_slow_mo: search for non-slow-mo photos
+ not_time_lapse: search for non-time-lapse photos
+ panorama: search for panorama photos
+ person: list of person names to search for
+ photos: search for photos
+ place: list of place names to search for
+ portrait: search for portrait photos
+ query_eval: list of query expressions to evaluate
+ regex: list of regular expressions to search for
+ screenshot: search for screenshot photos selected: search for selected photos
- exif: search for photos with EXIF tags that matches the given data
+ selfie: search for selfie photos
+ shared: search for shared photos
+ slow_mo: search for slow-mo photos
+ time_lapse: search for time-lapse photos
+ title: list of titles to search for
+ to_date: search for photos taken on or before this date
+ uti: list of UTIs to search for
+ uuid: list of uuids to search for year: search for photos taken in a given year
-
"""
- keyword:Optional[Iterable[str]]=None
- person:Optional[Iterable[str]]=None
+ added_after:Optional[datetime.datetime]=None
+ added_before:Optional[datetime.datetime]=None
+ added_in_last:Optional[datetime.timedelta]=Nonealbum:Optional[Iterable[str]]=None
- folder:Optional[Iterable[str]]=None
- uuid:Optional[Iterable[str]]=None
- title:Optional[Iterable[str]]=None
- no_title:Optional[bool]=None
+ burst_photos:Optional[bool]=None
+ burst:Optional[bool]=None
+ cloudasset:Optional[bool]=None
+ deleted_only:Optional[bool]=None
+ deleted:Optional[bool]=Nonedescription:Optional[Iterable[str]]=None
- no_description:Optional[bool]=None
- ignore_case:Optional[bool]=None
+ duplicate:Optional[bool]=Noneedited:Optional[bool]=None
+ exif:Optional[Iterable[Tuple[str,str]]]=Noneexternal_edit:Optional[bool]=Nonefavorite:Optional[bool]=None
- not_favorite:Optional[bool]=None
- hidden:Optional[bool]=None
- not_hidden:Optional[bool]=None
- missing:Optional[bool]=None
- not_missing:Optional[bool]=None
- shared:Optional[bool]=None
- not_shared:Optional[bool]=None
- photos:Optional[bool]=True
- movies:Optional[bool]=True
- uti:Optional[Iterable[str]]=None
- burst:Optional[bool]=None
- not_burst:Optional[bool]=None
- live:Optional[bool]=None
- not_live:Optional[bool]=None
- cloudasset:Optional[bool]=None
- not_cloudasset:Optional[bool]=None
- incloud:Optional[bool]=None
- not_incloud:Optional[bool]=None
+ folder:Optional[Iterable[str]]=Nonefrom_date:Optional[datetime.datetime]=None
- to_date:Optional[datetime.datetime]=Nonefrom_time:Optional[datetime.time]=None
- to_time:Optional[datetime.time]=None
- portrait:Optional[bool]=None
- not_portrait:Optional[bool]=None
- screenshot:Optional[bool]=None
- not_screenshot:Optional[bool]=None
- slow_mo:Optional[bool]=None
- not_slow_mo:Optional[bool]=None
- time_lapse:Optional[bool]=None
- not_time_lapse:Optional[bool]=None
- hdr:Optional[bool]=None
- not_hdr:Optional[bool]=None
- selfie:Optional[bool]=None
- not_selfie:Optional[bool]=None
- panorama:Optional[bool]=None
- not_panorama:Optional[bool]=None
- has_raw:Optional[bool]=None
- place:Optional[Iterable[str]]=None
- no_place:Optional[bool]=None
- label:Optional[Iterable[str]]=None
- deleted:Optional[bool]=None
- deleted_only:Optional[bool]=None
- has_comment:Optional[bool]=None
- no_comment:Optional[bool]=None
- has_likes:Optional[bool]=None
- no_likes:Optional[bool]=None
- is_reference:Optional[bool]=None
- in_album:Optional[bool]=None
- not_in_album:Optional[bool]=None
- burst_photos:Optional[bool]=None
- missing_bursts:Optional[bool]=None
- name:Optional[Iterable[str]]=None
- min_size:Optional[bitmath.Byte]=None
- max_size:Optional[bitmath.Byte]=None
- regex:Optional[Iterable[Tuple[str,str]]]=None
- query_eval:Optional[Iterable[str]]=None
- duplicate:Optional[bool]=None
- location:Optional[bool]=None
- no_location:Optional[bool]=Nonefunction:Optional[List[Tuple[callable,str]]]=None
+ has_comment:Optional[bool]=None
+ has_likes:Optional[bool]=None
+ has_raw:Optional[bool]=None
+ hdr:Optional[bool]=None
+ hidden:Optional[bool]=None
+ ignore_case:Optional[bool]=None
+ in_album:Optional[bool]=None
+ incloud:Optional[bool]=None
+ is_reference:Optional[bool]=None
+ keyword:Optional[Iterable[str]]=None
+ label:Optional[Iterable[str]]=None
+ live:Optional[bool]=None
+ location:Optional[bool]=None
+ max_size:Optional[bitmath.Byte]=None
+ min_size:Optional[bitmath.Byte]=None
+ missing_bursts:Optional[bool]=None
+ missing:Optional[bool]=None
+ movies:Optional[bool]=True
+ name:Optional[Iterable[str]]=None
+ no_comment:Optional[bool]=None
+ no_description:Optional[bool]=None
+ no_likes:Optional[bool]=None
+ no_location:Optional[bool]=None
+ no_place:Optional[bool]=None
+ no_title:Optional[bool]=None
+ not_burst:Optional[bool]=None
+ not_cloudasset:Optional[bool]=None
+ not_favorite:Optional[bool]=None
+ not_hdr:Optional[bool]=None
+ not_hidden:Optional[bool]=None
+ not_in_album:Optional[bool]=None
+ not_incloud:Optional[bool]=None
+ not_live:Optional[bool]=None
+ not_missing:Optional[bool]=None
+ not_panorama:Optional[bool]=None
+ not_portrait:Optional[bool]=None
+ not_screenshot:Optional[bool]=None
+ not_selfie:Optional[bool]=None
+ not_shared:Optional[bool]=None
+ not_slow_mo:Optional[bool]=None
+ not_time_lapse:Optional[bool]=None
+ panorama:Optional[bool]=None
+ person:Optional[Iterable[str]]=None
+ photos:Optional[bool]=True
+ place:Optional[Iterable[str]]=None
+ portrait:Optional[bool]=None
+ query_eval:Optional[Iterable[str]]=None
+ regex:Optional[Iterable[Tuple[str,str]]]=None
+ screenshot:Optional[bool]=Noneselected:Optional[bool]=None
- exif:Optional[Iterable[Tuple[str,str]]]=None
+ selfie:Optional[bool]=None
+ shared:Optional[bool]=None
+ slow_mo:Optional[bool]=None
+ time_lapse:Optional[bool]=None
+ title:Optional[Iterable[str]]=None
+ to_date:Optional[datetime.datetime]=None
+ to_time:Optional[datetime.time]=None
+ uti:Optional[Iterable[str]]=None
+ uuid:Optional[Iterable[str]]=Noneyear:Optional[Iterable[int]]=Nonedefasdict(self):
diff --git a/docs/_sources/template_help.rst.txt b/docs/_sources/template_help.rst.txt
index 1bd241fe..b4cb46d5 100644
--- a/docs/_sources/template_help.rst.txt
+++ b/docs/_sources/template_help.rst.txt
@@ -320,7 +320,7 @@ Template Substitutions
* - {crlf}
- a carriage return + line feed: '\r\n'
* - {osxphotos_version}
- - The osxphotos version, e.g. '0.48.2'
+ - The osxphotos version, e.g. '0.48.3'
* - {osxphotos_cmd_line}
- The full command line used to run osxphotos
* - {album}
diff --git a/docs/_sources/tutorial.rst.txt b/docs/_sources/tutorial.rst.txt
index 670848f4..332fa390 100644
--- a/docs/_sources/tutorial.rst.txt
+++ b/docs/_sources/tutorial.rst.txt
@@ -297,6 +297,10 @@ You can also export photos in a certain date range:
``osxphotos export /path/to/export --from-date "2020-01-01" --to-date "2020-02-28"``
+or photos added to the library in the last week:
+
+``osxphotos export /path/to/export --added-in-last "1 week"``
+
Converting images to JPEG on export
-----------------------------------
diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js
index 4bd0d418..3e0c14ab 100644
--- 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.48.2',
+ VERSION: '0.48.3',
LANGUAGE: 'None',
COLLAPSE_INDEX: false,
BUILDER: 'html',
diff --git a/docs/cli.html b/docs/cli.html
index 1e4b21f7..1aec96ec 100644
--- a/docs/cli.html
+++ b/docs/cli.html
@@ -6,7 +6,7 @@
- OSXPhotos Command Line Interface (CLI) - osxphotos 0.48.2 documentation
+ OSXPhotos Command Line Interface (CLI) - osxphotos 0.48.3 documentation
@@ -124,7 +124,7 @@