Try add MusicBrainz tag to file

cli.js

@@ -34,6 +34,7 @@ const FreyrCore = require('./src/freyr');
 const AuthServer = require('./src/cli_server');
 const AsyncQueue = require('./src/async_queue');
 const parseRange = require('./src/parse_range');
+const musicBrainz = require('./src/musicbrainz.js');
 const StackLogger = require('./src/stack_logger');
 const packageJson = require('./package.json');
 const streamUtils = require('./src/stream_utils');
@@ -43,7 +44,13 @@ function parseMeta(params) {
   return Object.entries(params || {})
     .filter(([, value]) => ![undefined, null].includes(value))
     .map(([key, value]) =>
-      Array.isArray(value) ? value.map(tx => (tx ? [`--${key}`, ...(Array.isArray(tx) ? tx : [tx])] : '')) : [`--${key}`, value],
+      Array.isArray(value)
+        ? value
+            .filter(val => val !== undefined)
+            .map((tx, args) =>
+              (args = Array.isArray(tx) ? tx : [tx]).every(val => val !== undefined) ? [`--${key}`, ...args] : [],
+            )
+        : [`--${key}`, value],
     )
     .flat(Infinity);
 }
@@ -445,6 +452,7 @@ async function init(queries, options) {
       netCheck: true,
       attemptAuth: true,
       autoOpenBrowser: true,
+      musicBrainz: false,
     },
     dirs: {
       output: '.',
@@ -508,6 +516,7 @@ async function init(queries, options) {
     netCheck: options.netCheck,
     attemptAuth: options.auth,
     autoOpenBrowser: options.browser,
+    musicBrainz: options.musicbrainz,
   });
   Config.playlist = lodash.merge(Config.playlist, {
     always: !!options.playlist,
@@ -847,10 +856,19 @@ async function init(queries, options) {
         gapless: options.gapless, // pgap
         rDNSatom: [
           // ----
-          ['Digital Media', 'name=MEDIA', 'domain=com.apple.iTunes'],
           [track.isrc, 'name=ISRC', 'domain=com.apple.iTunes'],
           [track.artists[0], 'name=ARTISTS', 'domain=com.apple.iTunes'],
           [track.label, 'name=LABEL', 'domain=com.apple.iTunes'],
+          [track.musicBrainz.trackId, 'name="MusicBrainz Track Id"', 'domain=com.apple.iTunes'],
+          [track.musicBrainz.artistId, 'name="MusicBrainz Artist Id"', 'domain=com.apple.iTunes'],
+          [track.musicBrainz.artistId, 'name="MusicBrainz Album Artist Id"', 'domain=com.apple.iTunes'],
+          [track.musicBrainz.releaseId, 'name="MusicBrainz Album Id"', 'domain=com.apple.iTunes'],
+          [track.musicBrainz.releaseGroupId, 'name="MusicBrainz Release Group Id"', 'domain=com.apple.iTunes'],
+          [track.musicBrainz.barcode, 'name=BARCODE', 'domain=com.apple.iTunes'],
+          [track.musicBrainz.releaseStatus, 'name="MusicBrainz Album Status"', 'domain=com.apple.iTunes'],
+          [track.musicBrainz.releaseCountry, 'name="MusicBrainz Album Release Country"', 'domain=com.apple.iTunes'],
+          [track.musicBrainz.script, 'name=SCRIPT', 'domain=com.apple.iTunes'],
+          [track.musicBrainz.media, 'name=MEDIA', 'domain=com.apple.iTunes'],
           [`${meta.service[symbols.meta].DESC}: ${track.uri}`, 'name=SOURCE', 'domain=com.apple.iTunes'],
           [
             `${audioSource.service[symbols.meta].DESC}: ${audioSource.source.videoId}`,
@@ -875,12 +893,12 @@ async function init(queries, options) {
         encodingTool: `freyr-js cli v${packageJson.version}`, // ©too
         encodedBy: 'd3vc0dr', // ©enc
         artwork: files.image.file.name, // covr
-        // sortOrder: [
-        //   ['name', 'NAME'], // sonm
-        //   ['album', 'NAME'], // soal
-        //   ['artist', 'NAME'], // soar
-        //   ['albumartist', 'NAME'], // soaa
-        // ],
+        sortOrder: [
+          // ['name', 'NAME'], // sonm
+          // ['album', 'NAME'], // soal
+          ['artist', track.musicBrainz.artistSortOrder], // soar
+          ['albumartist', track.musicBrainz.artistSortOrder], // soaa
+        ],
       })
         .finally(() => files.image.file.removeCallback())
         .catch(err => Promise.reject({err, code: 8}));
@@ -982,6 +1000,12 @@ async function init(queries, options) {
       }
       trackLogger.log('| [\u2022] Track exists. Overwriting...');
     }
+    track.musicBrainz =
+      (await processPromise(props.extraTrackMeta, trackLogger, {
+        onInit: '| \u27a4 Sourcing extra metadata...',
+        noVal: () => '[skipped]\n',
+        onErr: err => `[failed, ${err.statusCode ? `(${err.statusCode}) ` : ''}${err.message}]\n`,
+      })) || {};
     trackLogger.log('| \u27a4 Collating sources...');
     const audioSource = await props.collectSources((service, sourcesPromise) =>
       processPromise(sourcesPromise, trackLogger, {
@@ -1038,11 +1062,15 @@ async function init(queries, options) {
       const outFilePath = xpath.join(outFileDir, outFileName);
       const fileExists = fs.existsSync(outFilePath);
       const processTrack = !fileExists || options.force;
-      let collectSources;
-      if (processTrack) collectSources = buildSourceCollectorFor(track, results => results[0]);
+      let collectSources, extraTrackMeta;
+      if (processTrack) {
+        collectSources = buildSourceCollectorFor(track, results => results[0]);
+        if (Config.opts.musicBrainz && track.isrc)
+          extraTrackMeta = musicBrainz.lookupISRC(track.isrc, options.storefront || 'us');
+      }
       const meta = {trackName, outFileDir, outFilePath, track, service};
       return trackQueue
-        .push({track, meta, props: {collectSources, fileExists, processTrack, logger}})
+        .push({track, meta, props: {collectSources, extraTrackMeta, fileExists, processTrack, logger}})
         .then(trackObject => ({...trackObject, meta}))
         .catch(errObject => ({meta, code: 10, ...errObject}));
     },
@@ -1395,6 +1423,7 @@ program
     ['specify a preferred download source or a `,`-separated preference order', `(valid: ${VALIDS.downloaders})`].join('\n'),
     'yt_music',
   )
+  .option('-m, --musicbrainz', 'attempt to source and embed extra metadata from MusicBrainz')
   .option(
     '-l, --filter <MATCH>',
     [
@@ -1445,7 +1474,7 @@ program
   )
   .option('--via-tor', 'tunnel network traffic through the tor network (unimplemented)')
   .option('--cache-dir <DIR>', 'specify alternative cache directory, `<tmp>` for tempdir')
-  .option('-m, --mem-cache <SIZE>', 'max size of bytes to be cached in-memory for each download chunk')
+  .option('-M, --mem-cache <SIZE>', 'max size of bytes to be cached in-memory for each download chunk')
   .option('--no-mem-cache', 'disable in-memory chunk caching (restricts to sequential download)')
   .option('--timeout <N>', 'network inactivity timeout (ms)', 10000)
   .option('--no-auth', 'skip authentication procedure')

conf.json

@@ -15,7 +15,8 @@
   "opts": {
     "netCheck": true,
     "attemptAuth": true,
-    "autoOpenBrowser": true
+    "autoOpenBrowser": true,
+    "musicBrainz": false
   },
   "filters": [],
   "dirs": {

package.json

@@ -84,6 +84,7 @@
     "tmp": "^0.2.1",
     "tough-cookie": "^4.0.0",
     "xbytes": "^1.6.2",
+    "xml2js": "^0.4.23",
     "xprogress": "^0.17.3",
     "youtube-dl-exec": "^1.2.6",
     "yt-search": "^2.5.1"

src/musicbrainz.js

@@ -0,0 +1,58 @@
+const got = require('got');
+const {parseStringPromise: xml2js} = require('xml2js');
+
+class MusicBrainzError extends Error {
+  constructor(message, statusCode) {
+    super(message);
+    if (statusCode) this.statusCode = statusCode;
+  }
+}
+
+async function query(entity_type, entity, args) {
+  let response = await got(`https://musicbrainz.org/ws/2/${entity_type}/${entity}?inc=artists+releases+discids`, {
+    searchParams: {...args, ...('inc' in args ? {inc: args.inc.join('+')} : {}), ...(args.json ? {fmt: 'json'} : {})},
+  });
+  let body;
+  try {
+    body = response.body.startsWith('<?xml')
+      ? await xml2js(response.body, {trim: true, mergeAttrs: true, explicitRoot: false, explicitArray: false})
+      : JSON.parse(response.body);
+  } catch {
+    throw new MusicBrainzError('Invalid Server Response');
+  }
+  if (response.statusCode !== 200) {
+    throw new MusicBrainzError(body.error || 'An error occurred', response.statusCode);
+  }
+  return body;
+}
+
+async function lookupISRC(isrc, storefront) {
+  let {
+    recording: {
+      id: trackId,
+      'release-list': {release: releases},
+    },
+  } = (await query('isrc', isrc, {inc: ['releases']})).isrc['recording-list'];
+  releases = Array.isArray(releases) ? releases : [releases];
+
+  let {id: releaseId} = releases.find(release => release.country.toLowerCase() === storefront) || releases[0];
+
+  let release = await query('release', releaseId, {inc: ['artists', 'release-groups', 'media'], json: true});
+
+  let {artist: artistMeta} = release['artist-credit'][0];
+  return {
+    trackId,
+    releaseId,
+    artistId: artistMeta.id,
+    artistSortOrder: artistMeta['sort-name'],
+    releaseGroupId: release['release-group'].id,
+    releaseType: release['release-group']['primary-type'],
+    releaseCountry: release.country,
+    releaseStatus: release.status.toLowerCase(),
+    media: release.media[0].format,
+    script: release['text-representation'].script,
+    barcode: release.barcode,
+  };
+}
+
+module.exports = {lookupISRC};