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

Credits: Fix data model #3929

Merged
merged 1 commit into from
Jan 3, 2021
Merged

Credits: Fix data model #3929

merged 1 commit into from
Jan 3, 2021

Conversation

ferdnyc
Copy link
Contributor

@ferdnyc ferdnyc commented Dec 18, 2020

Following on from #3909, it turns out my use of a defaultdict in the credits model wasn't practical, because the input data file explicitly contains null values, which get converted into None on JSON import. If a dict contains explicit None values, it will return them when those keys are dereferenced, ignoring the type set for the defaultdict.

So, I scrapped the defaultdict, wrote a loop to scrub out any None keys, and protected all of the accesses to person keys by using person.get().

Eliminates tracebacks when viewing credits, and fixes text filtering in the credits views.

@ferdnyc
Copy link
Contributor Author

ferdnyc commented Dec 19, 2020

Hrrrm, as I feared we are seeing spurious crash-on-exit issues in the unit tests due to PyQtWebEngine (most likely).

The unit tests shouldn't need to load a web backend at all, it's only the spaghetti interdependencies of classes.app, windows.main_window, windows.views.webview, and classes.project_data that forces creation of a web view. Perhaps there's a way to get that under control better.

@ferdnyc
Copy link
Contributor Author

ferdnyc commented Jan 3, 2021

Well, the CI failures with ubuntu-20.04 are explainable, so I'm going to push ahead and merge this despite them, as credits is pretty broken right now without this fix.

@ferdnyc ferdnyc merged commit a3d9c72 into OpenShot:develop Jan 3, 2021
@ferdnyc ferdnyc deleted the fix-credits branch January 3, 2021 15:17
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.

1 participant