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

Allow non-ASCII names in AAFs #475

Merged
merged 12 commits into from Apr 4, 2019

Conversation

Projects
4 participants
@jminor
Copy link
Collaborator

commented Mar 29, 2019

Adds better handling of AAF clips with missing mobs.
Fixed a bug in otioview when viewing an OTIO file with a SerializableCollection at the top.

@codecov-io

This comment has been minimized.

Copy link

commented Mar 29, 2019

Codecov Report

Merging #475 into master will increase coverage by 0.14%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #475      +/-   ##
==========================================
+ Coverage   88.08%   88.23%   +0.14%     
==========================================
  Files          68       68              
  Lines        6881     6900      +19     
==========================================
+ Hits         6061     6088      +27     
+ Misses        820      812       -8
Impacted Files Coverage Δ
opentimelineio/schema/serializable_collection.py 97.61% <ø> (ø) ⬆️
...neio_contrib/adapters/advanced_authoring_format.py 93.2% <100%> (+2.04%) ⬆️
opentimelineio/schema/marker.py 94.59% <100%> (ø) ⬆️
opentimelineio/plugins/python_plugin.py 94.73% <100%> (ø) ⬆️
...elineio_contrib/adapters/tests/test_aaf_adapter.py 98.31% <100%> (+0.05%) ⬆️
...elineio_contrib/adapters/aaf_adapter/aaf_writer.py 95.22% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5352c91...544deb2. Read the comment docs.

@ssteinbach ssteinbach added this to To do in AAF Adapter via automation Apr 2, 2019

@jminor jminor moved this from To do to In progress in AAF Adapter Apr 3, 2019

@jminor jminor added this to the Public Beta 10 milestone Apr 3, 2019

@jminor jminor force-pushed the jminor:aaf_bugs branch from 727863a to e83e2bd Apr 3, 2019

@jminor

This comment has been minimized.

Copy link
Collaborator Author

commented Apr 3, 2019

Something odd is going on with this SerializableCollection. The order of the children comes out different on Python 2 vs 3. I made a separate unit test just for that, but it passes fine. It must be something deeper in the AAF adapter, or PyAAF2. I think I'll make a simpler AAF to test this PR with and come back to that as a separate issue.

with aaf2.open(clip.media_reference.target_url) as aaf_file:
mastermobs = list(aaf_file.content.mastermobs())
if len(mastermobs) == 1:
mob_id = mastermobs[0].mob_id
return mob_id

This comment has been minimized.

Copy link
@jminor

jminor Apr 4, 2019

Author Collaborator

FYI, switching to this "with ..." syntax avoids holding the file open. I was seeing some warnings about unclosed file handles when running the tests.

@jminor

This comment has been minimized.

Copy link
Collaborator Author

commented Apr 4, 2019

Oops, I just realized that the new tests I added to the end of the file are in the SimplifyTests class. @ssteinbach do you think I should split the test_aaf_adapter.py into some separate files? It is getting pretty long.

@jminor

This comment has been minimized.

Copy link
Collaborator Author

commented Apr 4, 2019

Fixed.
I think this is ready.

@jminor jminor merged commit 41ecc67 into PixarAnimationStudios:master Apr 4, 2019

AAF Adapter automation moved this from In progress to Done Apr 4, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.