WEBPACK! Additional changes to discover & npm

discover.py

@@ -1,5 +1,6 @@
 import socket
 import struct
+import json
 
 import xml.etree.ElementTree as ET
 
@@ -29,12 +30,12 @@ def discover():
     while True:
         data, (ip,_) = sock.recvfrom(1024)
         data = data.decode('UTF-8',errors="ignore")
-        print(data)
+        # print(data)
         type = rx_type(data)
         dcid = dcid_find(data)
         if type is not '':
             device = dcid_get(dcid)
-            # print('RX: {} at: {} DCID: {} BAND: {}'.format(type,ip,dcid,device['band']))
+            print('RX: {} at: {} DCID: {} BAND: {}'.format(type,ip,dcid,device['band']))
             add_rx(ip,type)
 
 def add_rx(ip,rx_type):
@@ -88,8 +89,8 @@ def DCID_Parse_old():
     print(deviceList)
 
 
-def DCID_Parse():
-    tree = ET.parse('DCIDMap.xml')
+def DCID_Parse(file):
+    tree = ET.parse(file)
     root = tree.getroot()
 
     devices = root.findall('./MapEntry')
@@ -107,11 +108,24 @@ def DCID_Parse():
             dev = {'model': model,'model_name':model_name, 'band':band }
             deviceList[dccid.text] = dev
 
+def dcid_save_to_file(file):
+    with open(file,'w') as f:
+        json.dump(deviceList,f, indent=2, separators=(',',': '), sort_keys=True)
+        f.write('\n')
+
+def dcid_restore_from_file(file):
+    global deviceList
+    with open(file,'r') as f:
+        deviceList = json.load(f)
 
+def updateDCIDmap(inputFile,outputFile):
+    DCID_Parse(inputFile);
+    dcid_save_to_file(outputFile)
 
 
 def main():
-    DCID_Parse()
+    # updateDCIDmap('DCIDmap.xml','dcid.json')
+    dcid_restore_from_file('dcid.json')
     discover()
 
 

tornado_server.spec → micboard.spec

@@ -3,10 +3,10 @@
 block_cipher = None
 
 
