Merge branch 'master' into save_config

osxphotos/__main__.py

@@ -1413,13 +1413,6 @@ def query(
     "'filename.ext'. For example, with '--original-suffix _original', the original photo "
     "would be named 'filename_original.ext'.  The default suffix is '' (no suffix).",
 )
-@click.option(
-    "--no-extended-attributes",
-    is_flag=True,
-    help="Don't copy extended attributes when exporting.  You only need this if exporting "
-    "to a filesystem that doesn't support Mac OS extended attributes.  Only use this if you get "
-    "an error while exporting.",
-)
 @click.option(
     "--use-photos-export",
     is_flag=True,
@@ -1554,7 +1547,6 @@ def export(
     no_comment,
     has_likes,
     no_likes,
-    no_extended_attributes,
     label,
     deleted,
     deleted_only,
@@ -1957,7 +1949,6 @@ def export(
                     exiftool=exiftool,
                     directory=directory,
                     filename_template=filename_template,
-                    no_extended_attributes=no_extended_attributes,
                     export_raw=export_raw,
                     album_keyword=album_keyword,
                     person_keyword=person_keyword,
@@ -2016,7 +2007,6 @@ def export(
                         exiftool=exiftool,
                         directory=directory,
                         filename_template=filename_template,
-                        no_extended_attributes=no_extended_attributes,
                         export_raw=export_raw,
                         album_keyword=album_keyword,
                         person_keyword=person_keyword,
@@ -2587,7 +2577,6 @@ def export_photo(
     exiftool=None,
     directory=None,
     filename_template=None,
-    no_extended_attributes=None,
     export_raw=None,
     album_keyword=None,
     person_keyword=None,
@@ -2622,7 +2611,6 @@ def export_photo(
         exiftool: use exiftool to write EXIF metadata directly to exported photo
         directory: template used to determine output directory
         filename_template: template use to determine output file
-        no_extended_attributes: boolean; if True, exports photo without preserving extended attributes
         export_raw: boolean; if True exports raw image associate with the photo
         export_edited: boolean; if True exports edited version of photo if there is one
         skip_original_if_edited: boolean; if True does not export original if photo has been edited
@@ -2765,7 +2753,6 @@ def export_photo(
                             overwrite=overwrite,
                             use_photos_export=use_photos_export,
                             exiftool=exiftool,
-                            no_xattr=no_extended_attributes,
                             use_albums_as_keywords=album_keyword,
                             use_persons_as_keywords=person_keyword,
                             keyword_template=keyword_template,
@@ -2849,7 +2836,6 @@ def export_photo(
                             edited=True,
                             use_photos_export=use_photos_export,
                             exiftool=exiftool,
-                            no_xattr=no_extended_attributes,
                             use_albums_as_keywords=album_keyword,
                             use_persons_as_keywords=person_keyword,
                             keyword_template=keyword_template,

osxphotos/_version.py

@@ -1,4 +1,5 @@
 """ version info """
 
-__version__ = "0.37.8"
+__version__ = "0.38.1"
+
 

osxphotos/fileutil.py

@@ -7,6 +7,8 @@ import subprocess
 import sys
 from abc import ABC, abstractmethod
 
+import CoreFoundation
+
 from .imageconverter import ImageConverter
 
 
@@ -82,35 +84,38 @@ class FileUtilMacOS(FileUtilABC):
             raise e
 
     @classmethod
-    def copy(cls, src, dest, norsrc=False):
+    def copy(cls, src, dest):
         """ Copies a file from src path to dest path 
-            src: source path as string 
+        
+        Args:
+            src: source path as string; must be a valid file path
             dest: destination path as string
-            norsrc: (bool) if True, uses --norsrc flag with ditto so it will not copy
-                    resource fork or extended attributes.  May be useful on volumes that
-                    don't work with extended attributes (likely only certain SMB mounts)
-                    default is False
-            Uses ditto to perform copy; will silently overwrite dest if it exists
-            Raises exception if copy fails or either path is None """
+                  dest may be either directory or file; in either case, src file must not exist in dest
+            Note: src and dest may be either a string or a pathlib.Path object
+        
+        Returns:
+            True if copy succeeded
+        
+        Raises:
+            OSError if copy fails
+            TypeError if either path is None
+        """
+        if not isinstance(src, pathlib.Path):
+            src = pathlib.Path(src)
 
-        if src is None or dest is None:
-            raise ValueError("src and dest must not be None", src, dest)
+        if not isinstance(dest, pathlib.Path):
+            dest = pathlib.Path(dest)
 
-        if not os.path.exists(src):
-            raise FileNotFoundError("src file does not appear to exist", src)
+        if dest.is_dir():
+            dest /= src.name
 
-        if norsrc:
-            command = ["/usr/bin/ditto", "--norsrc", src, dest]
-        else:
-            command = ["/usr/bin/ditto", src, dest]
-
-        # if error on copy, subprocess will raise CalledProcessError
-        try:
-            result = subprocess.run(command, check=True, stderr=subprocess.PIPE)
-        except subprocess.CalledProcessError as e:
-            raise e
-
-        return result.returncode
+        filemgr = CoreFoundation.NSFileManager.defaultManager()
+        error = filemgr.copyItemAtPath_toPath_error_(str(src), str(dest), None)
+        # error is a tuple of (bool, error_string)
+        # error[0] is True if copy succeeded
+        if not error[0]:
+            raise OSError(error[1])
+        return True
 
     @classmethod
     def unlink(cls, filepath):

osxphotos/photoinfo/_photoinfo_export.py

@@ -246,7 +246,6 @@ def export(
     use_photos_export=False,
     timeout=120,
     exiftool=False,
-    no_xattr=False,
     use_albums_as_keywords=False,
     use_persons_as_keywords=False,
     keyword_template=None,
@@ -279,7 +278,6 @@ def export(
     use_photos_export: (boolean, default=False); if True will attempt to export photo via applescript interaction with Photos
     timeout: (int, default=120) timeout in seconds used with use_photos_export
     exiftool: (boolean, default = False); if True, will use exiftool to write metadata to export file
-    no_xattr: (boolean, default = False); if True, exports file without preserving extended attributes
     returns list of full paths to the exported files
     use_albums_as_keywords: (boolean, default = False); if True, will include album names in keywords
     when exporting metadata with exiftool or sidecar
@@ -306,7 +304,6 @@ def export(
         use_photos_export=use_photos_export,
         timeout=timeout,
         exiftool=exiftool,
-        no_xattr=no_xattr,
         use_albums_as_keywords=use_albums_as_keywords,
         use_persons_as_keywords=use_persons_as_keywords,
         keyword_template=keyword_template,
@@ -331,7 +328,6 @@ def export2(
     use_photos_export=False,
     timeout=120,
     exiftool=False,
-    no_xattr=False,
     use_albums_as_keywords=False,
     use_persons_as_keywords=False,
     keyword_template=None,
@@ -372,7 +368,6 @@ def export2(
     use_photos_export: (boolean, default=False); if True will attempt to export photo via applescript interaction with Photos
     timeout: (int, default=120) timeout in seconds used with use_photos_export
     exiftool: (boolean, default = False); if True, will use exiftool to write metadata to export file
-    no_xattr: (boolean, default = False); if True, exports file without preserving extended attributes
     use_albums_as_keywords: (boolean, default = False); if True, will include album names in keywords
     when exporting metadata with exiftool or sidecar
     use_persons_as_keywords: (boolean, default = False); if True, will include person names in keywords
@@ -604,7 +599,6 @@ def export2(
             update,
             export_db,
             overwrite,
-            no_xattr,
             export_as_hardlink,
             exiftool,
             touch_file,
@@ -632,7 +626,6 @@ def export2(
                     update,
                     export_db,
                     overwrite,
-                    no_xattr,
                     export_as_hardlink,
                     exiftool,
                     touch_file,
@@ -658,7 +651,6 @@ def export2(
                     update,
                     export_db,
                     overwrite,
-                    no_xattr,
                     export_as_hardlink,
                     exiftool,
                     touch_file,
@@ -964,7 +956,6 @@ def _export_photo(
     update,
     export_db,
     overwrite,
-    no_xattr,
     export_as_hardlink,
     exiftool,
     touch_file,
@@ -985,7 +976,6 @@ def _export_photo(
         update: bool
         export_db: instance of ExportDB that conforms to ExportDB_ABC interface
         overwrite: bool
-        no_xattr: don't copy extended attributes
         export_as_hardlink: bool
         exiftool: bool
         touch_file: bool
@@ -1100,7 +1090,7 @@ def _export_photo(
             converted_stat = fileutil.file_sig(dest_str)
             converted_to_jpeg_files.append(dest_str)
         else:
-            fileutil.copy(src, dest_str, norsrc=no_xattr)
+            fileutil.copy(src, dest_str)
 
         export_db.set_data(
             filename=dest_str,

osxphotos/photosdb/photosdb.py

@@ -12,7 +12,6 @@ import sys
 import tempfile
 from datetime import datetime, timedelta, timezone
 from pprint import pformat
-from shutil import copyfile
 
 from .._constants import (
     _DB_TABLE_NAMES,
@@ -532,14 +531,14 @@ class PhotosDB:
         try:
             dest_name = pathlib.Path(fname).name
             dest_path = os.path.join(self._tempdir_name, dest_name)
-            copyfile(fname, dest_path)
+            FileUtil.copy(fname, dest_path)
             # copy write-ahead log and shared memory files (-wal and -shm) files if they exist
             if os.path.exists(f"{fname}-wal"):
-                copyfile(f"{fname}-wal", f"{dest_path}-wal")
+                FileUtil.copy(f"{fname}-wal", f"{dest_path}-wal")
             if os.path.exists(f"{fname}-shm"):
-                copyfile(f"{fname}-shm", f"{dest_path}-shm")
+                FileUtil.copy(f"{fname}-shm", f"{dest_path}-shm")
         except:
-            print("Error copying " + fname + " to " + dest_path, file=sys.stderr)
+            print(f"Error copying{fname} to {dest_path}", file=sys.stderr)
             raise Exception
 
         if _debug():