Integration with music-metadata #606
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
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 |
|---|---|---|
|
|
@@ -18,117 +18,55 @@ if (config.audioUrl && !config.initialTracks) { | |
| export const skinUrl = config.skinUrl === undefined ? null : config.skinUrl; | ||
| export const initialTracks = config.initialTracks || [ | ||
| { | ||
|
There was a problem hiding this comment. Let's actually keep these metadata/duration. Without them we would always have to load music-metadata and fetch (at least part of) each media file, and we can show the proper title/duration in the playlist immediately. With them, we can defer loading music-metadata until someone drags in an unknown track. There was a problem hiding this comment. Sure. It's done on an isolated commit (472c2c0) on purpose, let's revert that one, for the sake of easy testing, until we merge back this branch. |
||
| url: llamaAudio | ||
| }, | ||
| { | ||
| url: | ||
| "https://cdn.rawgit.com/captbaritone/webamp-music/4b556fbf/Diablo_Swing_Orchestra_-_01_-_Heroines.mp3" | ||
| }, | ||
| { | ||
| url: | ||
| "https://cdn.rawgit.com/captbaritone/webamp-music/4b556fbf/Eclectek_-_02_-_We_Are_Going_To_Eclecfunk_Your_Ass.mp3" | ||
| }, | ||
| { | ||
| url: | ||
| "https://cdn.rawgit.com/captbaritone/webamp-music/4b556fbf/Auto-Pilot_-_03_-_Seventeen.mp3" | ||
| }, | ||
| { | ||
| url: | ||
| "https://cdn.rawgit.com/captbaritone/webamp-music/4b556fbf/Muha_-_04_-_Microphone.mp3" | ||
| }, | ||
| { | ||
| url: | ||
| "https://cdn.rawgit.com/captbaritone/webamp-music/4b556fbf/Just_Plain_Ant_-_05_-_Stumble.mp3" | ||
| }, | ||
| { | ||
| url: | ||
| "https://cdn.rawgit.com/captbaritone/webamp-music/4b556fbf/Sleaze_-_06_-_God_Damn.mp3" | ||
| }, | ||
| { | ||
| url: | ||
| "https://cdn.rawgit.com/captbaritone/webamp-music/4b556fbf/Juanitos_-_07_-_Hola_Hola_Bossa_Nova.mp3" | ||
| }, | ||
| { | ||
| url: | ||
| "https://cdn.rawgit.com/captbaritone/webamp-music/4b556fbf/Entertainment_for_the_Braindead_-_08_-_Resolutions_Chris_Summer_Remix.mp3" | ||
| }, | ||
| { | ||
| url: | ||
| "https://cdn.rawgit.com/captbaritone/webamp-music/4b556fbf/Nobara_Hayakawa_-_09_-_Trail.mp3" | ||
| }, | ||
| { | ||
| url: | ||
| "https://cdn.rawgit.com/captbaritone/webamp-music/4b556fbf/Paper_Navy_-_10_-_Tongue_Tied.mp3" | ||
| }, | ||
| { | ||
| url: | ||
| "https://cdn.rawgit.com/captbaritone/webamp-music/4b556fbf/60_Tigres_-_11_-_Garage.mp3" | ||
| }, | ||
| { | ||
| url: | ||
| "https://cdn.rawgit.com/captbaritone/webamp-music/4b556fbf/CM_aka_Creative_-_12_-_The_Cycle_Featuring_Mista_Mista.mp3" | ||
| } | ||
| ]; | ||
|
|
||
|
|
||
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,4 +1,26 @@ | ||
| import invariant from "invariant"; | ||
| import readStream from "filereader-stream"; | ||
|
|
||
| import http from "stream-http"; | ||
|
|
||
| function sourceToStream(source) { | ||
| if (typeof source === "string") { | ||
| // Assume URL | ||
| return new Promise(resolve => { | ||
| http.get(source, stream => { | ||
| resolve({ | ||
| stream, | ||
| type: stream.headers["content-type"] | ||
| }); | ||
| }); | ||
| }); | ||
| } | ||
| // Assume Blob | ||
| return Promise.resolve({ | ||
| stream: readStream(source), | ||
| type: source.name | ||
| }); | ||
| } | ||
|
|
||
| export function genMediaTags(file) { | ||
| invariant( | ||
|
|
@@ -9,26 +31,22 @@ export function genMediaTags(file) { | |
| if (typeof file === "string" && !/^[a-z]+:\/\//i.test(file)) { | ||
| file = `${location.protocol}//${location.host}${location.pathname}${file}`; | ||
| } | ||
| return require.ensure( | ||
| ["music-metadata"], | ||
| require => { | ||
| const mm = require("music-metadata"); | ||
| return sourceToStream(file).then(stream => { | ||
|
There was a problem hiding this comment. The rest of the code base uses There was a problem hiding this comment. I will adapt to your coding convention, no problem |
||
| stream.type = stream.type ? stream.type.split(";")[0] : stream.type; // Strip off: ; charset=UTF-8 | ||
|
There was a problem hiding this comment. Are we sure type will never be empty, and will always contain There was a problem hiding this comment. Empty or not containing In addition to that, f the type cannot be determined, I can add a fallback to use the actual data to determine the content type: Borewit/music-metadata#110 |
||
| return mm.parseStream(stream.stream, stream.type, { duration: true }); | ||
| }); | ||
| }, | ||
| err => { | ||
| console.error("genMediaTags: Failed to load music-metadata"); | ||
| // The dependency failed to load | ||
| throw err; | ||
| }, | ||
| "music-metadata" | ||
| ); | ||
| } | ||
|
|
||
| export function genMediaDuration(url) { | ||
|
|
||
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
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.
Are there some parsers which can't get duration?
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 don't think there are any, but there maybe specific case that is not possible. Anyway, probably good to make use of the expensive fall back scenario, using the audio element.
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.
Oh, and we need pass the size of the stream to the parser. The size is critical in some cases to calculate the duration.