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

Honor use_orig with videos #153

Merged
merged 4 commits into from Apr 27, 2015
Merged

Conversation

jasuarez
Copy link
Contributor

So far use_orig is totally ignored for the case of videos.

But giving that lot of times we have a big amount of videos that we don't want to process because it is expensive, or they are already web-friendly.

This set of commits makes use_orig to be respected in case of videos.

I was doubting between following this, or adding a new video_use_orig (and video_orig_link). But at the end I decided to use the same property for both cases.

outname = os.path.join(outpath, filename)
utils.copy(source, outname, symlink=settings['orig_link'])
return outname

Copy link
Owner

Choose a reason for hiding this comment

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

This should probably go at the beginning of process_video, as it would avoid to modify the path here and avoid to return a modified filename.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Correct. I added it in generate_video because the same is done in generate_image. But I'll move it to process_video.

@saimn
Copy link
Owner

saimn commented Mar 16, 2015

Thanks for this PR, it is indeed something that was missing (as other feature like mp4/multiple format support).

@saimn
Copy link
Owner

saimn commented Apr 22, 2015

Hi @jasuarez ,
I'm thinking about releasing a new version, any chance to get this in it ?

@jasuarez
Copy link
Contributor Author

i'm bit busy these weeks, but I'll try to address your comments this weekend

@jasuarez
Copy link
Contributor Author

@saimn Re-created the PR addressing your comments, plus rebasing against latest master.

@jasuarez jasuarez force-pushed the honor-use_orig-with-videos branch 2 times, most recently from 2be7878 to 8d70776 Compare April 26, 2015 20:45
@saimn
Copy link
Owner

saimn commented Apr 27, 2015

Thanks @jasuarez ! Could you just revert the change in test_video as it should no more be necessary ?

@saimn
Copy link
Owner

saimn commented Apr 27, 2015

Also please add yourself to AUTHORS ;)

When 'use_orig' is True, copy the original video files (or symlink them,
depending if 'orig_link' is True) to the destination, and use them as they are,
without processing.

This setting is ignored for all files not supported in HTML5; those are
converted anyway, because otherwise we could not reproduce them.
As we can use the videos as they are, without conversion, we need to set
the video type correctly.
@jasuarez
Copy link
Contributor Author

@saimn I need to push the change in test_video because otherwise I'm breaking the tests.

@saimn saimn merged commit ca61eed into saimn:master Apr 27, 2015
@saimn
Copy link
Owner

saimn commented Apr 27, 2015

Thanks, merged in 2f90da5

I need to push the change in test_video because otherwise I'm breaking the tests.

No, before all tests shared the settings dict, but since a recent change on master there is a settings doct for each test.

@saimn saimn modified the milestone: 0.10 Aug 31, 2015
@jasuarez jasuarez deleted the honor-use_orig-with-videos branch January 25, 2017 10:15
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.

None yet

2 participants