Update lazy loading branch with event/observer based metadata scanning #650

Borewit · 2018-09-02T10:49:40Z

Replaced jsmediatags with music-metadata-browser.
Media tags are now updated as soon as they are found.

…racks

…-metadata / strtok3.

…/*`. The relative URL used for 'Llama DJ Mike Llama' results in a MIME-type: `audio/mpeg; charset=UTF-8`.

# Conflicts: # config/webpack.common.js

…ic-metadata.

…music-metadata

Pass MIME-type parameters to music-metadata.

# Conflicts: # js/actionCreators/files.js

Still TODO Find a nice way to expose WebampLazy as: ```JavaScript import WebampLazy from 'webamp/lazy'; ```

This was originally removed in captbaritone#648 And accidentally re-added in captbaritone#639 due to a bad rebase.

captbaritone · 2018-09-02T16:27:25Z

config/webpack.common.js

  },
  plugins: [
+    new webpack.IgnorePlugin(/fs/, /file-type/, /debug/), // Ignore fs in music-metadata


I was hoping that with the introduction of music-metadata-browser this stuff, and the relevant polyfills, could be handled inside music-metadata-browser's build process.

# Conflicts: # js/actionCreators/files.js # js/fileUtils.js # js/index.js # js/webamp.js # js/webampLazy.js # package.json

captbaritone

Overall looks good! A few comments. Also, I'm curious how we handle the kbps/channels/khz of preloaded tracks. Currently we lie about all these things, so a user does not need to fetch them, and also does not need to provide them themselves. I guess we need to add a few things:

The ability to provide these pieces of data up-front. In the initialTracks option.
Ensure we handle the case where a track is playing but does not have audio metadata yet. (Maybe this already works, I haven't checked.

captbaritone · 2018-09-02T16:28:55Z

js/config.js

-    metaData: {
-      title: "The Cycle (Featuring Mista Mista)",
-      artist: "CM aka Creative"
-    }


When you're ready for a final review, please remove this commit.

captbaritone · 2018-09-02T16:29:22Z

js/fileUtils.js

+    type: source.name,
+    size: source.size
+  };
+}


I was hoping this could move inside of music-metadata-browser

captbaritone · 2018-09-02T16:31:26Z

js/fileUtils.js

+  };
+}
+
+export async function genMediaTags(file, mm, observer) {


mm is not a great variable name in my opinion. Maybe we could just pass in a parseStream function?

captbaritone · 2018-09-02T16:32:49Z

js/webamp.js

-    return supportsAudioApi && supportsCanvas && supportsPromises;
-  }
+import JSZip from "jszip";
+import mm from "music-metadata-browser";


I'd rather call it musicMetadata than mm.

captbaritone · 2018-09-02T16:33:35Z

package.json

@@ -16,7 +19,7 @@
    "analyze": "webpack --config=config/webpack.bundle-analyzer.js",
    "prepublishOnly": "npm run build-library",
    "serve": "http-server ./built",
-    "start": "webpack-dev-server --config=config/webpack.dev.js",
+    "start": "webpack-dev-server --env.DEBUG=*- --config=config/webpack.dev.js",


What does this do?

captbaritone · 2018-09-02T16:34:07Z

package.json

+    "babel-polyfill": "^6.22.0",
+    "babel-preset-env": "^1.6.1",
+    "babel-preset-react": "^6.24.1",
+    "babel-runtime": "^6.26.0",


This might be a bad rebase. I don't think these are supposed to be here.

captbaritone · 2018-09-02T16:34:51Z

package.json

@@ -75,6 +87,7 @@
    "eslint-plugin-prettier": "^2.2.0",
    "eslint-plugin-react": "^7.7.0",
    "file-loader": "^1.1.5",
+    "filereader-stream": "^2.0.0",


I'm hopeful that this and stream-http can become dependencies of music-metadata-browser and that Webamp won't need to know about them.

I will have a look to directly support parsing from a browser File object.

I am not sure if that is a good idea to embed an http client. HTTP is world on it's own, there are many different http clients. If security for example is an important aspect, things can become tricky.

At the other hand, stream is a great abstraction, but it does not offer the ability to jump (read seek or fast forward in the data).

into lazy-zip-bubble

# Conflicts: # package.json

…as completed loading.

Borewit · 2018-09-07T10:45:10Z

In this commit I changed the code so that the metadata is (re-)read 0516124 just before playing.

This results a bit in a hick-up after hitting the play button.

captbaritone · 2018-09-08T04:59:03Z

Shall I close this in favor of #634?

Borewit · 2018-09-08T08:15:22Z

Can be closed.

Borewit added 30 commits June 19, 2018 21:43

Replace jsmediatags with music-metadata to read metadata from audio t…

475f1f6

…racks

Excluding graceful.js no longer needed, removed dependency from music…

e7fd0b4

…-metadata / strtok3.

Use webpack.IgnorePlugin to ignore fs module.

646bd11

Fix fs-extra dependency in index (main)

33673a6

Ignore module fs.

c8be1ff

Be able to stream from a provided URL location.

800e156

Fix music-metadata dependency

c988ef8

Strips of the: ; charset=UTF-8 (which should only be used for `text…

37c4273

…/*`. The relative URL used for 'Llama DJ Mike Llama' results in a MIME-type: `audio/mpeg; charset=UTF-8`.

Use music-metadata to resolve the duration.

e364610

Remove predefined duration & metadata from initial play-list.

472c2c0

Merge branch 'master' into music-metadata

963e0ee

Merge remote-tracking branch 'upstream/master' into music-metadata

aff1c18

# Conflicts: # config/webpack.common.js

Re-enable Buffer

27241ba

Use music-metadata to resolve the bit-rate and sample-rate

f21cf3a

Avoid inclusion of blue-bird, file-type & debug to be included in mus…

d086326

…ic-metadata.

Use music-metadata dependency to ^2.1.0

acac8bc

Update to music-metadata 2.2.0 (without bluebird module) to save space.

ae13e55

Merge branch 'master' of https://github.com/captbaritone/webamp into …

2c6270f

…music-metadata

Merge branch 'master' into music-metadata

a6ac1fd

Use async/await conform code style

d56acd7

Update music-metadata dependency to v2.3.0.

d927b3d

Pass MIME-type parameters to music-metadata.

Update music-metadata dependency to 2.3.1

9e137c6

Merge with master branch.

25ba886

Align dependencies with master to prevent unit test from failing

edfdcaf

Merge branch 'master' into music-metadata

7d72395

# Conflicts: # js/actionCreators/files.js

Merge branch 'master' into music-metadata

4cee6ae

Update music-metadata: calculate bit-rate FLAC files.

8159a13

Pass file-size blob to music-metadata

1005a4d

Update to music-metadata 2.4.0: enabling lazy loading

7fd8740

Merge branch 'master' into music-metadata

a4e240c

captbaritone force-pushed the lazy-zip-bubble branch from 719ce9a to 49d4637 Compare September 2, 2018 16:01

Inject lazy dependencies (captbaritone#639)

1bdb7d6

Still TODO Find a nice way to expose WebampLazy as: ```JavaScript import WebampLazy from 'webamp/lazy'; ```

Borewit mentioned this pull request Sep 2, 2018

Inject lazy dependencies #639

Merged

Remove module.exports

b840493

This was originally removed in captbaritone#648 And accidentally re-added in captbaritone#639 due to a bad rebase.

captbaritone reviewed Sep 2, 2018

View reviewed changes

Merge branch 'master' into music-metadata-async

6c6498d

# Conflicts: # js/actionCreators/files.js # js/fileUtils.js # js/index.js # js/webamp.js # js/webampLazy.js # package.json

captbaritone requested changes Sep 2, 2018

View reviewed changes

This was referenced Sep 2, 2018

Integration with music-metadata #606

Closed

Music metadata with observer events #634

Open

captbaritone and others added 16 commits September 2, 2018 10:24

Add more press links

1f73293

Add more press articles

bb941c9

Upgrade Prettier

7f958cc

Add Dutch press link

758f45e

Add a few more press mentions

244bcad

Merge branch 'master' into music-metadata-async

c761558

captbaritone#650 Rename mm to musicMetadata.

7e8cea6

Update music-metadata-browser version dependency

f6d3ebe

Update music-metadata-browser version dependency

d994133

Merge branch 'lazy-zip-bubble' of https://github.com/captbaritone/webamp

dab2c4a

into lazy-zip-bubble

Merge branch 'lazy-zip-bubble' into music-metadata-async

6d0becd

# Conflicts: # package.json

Fix typo

c4d6d01

Restore config file

5555a84

Re-load metadata on play

3a2857d

A bit late to start loading metadata after the media-source element h…

0516124

…as completed loading.

prettier

7b0e13f

captbaritone closed this Sep 8, 2018

Borewit mentioned this pull request Sep 9, 2018

Be able to read from a File Borewit/music-metadata-browser#2

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update lazy loading branch with event/observer based metadata scanning #650

Update lazy loading branch with event/observer based metadata scanning #650

Borewit commented Sep 2, 2018

captbaritone Sep 2, 2018

captbaritone left a comment

captbaritone Sep 2, 2018

captbaritone Sep 2, 2018

captbaritone Sep 2, 2018

captbaritone Sep 2, 2018

captbaritone Sep 2, 2018

captbaritone Sep 2, 2018

captbaritone Sep 2, 2018

Borewit Sep 2, 2018

Borewit commented Sep 7, 2018

captbaritone commented Sep 8, 2018

Borewit commented Sep 8, 2018

Update lazy loading branch with event/observer based metadata scanning #650

Update lazy loading branch with event/observer based metadata scanning #650

Conversation

Borewit commented Sep 2, 2018

Choose a reason for hiding this comment

captbaritone left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Borewit commented Sep 7, 2018

captbaritone commented Sep 8, 2018

Borewit commented Sep 8, 2018