From 9b2bd8ee3cb29ce13fc4f9f1995db37dd909715b Mon Sep 17 00:00:00 2001
From: cv <34649812+cpvalente@users.noreply.github.com>
Date: Mon, 14 Jun 2021 13:19:45 +0200
Subject: [PATCH] small fixes + improvements

- open link in external browser
- stop app from running after install
- fix lowercase path
- fix bug on file upload
---
 client/src/features/info/InfoNif.jsx       | 13 ++++++++++---
 client/src/features/menu/MenuBar.jsx       |  3 ---
 server/main.js                             |  2 ++
 server/package.json                        |  1 +
 server/src/controllers/OscController.js    |  2 +-
 server/src/controllers/ontimeController.js | 10 ++++++++--
 6 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/client/src/features/info/InfoNif.jsx b/client/src/features/info/InfoNif.jsx
index cc46f9cf9..46d862ab9 100644
--- a/client/src/features/info/InfoNif.jsx
+++ b/client/src/features/info/InfoNif.jsx
@@ -15,6 +15,12 @@ export default function InfoNif() {
   const isDev = process.env.NODE_ENV === 'development';
   const baseURL = `http://__IP__:${isDev ? 3000 : 4001}`;
 
+  const handleLink = (url) => {
+    if (window.process.type === 'renderer') {
+      window.ipcRenderer.send('send-to-link', url);
+    }
+  };
+
   return (
     <div className={style.container}>
       <div className={style.header}>
@@ -33,9 +39,10 @@ export default function InfoNif() {
               {data?.networkInterfaces.map((e) => {
                 return (
                   <a
-                    href={baseURL.replace('__IP__', e.address)}
-                    target='_blank'
-                    rel='noreferrer'
+                    href='/'
+                    onClick={() =>
+                      handleLink(baseURL.replace('__IP__', e.address))
+                    }
                     className={style.if}
                   >{`${e.name} - ${e.address}`}</a>
                 );
diff --git a/client/src/features/menu/MenuBar.jsx b/client/src/features/menu/MenuBar.jsx
index b6986416a..c11ce2efb 100644
--- a/client/src/features/menu/MenuBar.jsx
+++ b/client/src/features/menu/MenuBar.jsx
@@ -12,9 +12,6 @@ import HelpIconBtn from './buttons/HelpIconBtn';
 import UploadIconBtn from './buttons/UploadIconBtn';
 import { useRef } from 'react';
 
-// const { ipcRenderer } = window.require('electron');
-// import { ipcRenderer, remote }from 'electron';
-
 export default function MenuBar(props) {
   const { onOpen } = props;
   const hiddenFileInput = useRef(null);
diff --git a/server/main.js b/server/main.js
index 721551871..73643d175 100644
--- a/server/main.js
+++ b/server/main.js
@@ -256,5 +256,7 @@ ipcMain.on('send-to-link', (event, arg) => {
   // send to help URL
   if (arg === 'help') {
     shell.openExternal('https://cpvalente.gitbook.io/ontime/');
+  } else {
+    shell.openExternal(arg);
   }
 });
diff --git a/server/package.json b/server/package.json
index 09aa3170e..9abb81b7a 100644
--- a/server/package.json
+++ b/server/package.json
@@ -55,6 +55,7 @@
       "createDesktopShortcut": true,
       "createStartMenuShortcut": true,
       "deleteAppDataOnUninstall": true,
+      "runAfterFinish": false,
       "installerIcon": "icon.ico"
     },
     "files": [
diff --git a/server/src/controllers/OscController.js b/server/src/controllers/OscController.js
index 727bbe0a1..4a2733ab0 100644
--- a/server/src/controllers/OscController.js
+++ b/server/src/controllers/OscController.js
@@ -29,7 +29,7 @@ export const initiateOSC = (config) => {
     if (address !== 'ontime') return;
 
     // get second part (command)
-    switch (path.toLocaleLowerCase()) {
+    switch (path.toLowerCase()) {
       case 'start':
       case 'play':
         console.log('calling play');
diff --git a/server/src/controllers/ontimeController.js b/server/src/controllers/ontimeController.js
index 14f6c228f..f0d523d76 100644
--- a/server/src/controllers/ontimeController.js
+++ b/server/src/controllers/ontimeController.js
@@ -120,8 +120,14 @@ const upload = async (file, req, res) => {
     deleteFile(file);
 
     // check version
-    if (uploadedJson.settings.version === 1) parsev1(uploadedJson);
-    else {
+    if (uploadedJson.settings.version === 1) {
+      try {
+        parsev1(uploadedJson);
+        global.timer.setupWithEventList(db.data.events);
+      } catch (error) {
+        res.status(400).send({ message: `Error parsing file: ${error}` });
+      }
+    } else {
       res.status(400).send({ message: 'Error parsing file, version unknown' });
       return;
     }