@sequencemedia/music-library 1.0.2 → 1.0.6

package/.husky/post-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run post-commit

package/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run pre-commit

package/app.mjs

@@ -22,6 +22,10 @@ const {
   }
 } = watch
 
+const log = debug('@sequencemedia/music-library')
+
+log('`music-library` is awake')
+
 const NAME = 'ml.App'
 process.title = NAME
 
@@ -48,28 +52,25 @@ async function app () {
         pid
       } = a.find(({ pid }) => pid !== PID)
 
-      const log = debug('music-library:process:log')
+      const log = debug('@sequencemedia/music-library:process:log')
 
       log(`Killing application "${name}" in process ${pid}.`)
 
       process.kill(pid)
     }
   } catch ({ message }) {
-    const error = debug('music-library:process:error')
+    const error = debug('@sequencemedia/music-library:process:error')
 
     error(message)
     return
   }
 
-  const log = debug('@sequencemedia/music-library')
-
   const {
     pid,
     argv,
     env: {
-      JAR,
-      XML,
-      DESTINATION
+      TRACKS = false,
+      PLAYLISTS = false
     }
   } = process
 
@@ -79,54 +80,69 @@ async function app () {
     version
   } = PACKAGE
 
-  commander
-    .version(version)
-    .option('-j, --jar [jar]', 'Path to Saxon PE/EE JAR')
-    .option('-x, --xml [xml]', 'Path to iTunes Library XML')
-    .option('-d, --destination [destination]', 'Destination path for M3Us')
-    .option('-t, --tracks', 'Parse all tracks')
-    .option('-p, --playlists', 'Parse all playlists')
-    .parse(argv)
+  try {
+    commander
+      .version(version)
+      .exitOverride()
+      .requiredOption('-j, --jar [jar]', 'Path to Saxon PE/EE JAR')
+      .requiredOption('-x, --xml [xml]', 'Path to iTunes Library XML')
+      .requiredOption('-d, --destination [destination]', 'Destination path for M3Us')
+      .option('-t, --tracks', 'Parse all tracks')
+      .option('-p, --playlists', 'Parse all playlists')
+      .parse(argv)
+  } catch (e) {
+    const {
+      code
+    } = e
+
+    const error = debug('@sequencemedia/music-library:commander:error')
+
+    if (code !== 'commander.missingMandatoryOptionValue') error(e)
+
+    error(`Halting application "${name}" in process ${pid}.`)
+    return
+  }
 
   const {
-    jar = JAR,
-    xml = XML,
-    destination = DESTINATION,
-    tracks: t = false,
-    playlists: p = false
+    jar,
+    xml,
+    destination,
+    tracks: t = TRACKS,
+    playlists: p = PLAYLISTS
   } = commander.opts()
 
-  const l = (
-    (t && p) || (!t && !p)
-  )
+  log({
+    jar,
+    xml,
+    destination
+  })
 
