More refactoring of export code, #462

tests/test_cli.py

@@ -6868,7 +6868,7 @@ def test_export_download_missing_file_exists():
             ],
         )
         assert result.exit_code == 0
-        assert "exported: 1" in result.output
+        assert "skipped: 1" in result.output
 
 
 @pytest.mark.skipif(

tests/test_export_catalina_10_15_7_use_photos_export.py

@@ -73,7 +73,6 @@ def test_export_default_name(photosdb):
 
     filename = photos[0].original_filename
     expected_dest = pathlib.Path(dest) / filename
-    expected_dest = expected_dest.parent / f"{expected_dest.stem}.jpeg"
     got_dest = photos[0].export(dest, use_photos_export=True)[0]
 
     assert got_dest == str(expected_dest)