code cleanup + es modules + fix 3rd party links

Author: chrisweb

cli.js

@@ -1,144 +1,107 @@
-var waveformData = require('./server/library/waveformData');
+import { getLocalWaveData, getRemoteWaveData } from './server/library/waveformData.js'
 
-var queryObject = {};
+const queryObject = {}
 
 process.argv.forEach(function (value, index, array) {
-    
-    var commandParametersLength = array.length - 2;
-    
+
+    const commandParametersLength = array.length - 2
+
     if (commandParametersLength !== 7) {
-        
-        var error = 'invalid parameters length, please call the cli with the following parameters: node cli SERVER_PATH TRACK_NAME TRACK_EXTENSION AMOUT_OF_PEAKS LOCAL_OR_REMOTE_SERVICENAME PEAKSLIST_OUTPUT_FORMAT TRACK_FORMAT_DETECTION\n';
-        
-        process.stderr.write(error + "\n");
-
-        process.exit(1);
-        
-    } 
-    
+
+        const error = 'invalid parameters length, please call the cli with the following parameters: node cli SERVER_PATH TRACK_NAME TRACK_EXTENSION AMOUT_OF_PEAKS LOCAL_OR_REMOTE_SERVICENAME PEAKSLIST_OUTPUT_FORMAT TRACK_FORMAT_DETECTION\n'
+
+        process.stderr.write(error + "\n")
+
+        process.exit(1)
+
+    }
+
     if (index === 2) {
-        
-        queryObject.serverDirectory = value;
-        
+        queryObject.serverDirectory = value
     }
-    
+
     if (index === 3) {
-        
-        queryObject.trackId = value;
-        
+        queryObject.trackId = value
     }
-    
+
     if (index === 4) {
-        
-        queryObject.trackFormat = value.toLowerCase();
-        
+        queryObject.trackFormat = value.toLowerCase()
     }
-    
+
     if (index === 5) {
-        
-        queryObject.peaksAmount = parseInt(value);
-        
+        queryObject.peaksAmount = parseInt(value)
     }
-    
+
     if (index === 6) {
-        
-        queryObject.service = value.toLowerCase();
-        
+        queryObject.service = value.toLowerCase()
     }
-    
+
     if (index === 7) {
-        
-        queryObject.outputFormat = value.toLowerCase();
-        
+        queryObject.outputFormat = value.toLowerCase()
     }
-    
+
     if (index === 8) {
-        
+
         if (typeof value === 'boolean') {
-        
-            queryObject.detectFormat = value;
-            
+            queryObject.detectFormat = value
         } else {
-            
-            var detectFormat = value.toLowerCase();
+
+            const detectFormat = value.toLowerCase()
 
             if (detectFormat === 'true') {
-                
-                queryObject.detectFormat = true;
-                
-            } else if (detectFormat.substr(0,2) === 'sr') {
-                
-                var splittedDetectFormat = detectFormat.split('=');
-                
-                queryObject.detectFormat = parseInt(splittedDetectFormat[1]);
-                
+                queryObject.detectFormat = true
+            } else if (detectFormat.substr(0, 2) === 'sr') {
+                const splittedDetectFormat = detectFormat.split('=')
+                queryObject.detectFormat = parseInt(splittedDetectFormat[1])
             } else {
-                
-                queryObject.detectFormat = false;
-                
+                queryObject.detectFormat = false
             }
-            
+
         }
-        
     }
-    
-});
+})
 
-var outputResponse = function outputResponseFunction(error, peaks) {
+const outputResponse = function outputResponseFunction(error, peaks) {
 
     if (error) {
-
-        process.stderr.write(error + "\n");
-
-        process.exit(1);
-
+        process.stderr.write(error + "\n")
+        process.exit(1)
     } else {
 
-        var output = '';
+        let output = ''
 
         // outputFormat can be json or text
         if (queryObject.outputFormat === 'json') {
 
-            var outputData = {
+            const outputData = {
                 "peaks": peaks
-            };
-            
-            output = JSON.stringify(outputData);
-            
+            }
+
+            output = JSON.stringify(outputData)
+
         } else {
-            
-            var peaksString = '';
-            var i;
-            var peaksLength = peaks.length;
+
+            const peaksString = ''
+            let i
+            const peaksLength = peaks.length
 
             for (i = 0; i < peaksLength; i++) {
+                peaksString += peaks[i] + ','
+            }
 
-                peaksString += peaks[i] + ',';
+            output = peaksString.substring(0, peaksString.length - 1)
 
-            }
-            
-            output = peaksString.substring(0, peaksString.length - 1);
-            
         }
-        
-        process.stdout.write(output + "\n");
 
-        process.exit(0);
+        process.stdout.write(output + "\n")
+
+        process.exit(0)
 
     }
-    
-};
+}
 
 if (queryObject.service === 'local') {
-    
-    // node cli ./downloads 1100511 ogg 200 local json false
-    // node cli ./downloads 1100511 mp3 200 local json false
-    waveformData.getLocalWaveData(queryObject, outputResponse);
-    
+    getLocalWaveData(queryObject, outputResponse)
 } else {
-    
-    // node cli ./downloads 1100511 ogg 200 jamendo json false
-    // node cli ./downloads 1100511 mp3 200 jamendo json false
-    waveformData.getRemoteWaveData(queryObject, outputResponse);
-    
+    getRemoteWaveData(queryObject, outputResponse)
 }