-  if (l) {
-    log(`Application "${name}" in process ${pid} watching Library.`)
+  try {
+    const l = (
+      (t && p) || (!t && !p)
+    )
 
-    log({ jar, xml, destination })
+    if (l) {
+      log(`Application "${name}" in process ${pid} watching Library.`)
 
-    return (
-      library
-        .toM3U(jar, xml, destination)
-    )
-  } else {
-    if (t) {
-      log(`Application "${name}" in process ${pid} watching Tracks.`)
-
-      return (
-        tracks
-          .toM3U(jar, xml, destination)
-      )
-    }
+      await library.toM3U(jar, xml, destination)
+    } else {
+      if (t) {
+        log(`Application "${name}" in process ${pid} watching Tracks.`)
 
-    if (p) {
-      log(`Application "${name}" in process ${pid} watching Playlists.`)
+        await tracks.toM3U(jar, xml, destination)
+      } else {
+        if (p) {
+          log(`Application "${name}" in process ${pid} watching Playlists.`)
 
-      return (
-        playlists
-          .toM3U(jar, xml, destination)
-      )
+          await playlists.toM3U(jar, xml, destination)
+        }
+      }
     }
+  } catch ({ message }) {
+    const error = debug('@sequencemedia/music-library:error')
+
+    error(message)
   }
 }
 

package/build/gulp/post-commit.mjs

@@ -0,0 +1,48 @@
+import debug from 'debug'
+
+import {
+  readFile
+} from 'fs/promises'
+
+import {
+  exec
+} from 'child_process'
+
+const OPTIONS = {
+  maxBuffer: 1024 * 500
+}
+
+const log = debug('@sequencemedia/music-library:build:gulp:post-commit')
+const error = debug('@sequencemedia/music-library:build:gulp:post-commit:error')
+
+log('`@sequencemedia/music-library` is awake')
+
+export async function getPackageVersion () {
+  log('getPackageVersion')
+
+  const {
+    version = '0.0.0'
+  } = JSON.parse(await readFile('./package.json', 'utf8'))
+
+  return version
+}
+
+export function gitTag (a = '0.0.0', m = `v${a}`) {
+  log('gitTag')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec(`git tag -a v${a} -m "${m}"`, OPTIONS, (e, v) => (!e) ? resolve(v) : reject(e))
+    })
+  )
+}
+
+export default async function postCommit () {
+  log('post-commit')
+
+  try {
+    await gitTag(await getPackageVersion())
+  } catch ({ code = 'NONE', message = 'No error message defined' }) {
+    error({ code, message })
+  }
+}

package/build/gulp/pre-commit.mjs

@@ -0,0 +1,144 @@
+import debug from 'debug'
+
+import {
+  exec
+} from 'child_process'
+
+const log = debug('@sequencemedia/music-library:build:gulp:pre-commit')
+
+log('`@sequencemedia/music-library` is awake')
+
+const PACKAGE_VERSION_CHANGES = /\-+\s+"version":\s+"(\d+\.\d+\.\d+)",+\s+\++\s+"version":\s+"(\d+\.\d+\.\d+)",+\s+/ /* eslint-disable-line no-useless-escape */
+
+const HAS_STAGED_CHANGES = /Changes to be committed/s
+
+const NOT_STAGED_CHANGES = /Changes not staged for commit/s
+
+const OPTIONS = {
+  maxBuffer: 1024 * 500
+}
+
+const BRANCH = 'master'
+
+const trim = (v) => v.split('\n').map((v) => v.trimEnd()).join('\n').trim()
+
+function use (key) {
+  const log = debug(`@sequencemedia/music-library:${key}`)
+
+  return function use (v) {
+    log(trim(v))
+  }
+}
+
+export function getGitRemoteShowOriginHeadBranch () {
+  log('getGitRemoteShowOriginHeadBranch')
+
+  return (
+    new Promise((resolve, reject) => {
+      const command = 'git remote show origin | awk \'/HEAD branch/ {print $NF}\''
+
+      const {
+        stdout,
+        stderr
+      } = exec(command, OPTIONS, (e, v = '') => (!e) ? resolve(trim(v)) : reject(e))
+
+      stdout.on('data', use('git-remote-show-origin-head-branch'))
+      stderr.on('data', use('git-remote-show-origin-head-branch'))
+    })
+  )
+}
+
+export function hasPackageVersionChanges (branch = BRANCH) {
+  log('hasPackageVersionChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec(`git diff HEAD origin/${branch} package.json`, OPTIONS, (e, v) => (!e) ? resolve(PACKAGE_VERSION_CHANGES.test(v)) : reject(e))
+    })
+  )
+}
+
+export function notPackageVersionChanges (branch = BRANCH) {
+  log('notPackageVersionChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec(`git diff HEAD origin/${branch} package.json`, OPTIONS, (e, v) => (!e) ? resolve(PACKAGE_VERSION_CHANGES.test(v) !== true) : reject(e))
+    })
+  )
+}
+
+export function hasStagedChanges () {
+  log('hasStagedChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec('git status', OPTIONS, (e, v) => (!e) ? resolve(HAS_STAGED_CHANGES.test(v)) : reject(e))
+    })
+  )
+}
+
+export function notStagedChanges () {
+  log('notStagedChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec('git status', OPTIONS, (e, v) => (!e) ? resolve(NOT_STAGED_CHANGES.test(v)) : reject(e))
+    })
+  )
+}
+
+export function notPushedChanges (branch = BRANCH) {
+  log('notPushedChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec(`git log origin/${branch}..HEAD`, OPTIONS, (e, v) => (!e) ? resolve(!!v) : reject(e))
+    })
+  )
+}
+
+export function patchPackageVersion () {
+  log('patchPackageVersion')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec('npm version patch -m %s -n --no-git-tag-version --no-verify', OPTIONS, (e) => (!e) ? resolve() : reject(e))
+    })
+  )
+}
+
+export function addPackageVersionChanges () {
+  log('addPackageVersionChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec('git add package.json package-lock.json', OPTIONS, (e) => (!e) ? resolve() : reject(e))
+    })
+  )
+}
+
+export default async function preCommit () {
+  log('pre-commit')
+
+  try {
+    /**
+     *  Not changes added, exit
+     */
+    if (await notStagedChanges()) return
+    /**
+     *  Has changes added, continue
+     */
+    if (await hasStagedChanges()) {
+      /**
+       *  Not package version changes, continue
+       */
+      if (await notPackageVersionChanges(await getGitRemoteShowOriginHeadBranch())) {
+        await patchPackageVersion()
+        await addPackageVersionChanges()
+      }
+    }
+  } catch ({ code = 'NONE', message = 'No error message defined' }) {
+    log({ code, message })
+  }
+}