-a = Analysis(['tornado_server.py'],
-             pathex=['/Users/karl/Dropbox/brainstorm/Projects/Current Projects/micbox/dev/mictray'],
+a = Analysis(['micboard.py'],
+             pathex=['/Users/karl/Dropbox/brainstorm/Projects/Current Projects/micbox/dev/micboard'],
              binaries=[],
-             datas=[('config.ini','.'),
+             datas=[('config.json','.'),
                     ('static/','.')],
              hiddenimports=[],
              hookspath=[],
@@ -22,7 +22,7 @@ exe = EXE(pyz,
           a.binaries,
           a.zipfiles,
           a.datas,
-          name='tornado_server',
+          name='micboard',
           debug=False,
           strip=False,
           upx=True,

package.json

@@ -1,10 +1,13 @@
 {
-  "name": "mictray",
+  "name": "micboard",
   "version": "1.0.0",
   "description": "An intelligent mic tray for ethernet enabled Shure microphones.",
-  "main": "tornado_server.py",
+  "main": "micboard.py",
   "scripts": {
-    "start": "electron ."
+    "server" : "python micboard.py",
+    "binary" : "pyinstaller micboard.spec",
+    "build": "node node_modules/webpack/bin/webpack.js --progress --hide-modules --config=webpack.config.js",
+    "app": "electron main.js"
   },
   "private": true,
   "repository": {
@@ -15,17 +18,21 @@
   "bugs": {
     "url": "https://github.com/karlcswanson/mictray/issues"
   },
-  "homepage": "https://github.com/karlcswanson/mictray",
+  "homepage": "https://github.com/karlcswanson/micboard",
   "dependencies": {
     "@ibm/plex": "^1.1.3",
     "bootstrap": "^4.1.2",
     "jquery": "^3.3.1",
     "npm": "^6.4.0",
     "popper.js": "^1.14.3",
     "qrcode": "^1.2.2",
-    "smoothie": "^1.35.0"
+    "smoothie": "^1.35.0",
+    "webpack-cli": "^3.1.2"
   },
   "devDependencies": {
-    "electron": "^2.0.7"
+    "css-loader": "^1.0.0",
+    "electron": "^2.0.7",
+    "style-loader": "^0.23.0",
+    "webpack": "^4.20.2"
   }
 }

static/chart-smoothie.js

@@ -1,6 +1,9 @@
-var charts = {};
+"use strict";
+import { TimeSeries, SmoothieChart } from 'smoothie'
 
-function initChart(slotSelector) {
+export var charts = {};
+
+export function initChart(slotSelector) {
   var chart = {};
   chart.audioSeries = new TimeSeries();
   chart.rfSeries = new TimeSeries();

static/demodata.js

@@ -1,4 +1,10 @@
-var batterySample = {
+"use strict";
+
+import { transmitters, updateSlot } from "./script.js"
+import { charts } from './chart-smoothie.js'
+
+
+const batterySample = {
   0:{
       battery: 255,
       status: ['CRITICAL','UNASSIGNED','RX_COM_ERROR','TX_COM_ERROR']
@@ -25,24 +31,24 @@ var batterySample = {
     }
 }
 
-var rfSample = ['AX','XB','XX','BRXX','XRXB','XXBR'];
+const rfSample = ['AX','XB','XX','BRXX','XRXB','XXBR'];
 
 
-var name_sample = ['Fatai','Marshall','Delwin','Tracy TB','Backup',
+const name_sample = ['Fatai','Marshall','Delwin','Tracy TB','Backup',
                    'Steve','JE','Sharon','Bob','Del ACU','Troy',
                    'Matt','Matt ACU','Matt Sax','Karl','Jordan','Josue',
                    'Hallie','Rebekah','Dan','Stephen','Max','Tom','Nick',''];
 
-var prefix_sample = ['HH','BP'];
+const prefix_sample = ['HH','BP'];
 
-var type_sample = ['ULXD','QLXD','ULXD','AXTD']
+const type_sample = ['ULXD','QLXD','ULXD','AXTD']
 
 function randomIPGenerator() {
   return "192.168.103." + getRandomInt(50,150)
 }
 
 function randomTypeGenerator() {
-    return type_sample[getRandomInt(0,type_sample.length - 1)]
+  return type_sample[getRandomInt(0,type_sample.length - 1)]
 }
 
 // https://gist.github.com/kerimdzhanov/7529623
@@ -64,27 +70,27 @@ function current_names() {
   var names = []
   var slots = Object.keys(transmitters).map(Number);
 
-  for(i in slots){
+  for(let i in slots){
     name = transmitters[slots[i]].name
-    prefix = name.substring(0,2)
-    number = name.substring(2,4)
+    let prefix = name.substring(0,2)
+    let number = name.substring(2,4)
     name = name.substring(5)
     names.push(name)
   }
   return names
 }
 
 function uniqueRandomNameGenerator(slot){
-  var used_names = current_names()
-  namebank = name_sample.filter( el => !used_names.includes(el));
+  let used_names = current_names()
+  let namebank = name_sample.filter( el => !used_names.includes(el));
 
-  var len = namebank.length;
-  var index = getRandomInt(0,len-1);
-  var name = namebank[index]
+  let len = namebank.length;
+  let index = getRandomInt(0,len-1);
+  let name = namebank[index]
 
 
-  var channel = slot.toString().padStart(2,'0');
-  output = 'HH' + channel + ' ' + name;
+  let channel = slot.toString().padStart(2,'0');
+  let output = 'HH' + channel + ' ' + name;
   console.log(output)
   return output
 }
@@ -102,7 +108,7 @@ function randomTXOffsetGenerator() {
 }
 
 function randomFrequencyGenerator(){
-  frequency =  getRandomInt(474,597) + (getRandomInt(0,40) * .025)
+  let frequency =  getRandomInt(474,597) + (getRandomInt(0,40) * .025)
   return frequency.toFixed(3)
 }
 
@@ -123,7 +129,7 @@ function randomBatteryGenerator() {
   return res;
 }
 
-function randomDataGenerator(slot){
+export function randomDataGenerator(slot){
   var battery = randomBatteryGenerator();
 
   var res = {
@@ -147,7 +153,7 @@ function randomDataGenerator(slot){
 function meteteredRandomDataGenerator(update){
   var slots = Object.keys(transmitters).map(Number);
   var slot = slots[getRandomInt(0, slots.length - 1)];
-  data = JSON.parse(JSON.stringify(transmitters[slot]))
+  let data = JSON.parse(JSON.stringify(transmitters[slot]))
 
   var battery = randomBatteryGenerator();
 
@@ -181,7 +187,7 @@ function randomCharts(){
 }
 
 
-function autoRandom(){
+export function autoRandom(){
   setInterval(function(){
     updateSlot(meteteredRandomDataGenerator("name"));
   },1250)

static/gif.js

@@ -1,3 +1,8 @@
+"use strict";
+
+import { gif_list } from "./script.js"
+
+
 $(document).ready(function() {
   window.addEventListener("resize", showDivSize);
 });
@@ -50,8 +55,7 @@ function sendFile(file, filename) {
 }
 
 
-function updateGIFBackgrounds() {
-  console.log('GIF!');
+export function updateGIFBackgrounds() {
   $(".mic_name").each(function(key, value){
 
     name = $(this).children(".name").html().toLowerCase() + ".gif";

static/index.html

@@ -32,9 +32,9 @@
 
 
     <!-- Bootstrap CSS -->
-    <link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
+    <!-- <link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css"> -->
     <!-- <link href="https://fonts.googleapis.com/css?family=Roboto+Mono:100i,300,400,700i|Roboto:100,300,400,700" rel="stylesheet"> -->
-    <link rel="stylesheet" href="static/style.css">
+    <!-- <link rel="stylesheet" href="static/style.css"> -->
     <title>micboard</title>
 
   </head>
@@ -102,17 +102,18 @@ <h1>Connection Error!</h1>
     <!-- https://stackoverflow.com/questions/32621988/electron-jquery-is-not-defined -->
     <script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
 
-    <script src="node_modules/jquery/dist/jquery.min.js"></script>
-    <script src="node_modules/popper.js/dist/umd/popper.min.js"></script>
-    <script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
-    <script src="node_modules/smoothie/smoothie.js"></script>
-    <script src="node_modules/qrcode/build/qrcode.min.js"></script>
+    <!-- <script src="node_modules/jquery/dist/jquery.min.js"></script> -->
+    <!-- <script src="node_modules/popper.js/dist/umd/popper.min.js"></script> -->
+    <!-- <script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script> -->
+    <!-- <script src="node_modules/smoothie/smoothie.js"></script> -->
+    <!-- <script src="node_modules/qrcode/build/qrcode.min.js"></script> -->
 
 
-    <script src="static/script.js"></script>
-    <script src="static/gif.js"></script>
-    <script src="static/chart-smoothie.js"></script>
-    <script src="static/demodata.js"></script>
+    <!-- <script src="static/script.js"></script> -->
+    <!-- <script src="static/gif.js"></script> -->
+    <!-- <script src="static/chart-smoothie.js"></script> -->
+    <!-- <script src="static/demodata.js"></script> -->
+    <script src="static/bundle.js"></script>
     <script>if (window.module) module = window.module;</script>
 
   </body>