From e7958c94e876838e32c72788dc3b654c40958451 Mon Sep 17 00:00:00 2001
From: Rhet Turnbull <rturnbull@gmail.com>
Date: Sun, 17 Nov 2019 17:19:33 -0800
Subject: [PATCH] alpha version of filenames/paths

---
 osxphotos/__init__.py | 37 ++++++++++++++++++++++++++++++++-----
 osxphotos/cmd_line.py |  2 ++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/osxphotos/__init__.py b/osxphotos/__init__.py
index 3a007ce2..f5b890ce 100644
--- a/osxphotos/__init__.py
+++ b/osxphotos/__init__.py
@@ -90,9 +90,9 @@ class PhotosDB:
         # logger.debug(system, major)
         if system != "Darwin" or (major not in _TESTED_OS_VERSIONS):
             print(
-                "WARNING: This module has only been tested with MacOS 10."
-                + f"[{', '.join(_TESTED_OS_VERSIONS)}]: "
-                + f"you have {system}, OS version: {major}",
+                f"WARNING: This module has only been tested with MacOS 10."
+                f"[{', '.join(_TESTED_OS_VERSIONS)}]: "
+                f"you have {system}, OS version: {major}",
                 file=sys.stderr,
             )
 
@@ -536,6 +536,10 @@ class PhotosDB:
             self._dbphotos[uuid]["modelID"] = row[1]
             self._dbphotos[uuid]["masterUuid"] = row[2]
             self._dbphotos[uuid]["filename"] = row[3]
+            
+            # TODO: Photos 5 has filename and originalFilename, is there equiv for older database formats?
+            self._dbphotos[uuid]["originalFilename"] = row[3] 
+
             try:
                 self._dbphotos[uuid]["lastmodifieddate"] = datetime.fromtimestamp(
                     row[4] + td
@@ -1075,8 +1079,14 @@ class PhotoInfo:
         self.__db = db
 
     def filename(self):
+        """ return filename of the picture """
         return self.__info["filename"]
 
+    def original_filename(self):
+        """ return original filename of the picture """
+        """ Photos 5 mangles filenames upon import """
+        return self.__info["originalFilename"]
+
     def date(self):
         """ image creation date as timezone aware datetime object """
         imagedate = self.__info["imageDate"]
@@ -1109,8 +1119,23 @@ class PhotoInfo:
                 photopath = None  # path would be meaningless until downloaded
                 # TODO: Is there a way to use applescript to force the download in this
         else:
-            return "NOT YET IMPLEMENTED"
-            # Photos 5
+            if self.__info["masterFingerprint"]:
+                # if masterFingerprint is not null, path appears to be valid
+                if self.__info["directory"].startswith("/"):
+                    photopath = os.path.join(
+                        self.__info["directory"], self.__info["filename"]
+                    )
+                else:
+                    photopath = os.path.join(
+                        self.__db._masters_path,
+                        self.__info["directory"],
+                        self.__info["filename"],
+                    )
+            else:
+                logging.debug("WARNING: masterFingerprint null",pformat(self.__info))
+
+            logging.debug(photopath)
+            return photopath
             # ZZZ
 
         return photopath
@@ -1169,9 +1194,11 @@ class PhotoInfo:
 
     def to_json(self):
         """ return JSON representation """
+        #TODO: Add additional details here
         pic = {
             "uuid": self.uuid(),
             "filename": self.filename(),
+            "original_filename": self.original_filename(),
             "date": str(self.date()),
             "description": self.description(),
             "name": self.name(),
diff --git a/osxphotos/cmd_line.py b/osxphotos/cmd_line.py
index 8a2f44d0..eef2448d 100644
--- a/osxphotos/cmd_line.py
+++ b/osxphotos/cmd_line.py
@@ -168,6 +168,7 @@ def print_photo_info(photos, json=False):
             [
                 "uuid",
                 "filename",
+                "original_filename",
                 "date",
                 "description",
                 "name",
@@ -184,6 +185,7 @@ def print_photo_info(photos, json=False):
                 [
                     p.uuid(),
                     p.filename(),
+                    p.original_filename(),
                     str(p.date()),
                     p.description(),
                     p.name(),