package/gulpfile.mjs

@@ -0,0 +1,13 @@
+import gulp from 'gulp'
+
+import preCommit from '#build/gulp/pre-commit'
+import postCommit from '#build/gulp/post-commit'
+
+gulp
+  .task('pre-commit', preCommit)
+
+gulp
+  .task('post-commit', postCommit)
+
+gulp
+  .task('default', gulp.series('pre-commit'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sequencemedia/music-library",
-  "version": "1.0.2",
+  "version": "1.0.6",
   "description": "Watch Apple Music Library XML and parse to JSON, JS, ES, or M3U",
   "keywords": [
     "music",
@@ -35,7 +35,11 @@
     "lint": "eslint . --ext .mjs --ext .cjs",
     "lint:fix": "npm run lint -- --fix",
     "start": "cross-env DEBUG=@sequencemedia/music-library,@sequencemedia/music-library:*,@sequencemedia/music-library-parser,@sequencemedia/music-library-parser:* NODE_ENV=production node .",
-    "start:dev": "cross-env DEBUG=@sequencemedia/music-library,@sequencemedia/music-library:*,@sequencemedia/music-library-parser,@sequencemedia/music-library-parser:* NODE_ENV=development node ."
+    "dev": "cross-env DEBUG=@sequencemedia/music-library,@sequencemedia/music-library:*,@sequencemedia/music-library-parser,@sequencemedia/music-library-parser:* NODE_ENV=development node .",
+    "gulp": "gulp --color",
+    "pre-commit": "npm run lint && cross-env DEBUG=@sequencemedia/music-library,@sequencemedia/music-library:* npm run gulp -- pre-commit",
+    "post-commit": "cross-env DEBUG=@sequencemedia/music-library,@sequencemedia/music-library:* npm run gulp -- post-commit",
+    "prepare": "husky install"
   },
   "dependencies": {
     "@sequencemedia/music-library-parser": "1.0.2",
@@ -57,21 +61,27 @@
     "core-js": "^3.20.1",
     "eslint": "7.32.0",
     "eslint-config-standard": "^16.0.3",
-    "eslint-import-resolver-babel-module": "^5.3.1",
     "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "5.2.0",
-    "rimraf": "^3.0.2"
+    "gulp": "^4.0.2",
+    "husky": "^7.0.4"
   },
   "imports": {
     "#music-library/common/normalise": "./src/common/normalise.mjs",
     "#music-library/library": "./src/library/index.mjs",
+    "#music-library/library/transform": "./src/library/transform/index.mjs",
+    "#music-library/library/playlists": "./src/library/playlists/index.mjs",
+    "#music-library/library/playlists/transform": "./src/library/playlists/transform/index.mjs",
+    "#music-library/library/tracks": "./src/library/tracks/index.mjs",
+    "#music-library/library/tracks/transform": "./src/library/tracks/transform/index.mjs",
     "#music-library/watch": "./src/watch/index.mjs",
     "#music-library/watch/library": "./src/watch/library/index.mjs",
     "#music-library/watch/library/transform": "./src/watch/library/transform/index.mjs",
     "#music-library/watch/library/playlists": "./src/watch/library/playlists/index.mjs",
     "#music-library/watch/library/playlists/transform": "./src/watch/library/playlists/transform/index.mjs",
     "#music-library/watch/library/tracks": "./src/watch/library/tracks/index.mjs",
-    "#music-library/watch/library/tracks/transform": "./src/watch/library/tracks/transform/index.mjs"
+    "#music-library/watch/library/tracks/transform": "./src/watch/library/tracks/transform/index.mjs",
+    "#build/gulp/*": "./build/gulp/*.mjs"
   }
 }

package/src/common/normalise.mjs

@@ -2,8 +2,10 @@ import {
   homedir
 } from 'os'
 
-import path from 'path'
+import {
+  resolve
+} from 'path'
 
-const normalise = (p) => path.resolve(p.trim().replace(/^~/, homedir()))
+const normalise = (p = '') => resolve(String(p).trim().replace(/^~/, homedir()))
 
 export default normalise

package/src/library/{index.js → index.mjs}

@@ -1,6 +1,6 @@
 import debug from 'debug'
 
-import * as musicLibraryParser from '@sequencemedia/music-library-parser'
+import musicLibraryParser from '@sequencemedia/music-library-parser'
 
 import normalise from '#music-library/common/normalise'
 

package/src/library/playlists/{index.js → index.mjs}

@@ -1,6 +1,6 @@
 import debug from 'debug'
 
-import * as musicLibraryParser from '@sequencemedia/music-library-parser'
+import musicLibraryParser from '@sequencemedia/music-library-parser'
 
 import normalise from '#music-library/common/normalise'
 
@@ -34,4 +34,4 @@ export async function toM3U (jar, xml, destination) {
   }
 }
 
