Added test for issue #178

osxphotos/_version.py

@@ -1,3 +1,3 @@
 """ version info """
 
-__version__ = "0.29.29"
+__version__ = "0.29.30"

tests/Test-10.15.5.photoslibrary/database/Photos.sqlite.lock

@@ -7,7 +7,7 @@
 	<key>hostuuid</key>
 	<string>9575E48B-8D5F-5654-ABAC-4431B1167324</string>
 	<key>pid</key>
-	<integer>703</integer>
+	<integer>763</integer>
 	<key>processname</key>
 	<string>photolibraryd</string>
 	<key>uid</key>

tests/Test-10.15.5.photoslibrary/private/com.apple.Photos/appPrivateData.plist

@@ -10,6 +10,7 @@
 		<string>88A5F8B8-5B9A-43C7-BB85-3952B81580EB/L0/020</string>
 		<string>29EF7A97-7E76-4D5F-A5E0-CC0A93E8524C/L0/020</string>
 		<string>2C2AF115-BD1D-4434-A747-D1C8BD8E2045/L0/020</string>
+		<string>CB051A4C-2CB7-4B90-B59B-08CC4D0C2823/L0/020</string>
 	</array>
 	<key>Photos</key>
 	<dict>

tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist

@@ -3,24 +3,24 @@
 <plist version="1.0">
 <dict>
 	<key>BackgroundHighlightCollection</key>
-	<date>2020-06-06T14:26:31Z</date>
+	<date>2020-06-24T04:02:13Z</date>
 	<key>BackgroundHighlightEnrichment</key>
-	<date>2020-06-06T14:26:29Z</date>
+	<date>2020-06-24T04:02:12Z</date>
 	<key>BackgroundJobAssetRevGeocode</key>
-	<date>2020-06-06T14:26:31Z</date>
+	<date>2020-06-24T04:02:13Z</date>
 	<key>BackgroundJobSearch</key>
-	<date>2020-06-06T14:26:31Z</date>
+	<date>2020-06-24T04:02:13Z</date>
 	<key>BackgroundPeopleSuggestion</key>
-	<date>2020-06-06T14:26:29Z</date>
+	<date>2020-06-24T04:02:12Z</date>
 	<key>BackgroundUserBehaviorProcessor</key>
-	<date>2020-06-06T14:26:31Z</date>
+	<date>2020-06-24T04:02:13Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphConsistencyUpdateJobDateKey</key>
 	<date>2020-05-30T02:16:06Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
 	<date>2020-05-29T04:31:37Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
-	<date>2020-06-06T14:26:33Z</date>
+	<date>2020-06-24T04:02:13Z</date>
 	<key>SiriPortraitDonation</key>
-	<date>2020-06-06T14:26:31Z</date>
+	<date>2020-06-24T04:02:13Z</date>
 </dict>
 </plist>

tests/test_catalina_10_15_5.py

@@ -66,6 +66,7 @@ UUID_DICT = {
     "export": "D79B8D77-BFFC-460B-9312-034F2877D35B",  # "Pumkins2.jpg"
     "export_tif": "8846E3E6-8AC8-4857-8448-E3D025784410",
     "in_album": "D79B8D77-BFFC-460B-9312-034F2877D35B",  # "Pumkins2.jpg"
+    "date_invalid": "8846E3E6-8AC8-4857-8448-E3D025784410",
 }
 
 UUID_PUMPKIN_FARM = [
@@ -868,12 +869,39 @@ def test_from_to_date():
     photosdb = osxphotos.PhotosDB(PHOTOS_DB)
 
     photos = photosdb.photos(from_date=dt.datetime(2018, 10, 28))
-    assert len(photos) == 7
+    assert len(photos) == 6
 
     photos = photosdb.photos(to_date=dt.datetime(2018, 10, 28))
-    assert len(photos) == 6
+    assert len(photos) == 7
 
     photos = photosdb.photos(
         from_date=dt.datetime(2018, 9, 28), to_date=dt.datetime(2018, 9, 29)
     )
     assert len(photos) == 4
+
+
+def test_date_invalid():
+    """ Test date is invalid """
+    from datetime import datetime, timedelta, timezone
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=[UUID_DICT["date_invalid"]])
+    assert len(photos) == 1
+    p = photos[0]
+    delta = timedelta(seconds=p.tzoffset)
+    tz = timezone(delta)
+    assert p.date == datetime(1970, 1, 1).astimezone(tz=tz)
+
+
+def test_date_modified_invalid():
+    """ Test date modified is invalid """
+    from datetime import datetime, timedelta, timezone
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=[UUID_DICT["date_invalid"]])
+    assert len(photos) == 1
+    p = photos[0]
+    assert p.date_modified is None
+

tests/test_mojave_10_14_6.py

@@ -41,6 +41,7 @@ ALBUM_DICT = {
 UUID_DICT = {
     "favorite": "6bxcNnzRQKGnK4uPrCJ9UQ",
     "not_favorite": "8SOE9s0XQVGsuq4ONohTng",
+    "date_invalid": "YZFCPY24TUySvpu7owiqxA",
 }
 
 
@@ -58,6 +59,7 @@ def test_db_version():
     assert photosdb.db_version in osxphotos._constants._TESTED_DB_VERSIONS
     assert photosdb.db_version == "4025"
 
+
 def test_db_len():
     import osxphotos
 
@@ -407,3 +409,30 @@ def test_multi_person():
     photos = photosdb.photos(persons=["Katie", "Suzy"])
 
     assert len(photos) == 3
+
+
+def test_date_invalid():
+    """ Test date is invalid """
+    from datetime import datetime, timedelta, timezone
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=[UUID_DICT["date_invalid"]])
+    assert len(photos) == 1
+    p = photos[0]
+    delta = timedelta(seconds=p.tzoffset)
+    tz = timezone(delta)
+    assert p.date == datetime(1970, 1, 1).astimezone(tz=tz)
+
+
+def test_date_modified_invalid():
+    """ Test date modified is invalid """
+    from datetime import datetime, timedelta, timezone
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=[UUID_DICT["date_invalid"]])
+    assert len(photos) == 1
+    p = photos[0]
+    assert p.date_modified is None
+