Bug fixes

Author: lasley

makemkv.js

@@ -1,6 +1,7 @@
 /* Interact with MakeMKV CLI */
 
 const fs = require('fs'),
+    os = require('os'),
     EventEmitter = require('events').EventEmitter,
     parseCsv = require('csv-parse/lib/sync'),
     path = require('path'),
@@ -10,7 +11,6 @@ const fs = require('fs'),
 
 const ALL_DRIVES = constants.ALL_DRIVES,
     DRIVE_STATE_FLAG = constants.DRIVE_STATE_FLAG,
-    NEWLINE_CHAR = constants.NEWLINE_CHAR,
     TRACK_ATTRIBUTES = constants.TRACK_ATTRIBUTES;
 
 const CONVERSION_PROFILE = settings.CONVERSION_PROFILE,
@@ -151,44 +151,61 @@ class MakeMkv {
 
         let newCallback = (exitCode, stdErr, stdOut) => {
 
-            this.busyDevices.delete(ALL_DRIVES);
+            console.debug(stdOut);
+            console.debug(stdErr);
 
-            if (exitCode) {
-                // @TODO: handle errors.
-            }
+            this.busyDevices.delete(ALL_DRIVES);
 
             let discData = {},
-                parsedOutput = parseCsv(stdOut);
+                parsedOutput = parseCsv(
+                    stdOut.join(os.EOL),
+                    {relax_column_count: true}
+                );
 
             parsedOutput.map((dataRow) => {
 
                 dataRow = this._parseOutputRow(dataRow);
 
-                if (dataRow.attributeType !== this.ATTRIBUTE_TYPE_DRIVE_INFO) {
+                if (!dataRow) {
                     return;
                 }
-                if (!dataRow.driveId) {
+
+                console.debug(
+                    `AttributeType: ${dataRow.attributeType}
+                    DriveId: ${dataRow.driveId}`
+                );
+
+                if (dataRow.attributeType == this.ATTRIBUTE_TYPE_DRIVE_INFO) {
+                    console.log(dataRow);
+                }
+
+                if (
+                    !dataRow
+                    || dataRow.attributeType !== this.ATTRIBUTE_TYPE_DRIVE_INFO
+                    || !dataRow.driveId
+                ) {
                     return;
                 }
 
-                // Maintain an index => drive mapping.
-                // @TODO: Is this even used? Feels very legacy to me...
-                this.driveMap[dataRow.driveIndex] = dataRow.driveId;
+                console.debug(dataRow);
 
                 // Assign the flags to string representations
                 dataRow.driveState = DRIVE_STATE_FLAG[dataRow.driveState];
+
                 // @TODO: Bitwise determination of the disc filesystem flags.
 
                 // Add the processed row into the data.
                 discData[dataRow.driveId] = dataRow;
 
             });
 
+            console.debug("Got data for drives.");
+            console.debug(discData);
             callback(discData);
 
         };
 
-        this._spawnMakemkv(ALL_DRIVES, ['info'], newCallback);
+        this._spawnMakemkv(ALL_DRIVES, ['info', 'disc:9999'], newCallback);
 
     }
 
@@ -275,18 +292,18 @@ class MakeMkv {
         The output lines appear in a certain order::
 
             TCOUNT (track count)
-            CINFO (Disc level information)
-            ...
-            TINFO (Track level information)
+            CINFO (Disc information)
             ...
-            SINFO (Stream level information)
+            TINFO (Track 0 information)
             ...
-            TINFO (Next track level information
-            ...
-            SINFO (Next stream level information)
+            SINFO (Track 0, Stream 0 information)
             ...
+            SINFO (Track 0, Stream 1 information)
             ...
+            TINFO (Track 1 information)
             ...
+            SINFO (Track 1, Stream 0 information)
+            ... repeating ...
 
         @param  {int}   exitCode    MakeMKV exit code
         @param  {array} stdErr  Array of lines representing the error stream.
@@ -379,10 +396,12 @@ class MakeMkv {
 
         let [attrType, attrFlag] = dataRow[0].split(':');
 
+        // Zip the keys and values into an obj and add the attribute type.
         let parseData = (keys) => {
             dataRow[0] = attrFlag;
-            let data = keys.map((key, idx) => [key, dataRow[idx]]);
-            data.attributeType = attrType;
+            let data = {attributeType: attrType};
+            keys.forEach((key, idx) => data[key] = dataRow[idx]);
+            return data;
         };
 
         switch(attrType) {
@@ -405,6 +424,9 @@ class MakeMkv {
             case this.ATTRIBUTE_TYPE_STREAM_INFO:
                 return parseData(this.HEADERS_DISC_INFO_STREAM);
 
+            default:
+                return false;
+
         }
 
     }
@@ -431,7 +453,7 @@ class MakeMkv {
      */
     _spawn(args, binaryPath, callback) {
 
-        console.log(`Spawning ${binaryPath} with args ${args}`);
+        console.log(`Spawning "${binaryPath}" with args: "${args}"`);
 
         let process = spawn(binaryPath, args);
 
@@ -446,12 +468,15 @@ class MakeMkv {
         process.stderr.setEncoding('utf-8');
 
         process.stdout.on(
-            'data', (data) => stdOut.push.apply(data.split(NEWLINE_CHAR))
+            'data', (data) => { stdOut.push(...data.split(os.EOL)) }
         );
         process.stderr.on(
-            'data', (data) => stdErr.push.apply(data.split(NEWLINE_CHAR))
+            'data', (data) => { stdErr.push(...data.split(os.EOL)) }
         );
-        process.on('exit', (code) => callback(code, stdErr, stdOut));
+        process.on('exit', (code) => {
+            console.debug(`MakeMKV exited with code ${code}.`);
+            callback(code, stdErr, stdOut);
+        });
 
     }
 
@@ -479,6 +504,7 @@ class MakeMkv {
                 return this._waitAvailable(driveId, callback, ...args);
             }
         };
+        console.debug(`Waiting for ${driveId} to become available.`);
         setTimeout(timer, 1000);
     }
 

server.js

@@ -42,6 +42,7 @@ class Subscribable {
     }
 
     subscribe(socketClient) {
+        console.debug(`Subscribing client to ${this.name}`);
         this.clients.add(socketClient);
         socketClient.on('disconnect', () => this.disconnect(socketClient));
         this.emitData(socketClient);
@@ -52,6 +53,9 @@ class Subscribable {
     }
 
     broadcastData() {
+        console.debug(`Broadcasting to ${this.clients.length} clients.`);
+        console.debug(this.clients);
+        console.debug(this.data);
         this.clients.forEach((client) => this.emitData(client));
     }
 
@@ -78,7 +82,7 @@ class Subscribable {
             dataObject = dataObject[currentKey];
             return this.update(futureKey, value, skipBroadcast, dataObject);
         }
-        this.dataObject[key] = value;
+        dataObject[key] = value;
         if (!skipBroadcast) {
             this.broadcastData();
         }
@@ -204,14 +208,16 @@ class MakeMkvServer {
 
     initDevices() {
         this.makeMkv.scanDiscs(
-            (driveInfo) => this.driveInfo.updateBulk(driveInfo)
+            (driveInfo) => {
+                this.driveInfo.updateBulk(driveInfo);
+            }
         );
     }
 
     doDiscInfo(data) {
         let driveId = data.driveId;
         let callback = (stdErr, discInfo) => {
-            this.discInfo[driveId] = {};
+            this.discInfo.update(driveId, {});
             this.discInfo.updateBulk(discInfo, this.discInfo[driveId]);
         };
         this.makeMkv.getDiscInfo(driveId, callback);

settings.example.json

@@ -16,5 +16,10 @@
     "PERMISSIONS": {
         "file": "0666",
         "directory": "0777"
+    },
+    "SSL": {
+        "ENABLED": false,
+        "KEY": "/path/to/ssl/key.pem",
+        "CERT": "/path/to/ssl/cert.pem"
     }
 }