-export * as transform from './transform'
+export * as transform from '#music-library/library/playlists/transform'

package/src/library/playlists/transform/{index.js → index.mjs}

@@ -1,6 +1,6 @@
 import debug from 'debug'
 
-import * as musicLibraryParser from '@sequencemedia/music-library-parser'
+import musicLibraryParser from '@sequencemedia/music-library-parser'
 
 import normalise from '#music-library/common/normalise'
 

package/src/library/tracks/{index.js → index.mjs}

@@ -1,6 +1,6 @@
 import debug from 'debug'
 
-import * as musicLibraryParser from '@sequencemedia/music-library-parser'
+import musicLibraryParser from '@sequencemedia/music-library-parser'
 
 import normalise from '#music-library/common/normalise'
 
@@ -34,4 +34,4 @@ export async function toM3U (jar, xml, destination) {
   }
 }
 
-export * as transform from './transform'
+export * as transform from '#music-library/library/tracks/transform'

package/src/library/tracks/transform/{index.js → index.mjs}

@@ -1,6 +1,6 @@
 import debug from 'debug'
 
-import * as musicLibraryParser from '@sequencemedia/music-library-parser'
+import musicLibraryParser from '@sequencemedia/music-library-parser'
 
 import normalise from '#music-library/common/normalise'
 

package/src/library/transform/{index.js → index.mjs}

@@ -1,6 +1,6 @@
 import debug from 'debug'
 
-import * as musicLibraryParser from '@sequencemedia/music-library-parser'
+import musicLibraryParser from '@sequencemedia/music-library-parser'
 
 import normalise from '#music-library/common/normalise'