Merge pull request #65 from wavelog/dev

Dev -> Master for 1.1.8

Author: int2001

main.js

@@ -5,6 +5,8 @@ const http = require('http');
 const xml = require("xml2js");
 const net = require('net');
 
+const gotTheLock = app.requestSingleInstanceLock();
+
 let powerSaveBlockerId;
 let tray;
 let s_mainWindow;
@@ -196,17 +198,25 @@ process.on('SIGINT', () => {
 });
 
 app.on('will-quit', () => {
-	powerSaveBlocker.stop(powerSaveBlockerId);
+	try {
+		powerSaveBlocker.stop(powerSaveBlockerId);
+	} catch(e) {
+		console.log(e);
+	}
 });
 
-app.whenReady().then(() => {
-	powerSaveBlockerId = powerSaveBlocker.start('prevent-app-suspension');
-	s_mainWindow=createWindow();
-	createAdvancedWindow(s_mainWindow);
-	globalShortcut.register('Control+Shift+I', () => { return false; });
-	app.on('activate', function () {
-		if (BrowserWindow.getAllWindows().length === 0) createWindow()
-	});
+if (!gotTheLock) {
+	app.quit();
+} else {
+	startserver();
+	app.whenReady().then(() => {
+		powerSaveBlockerId = powerSaveBlocker.start('prevent-app-suspension');
+		s_mainWindow=createWindow();
+		createAdvancedWindow(s_mainWindow);
+		globalShortcut.register('Control+Shift+I', () => { return false; });
+		app.on('activate', function () {
+			if (BrowserWindow.getAllWindows().length === 0) createWindow()
+		});
 	s_mainWindow.webContents.once('dom-ready', function() {
 		if (msgbacklog.length>0) {
 			s_mainWindow.webContents.send('updateMsg',msgbacklog.pop());
@@ -216,36 +226,37 @@ app.whenReady().then(() => {
 	// Create the tray icon
 	const path = require('path');
 	const iconPath = path.join(__dirname, 'icon1616.png');
-  	tray = new Tray(iconPath);
+	tray = new Tray(iconPath);
 
 	const contextMenu = Menu.buildFromTemplate([
 		{ label: 'Show App', click: () => s_mainWindow.show() },
-		{ label: 'Quit', click: () => {
+			{ label: 'Quit', click: () => {
 			console.log("Exiting");
 			app.isQuitting = true;
 			app.quit();
 		}
 		},
 	]);
 
-		tray.setContextMenu(contextMenu);
-		tray.setToolTip(require('./package.json').name + " V" + require('./package.json').version);
+	tray.setContextMenu(contextMenu);
+	tray.setToolTip(require('./package.json').name + " V" + require('./package.json').version);
 
-		s_mainWindow.on('minimize', (event) => {
-			event.preventDefault();
-			s_mainWindow.hide(); // Hides the window instead of minimizing it to the taskbar
-		});
+	s_mainWindow.on('minimize', (event) => {
+		event.preventDefault();
+		s_mainWindow.hide(); // Hides the window instead of minimizing it to the taskbar
+	});
 
-		s_mainWindow.on('close', (event) => {
-			if (!app.isQuitting) {
-				event.preventDefault();
-				s_mainWindow.hide();
-			}
-		});
-		if (process.platform === 'darwin') {
-			app.dock.hide();
+	s_mainWindow.on('close', (event) => {
+		if (!app.isQuitting) {
+			event.preventDefault();
+			s_mainWindow.hide();
 		}
-})
+	});
+	if (process.platform === 'darwin') {
+		app.dock.hide();
+	}
+	})
+}
 
 app.on('window-all-closed', function () {
 	if (process.platform !== 'darwin') app.quit();
@@ -299,6 +310,18 @@ function writeADIF(adifObject) {
 	return adiWriter;
 }
 
+function freqToBand(freq_mz) {
+	const f = parseFloat(freq_mz);
+	if (isNaN(f)) return null;
+
+	const bandMap = require('tcadif/lib/enums/Band');
+	for (const [band, { lowerFreq, upperFreq }] of Object.entries(bandMap))
+		if (f >= parseFloat(lowerFreq) && f <= parseFloat(upperFreq))
+			return band;
+
+	return null;
+}
+
 function send2wavelog(o_cfg,adif, dryrun = false) {
 	let clpayload={};
 	clpayload.key=o_cfg.wavelog_key.trim();
@@ -413,6 +436,8 @@ ports.forEach(port => {
 						GRIDSQUARE: parsedXML.contactinfo.gridsquare[0],
 						STATION_CALLSIGN: parsedXML.contactinfo.mycall[0]
 					} ]};
+				let band = freqToBand(adobject.qsos[0].FREQ);
+				if (band) adobject.qsos[0].BAND = band;
 			} catch (e) {}
 		} else {
 			try {
@@ -590,5 +615,3 @@ function fmt(spotDate) {
 	retstr.t=h.padStart(2,'0')+i.padStart(2,'0')+s.padStart(2,'0');
 	return retstr;
 }
-
-startserver();

package-lock.json

@@ -4,7 +4,7 @@
   "description": "Gateway for connecting WSJT-* and FLRig to Wavelog",
   "keywords": [],
   "main": "./main.js",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "author": "DJ7NT",
   "scripts": {
     "start": "electron-forge start",

package.json

@@ -154,9 +154,9 @@ window.TX_API.onUpdateMsg((value) => {
 
 window.TX_API.onUpdateTX((value) => {
 	if (value.created) {
-		$("#log").html('<div class="alert alert-success" role="alert">'+value.qsos[0].TIME_ON+" "+value.qsos[0].CALL+" ("+(value.qsos[0].GRIDSQUARE || 'No Grid')+") on "+value.qsos[0].BAND+" (R:"+(value.qsos[0].RST_RCVD || 'No RST')+" / S:"+(value.qsos[0].RST_SENT || 'No RST')+') - OK</div>');
+		$("#log").html('<div class="alert alert-success" role="alert">'+value.qsos[0].TIME_ON+" "+value.qsos[0].CALL+" ("+(value.qsos[0].GRIDSQUARE || 'No Grid')+") on "+(value.qsos[0].BAND || 'No BAND')+" (R:"+(value.qsos[0].RST_RCVD || 'No RST')+" / S:"+(value.qsos[0].RST_SENT || 'No RST')+') - OK</div>');
 	} else {
-		$("#log").html('<div class="alert alert-danger" role="alert">'+value.qsos[0].TIME_ON+" "+value.qsos[0].CALL+" ("+(value.qsos[0].GRIDSQUARE || 'No Grid')+") on "+value.qsos[0].BAND+" (R:"+(value.qsos[0].RST_RCVD || 'No RST')+" / S:"+(value.qsos[0].RST_SENT || 'No RST')+') - Error<br/>Reason: '+value.fail.payload.reason+'</div>');
+		$("#log").html('<div class="alert alert-danger" role="alert">'+value.qsos[0].TIME_ON+" "+value.qsos[0].CALL+" ("+(value.qsos[0].GRIDSQUARE || 'No Grid')+") on "+(value.qsos[0].BAND || 'NO BAND')+" (R:"+(value.qsos[0].RST_RCVD || 'No RST')+" / S:"+(value.qsos[0].RST_SENT || 'No RST')+') - Error<br/>Reason: '+value.fail.payload.reason+'</div>');
 	}
 })