Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relax check on google photos takeout #1348

Merged
merged 2 commits into from
Dec 29, 2023
Merged

Conversation

LunarLanding
Copy link
Contributor

Found that sidecar files from google takeout not always have the 'googlePhotosOrigin' field.
So I disabled the check. Maybe that's good enough?

Found that sidecar files from google takeout not always have the 'googlePhotosOrigin' field.
Copy link
Owner

@RhetTbull RhetTbull left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I had a limited Google takeout set to work with. Rather than remove the check entirely I'd rather check several keys to verify at least one is present. Can you take a look at metadata_from_google_takeout() in the same file and check to see if any of title, description, geoData, etc is present? That should be more robust in case an unknown JSON file is found.

@RhetTbull
Copy link
Owner

@all-contributors please add @LunarLanding for code

Copy link
Contributor

@RhetTbull

I've put up a pull request to add @LunarLanding! 🎉

@LunarLanding
Copy link
Contributor Author

LunarLanding commented Dec 27, 2023

All of the keys except for googlePhotosOrigin were present in the problematic json files, so I wrote it so by default it checks for googlePhotosOrigin, and in case that fails, it checks for all the keys that were listed in the docs. This should strictly improve things and fixes the issue I had.

@RhetTbull RhetTbull merged commit 2c2b108 into RhetTbull:main Dec 29, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants