Fix processing of google drive files #6128
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
masaball
commented
Nov 18, 2024
| raw_output = `#{ffprobe} -i "#{@media_file.location}" -v quiet -show_format -show_streams -of json` | ||
| # Include authorization headers for cases like Google Drive | ||
| header = "-headers 'Authorization: #{@media_file.auth_header.fetch('Authorization')}'" if @media_file.auth_header.present? | ||
| raw_output = `#{ffprobe} #{header} -i "#{@media_file.location}" -v quiet -show_format -show_streams -of json` |
There was a problem hiding this comment.
This is downloading the file for processing, but we have already downloaded the file as part of the valid_content_type? check. And possibly there is third download for actually feeding the file into ActiveEncode?
It would probably be best as a separate ticket, but should we rework this so that when we are trying to access an internet hosted file we download to a tempfile and use the tempfile for all the processing instead of downloading it multiple times? (Stand-up 11/19/24: Yes, we should make this change)
When we made the switch from mediainfo to ffprobe, we created a new class for processing the file. Because Google Drive utilizes headers/params for its authorization flow, this change resulted in the file information becoming divorced from the auth token. By explicitly passing the auth token through to the classes downloading and processing the file, we are able to fix this oversight.
masaball
force-pushed
the
fix_google_drive
branch
from
48ca28e
to
c3d8884
Compare
cjcolvar
approved these changes
Nov 19, 2024
|
I'm not sure that any tests we tried to add would actually be looking at anything substantial. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When we made the switch from mediainfo to ffprobe, we created a new class for processing the file. Because Google Drive utilizes headers/params for its authorization flow, this change resulted in the file information becoming divorced from the auth token. By explicitly passing the auth token through to the classes downloading and processing the file, we are able to fix this oversight.