-
-
Notifications
You must be signed in to change notification settings - Fork 185
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
Update to include ffprobe #61
Closed
+214
−93
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,8 +28,17 @@ jobs: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: bin/darwin-x64 | ||
| asset_name: darwin-x64 | ||
| asset_path: bin/ffmpeg-darwin-x64 | ||
| asset_name: ffmpeg-darwin-x64 | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - uses: actions/[email protected] | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: bin/ffprobe-darwin-x64 | ||
| asset_name: ffprobe-darwin-x64 | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - uses: actions/[email protected] | ||
|
|
@@ -46,8 +55,17 @@ jobs: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: bin/linux-arm | ||
| asset_name: linux-arm | ||
| asset_path: bin/ffmpeg-linux-arm | ||
| asset_name: ffmpeg-linux-arm | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - uses: actions/[email protected] | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: bin/ffprobe-linux-arm | ||
| asset_name: ffprobe-linux-arm | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - uses: actions/[email protected] | ||
|
|
@@ -73,8 +91,17 @@ jobs: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: bin/linux-arm64 | ||
| asset_name: linux-arm64 | ||
| asset_path: bin/ffmpeg-linux-arm64 | ||
| asset_name: ffmpeg-linux-arm64 | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - uses: actions/[email protected] | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: bin/ffprobe-linux-arm64 | ||
| asset_name: ffprobe-linux-arm64 | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - uses: actions/[email protected] | ||
|
|
@@ -100,8 +127,17 @@ jobs: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: bin/linux-ia32 | ||
| asset_name: linux-ia32 | ||
| asset_path: bin/ffmpeg-linux-ia32 | ||
| asset_name: ffmpeg-linux-ia32 | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - uses: actions/[email protected] | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: bin/ffprobe-linux-ia32 | ||
| asset_name: ffprobe-linux-ia32 | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - uses: actions/[email protected] | ||
|
|
@@ -127,8 +163,17 @@ jobs: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: bin/linux-x64 | ||
| asset_name: linux-x64 | ||
| asset_path: bin/ffmpeg-linux-x64 | ||
| asset_name: ffmpeg-linux-x64 | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - uses: actions/[email protected] | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: bin/ffprobe-linux-x64 | ||
| asset_name: ffprobe-linux-x64 | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - uses: actions/[email protected] | ||
|
|
@@ -154,8 +199,17 @@ jobs: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: bin/win32-ia32 | ||
| asset_name: win32-ia32 | ||
| asset_path: bin/ffmpeg-win32-ia32 | ||
| asset_name: ffmpeg-win32-ia32 | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - uses: actions/[email protected] | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: bin/ffprobe-win32-ia32 | ||
| asset_name: ffprobe-win32-ia32 | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - uses: actions/[email protected] | ||
|
|
@@ -181,8 +235,17 @@ jobs: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: bin/win32-x64 | ||
| asset_name: win32-x64 | ||
| asset_path: bin/ffmpeg-win32-x64 | ||
| asset_name: ffmpeg-win32-x64 | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - uses: actions/[email protected] | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: bin/ffprobe-win32-x64 | ||
| asset_name: ffprobe-win32-x64 | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - uses: actions/[email protected] | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| name: Node CI | ||
|
|
||
| on: [push] | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| strategy: | ||
| matrix: | ||
| node-version: [12.x, 14.x] | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v1 | ||
| - name: Use Node.js ${{ matrix.node-version }} | ||
| uses: actions/setup-node@v1 | ||
| with: | ||
| node-version: ${{ matrix.node-version }} | ||
| - run: npm ci | ||
| - run: npm test |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,3 +12,7 @@ bin/* | |
| /ffmpeg.exe | ||
| /ffmpeg.README | ||
| /ffmpeg.LICENSE | ||
| /ffprobe | ||
| /ffprobe.exe | ||
| /ffprobe.README | ||
| /ffprobe.LICENSE | ||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| export const ffmpegPath: string | null; | ||
| export const ffprobePath: string | null; |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,27 @@ | ||
| 'use strict' | ||
|
|
||
| if (process.env.FFMPEG_BIN) { | ||
| module.exports = process.env.FFMPEG_BIN | ||
| } else { | ||
| var os = require('os') | ||
| var path = require('path') | ||
| function getPath(name) { | ||
| const os = require('os') | ||
| const path = require('path') | ||
|
|
||
| var binaries = Object.assign(Object.create(null), { | ||
| const binaries = Object.assign(Object.create(null), { | ||
| darwin: ['x64'], | ||
| linux: ['x64', 'ia32', 'arm64', 'arm'], | ||
| win32: ['x64', 'ia32'] | ||
| }) | ||
|
|
||
| var platform = process.env.npm_config_platform || os.platform() | ||
| var arch = process.env.npm_config_arch || os.arch() | ||
|
|
||
| var ffmpegPath = path.join( | ||
| __dirname, | ||
| platform === 'win32' ? 'ffmpeg.exe' : 'ffmpeg' | ||
| ) | ||
| const platform = process.env.npm_config_platform || os.platform() | ||
| const arch = process.env.npm_config_arch || os.arch() | ||
|
|
||
| if (!binaries[platform] || binaries[platform].indexOf(arch) === -1) { | ||
| ffmpegPath = null | ||
| return null | ||
| } | ||
|
|
||
| module.exports = ffmpegPath | ||
| return path.join( | ||
| __dirname, | ||
| platform === 'win32' ? name + '.exe' : name | ||
| ) | ||
| } | ||
|
|
||
| exports.ffmpegPath = getPath('ffmpeg') | ||
| exports.ffprobePath = getPath('ffprobe') |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd only accept a logic that does not download again, if it compares
Last-ModifiedorETagto make sure there isn't a new/different binary available.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
agreed, I'll probably take this code out since I was just using it to test locally without downloading each time :)