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.

Sign up for GitHub

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

Jump to bottom

FFmpeg Writer: handle redirected logs when checking for errors #890

Merged
merged 8 commits into from
Mar 30, 2020
Merged

FFmpeg Writer: handle redirected logs when checking for errors #890

merged 8 commits into from
Mar 30, 2020

Commits on Dec 18, 2018

  1. FFmpeg Writer: handle redirected logs when checking for errors 

     * Previously we were looking for `'foo' in None` resulting in a TypeError (Zulko#877)
 * Now, if an `IOError` occurs when running FFmpeg to write video clips, **but** there is no output returned, assume we are redirected, and give the user a helpful message about where to look for errors (i.e. in the logs), instead of throwing a secondary `TypeError`.
 * Add test for this case.

Fixes Zulko#877.
    @declension
    declension committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    ba8b215 View commit details
    Browse the repository at this point in the history

  2. FFmpeg Writer: Be Python-2 compatible (Zulko#877).

    @declension
    declension committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    0c383f8 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2018

  1. FFmpeg Writer tests: check for IOError not OSError 

    For some reason Pytest on Python 2 is not catching this, even though they are aliases in the code, and Python 3.4 - 3.6 all do...
    @declension
    declension committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    6b39d8f View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2020

  1. Merge branch 'master' into fix-logged-ffmpeg-type-error

    @declension
    declension committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    082f1d2 View commit details
    Browse the repository at this point in the history

  2. Grab logs (stderr) when ffmpeg fails

    @declension
    declension committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    ef283f8 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2020

  1. Merge branch 'master' into fix-logged-ffmpeg-type-error

    @tburrows13
    tburrows13 committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    ce848aa View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. Fix broken parentheses

    @declension
    declension committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    326a644 View commit details
    Browse the repository at this point in the history

  2. Apply Black 

    I can't say I love its newlines, but hey it's here now...
    @declension
    declension committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    db36ff6 View commit details
    Browse the repository at this point in the history