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

Contextually set a Source.probe's FFprobe input type based upon URI #14

Merged
merged 3 commits into from
Feb 24, 2020
Merged

Contextually set a Source.probe's FFprobe input type based upon URI #14

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d32049f
fix(source.js): Provide file:// Sources into FFprobe input as file pa…
agrathwohl Feb 24, 2020
a92388d
fix(source.js): Provide null check for Source.uri during input type l…
agrathwohl Feb 24, 2020
ffc5907
fix(source.js): *actual* null check rather than undefined check
agrathwohl Feb 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion source.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,11 @@ class Source extends Resource {

this.ready((err) => {
if (err) { return callback(err) }


const { uri } = this
const stream = this.createReadStream(opts)
const stream = this.uri.includes('file://') ?
Copy link
Contributor

Choose a reason for hiding this comment

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

Could we have a null check for this.uri in case it isn't available and only a stream can be created?

Copy link
Contributor Author

@agrathwohl agrathwohl Feb 24, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Fo' sho - a92388d

this.uri : this.createReadStream(opts)

this.active()
ffmpeg(stream).ffprobe((err, info) => {
Expand Down