Refactoring

src/App.js

@@ -5,6 +5,7 @@ import Configuration from './containers/Configuration/Configuration';
 import {connect} from 'react-redux';
 import DependencyList from './components/DependencyList/DependencyList';
 import DownloadProgress from './components/DownloadProgress/DownloadProgress';
+import {extractFileNameFromURL} from './utils';
 import ErrorDetails from './components/ErrorDetails/ErrorDetails';
 import Grid from './components/UI/Grid/Grid';
 import IPCContainer from './containers/IPCContainer/IPCContainer';
@@ -93,11 +94,6 @@ class App extends IPCContainer {
     }
   };
 
-  extractFileNameFromURL = url => {
-    const parts = url.split('/');
-    return parts[parts.length - 1];
-  };
-
   getSelectedVersion = () => {
     return (this.props.ReleaseVersion === -1) ?
       'unavailable' :
@@ -105,7 +101,7 @@ class App extends IPCContainer {
   };
 
   handleDownloadDependency = url => {
-    this.props.downloadItem(this.extractFileNameFromURL(url), Constants.INSTALL_TYPES.Dependency, url, this.onDownloadFileComplete);
+    this.props.downloadItem(extractFileNameFromURL(url), Constants.INSTALL_TYPES.Dependency, url, this.onDownloadFileComplete);
   };
 
   handleDownloadRelease = () => {
@@ -116,7 +112,7 @@ class App extends IPCContainer {
 
   handleDownloadUpgrade = () => {
     const url = this.props.UpgradeData.urls[0];
-    const name = this.props.Platform === 'win32' ? 'upgrade.exe' : this.extractFileNameFromURL(url);
+    const name = this.props.Platform === 'win32' ? 'upgrade.exe' : extractFileNameFromURL(url);
     this.props.downloadItem(name, Constants.INSTALL_TYPES.Upgrade, url, this.onDownloadFileComplete);
   };
 

src/containers/IPCContainer/IPCContainer.js

@@ -1,16 +1,9 @@
 import {Component} from 'react';
+import {getIPCRenderer} from '../../utils';
 
 export default class extends Component {
-  constructor(props) {
-    super(props);
-
-    if (!process.versions.hasOwnProperty('electron')) {
-      this.ipcRenderer = ((window && window.require) ? window.require('electron').ipcRenderer : null);
-    }
-  }
-
   handlerList = {};
-  ipcRenderer;
+  ipcRenderer = getIPCRenderer();
 
   componentWillUnmount() {
     if (this.ipcRenderer) {

src/index.js

@@ -3,14 +3,14 @@ import ReactDOM from 'react-dom';
 import './index.css';
 import App from './App';
 import createAppStore from './redux/store/createAppStore';
+import {getIPCRenderer} from './utils';
 import packageJson from '../package.json';
 import {Provider} from 'react-redux';
 import * as serviceWorker from './serviceWorker';
 
 const Constants = require('./constants');
 
-if (!process.versions.hasOwnProperty('electron')) {
+const ipcRenderer = getIPCRenderer();
-  const ipcRenderer = ((window && window.require) ? window.require('electron').ipcRenderer : null);
 if (ipcRenderer) {
   ipcRenderer.on(Constants.IPC_Get_Platform_Reply, (event, arg) => {
     if (arg.Platform === 'linux') {
@@ -28,5 +28,4 @@ if (!process.versions.hasOwnProperty('electron')) {
   });
   ipcRenderer.send(Constants.IPC_Get_Platform);
 }
-}
 

src/redux/actions/common_actions.js

@@ -1,10 +1,8 @@
 import * as Constants from '../../constants';
 import {createAction} from 'redux-starter-kit';
+import {getIPCRenderer} from '../../utils';
 
-let ipcRenderer;
+const ipcRenderer = getIPCRenderer();
-if (!process.versions.hasOwnProperty('electron')) {
-  ipcRenderer = ((window && window.require) ? window.require('electron').ipcRenderer : null);
-}
 
 export const setApplicationReady = createAction('common/setApplicationReady');
 

src/redux/actions/download_actions.js

@@ -1,5 +1,6 @@
 import * as Constants from '../../constants';
 import {createAction} from 'redux-starter-kit';
+import {getIPCRenderer} from '../../utils';
 
 export const setAllowDownload = createAction('download/setAllowDownload');
 
@@ -22,8 +23,7 @@ export const downloadItem = (name, type, url, completedCallback) => {
   return (dispatch, getState) => {
     const state = getState();
     if (!state.download.DownloadActive && state.download.AllowDownload) {
-      if (!process.versions.hasOwnProperty('electron')) {
+      const ipcRenderer = getIPCRenderer();
-        const ipcRenderer = ((window && window.require) ? window.require('electron').ipcRenderer : null);
       if (ipcRenderer) {
         dispatch(setDownloadBegin(name, type, url));
 
@@ -47,6 +47,5 @@ export const downloadItem = (name, type, url, completedCallback) => {
         });
       }
     }
-    }
   };
 };

src/redux/actions/install_actions.js

@@ -1,10 +1,8 @@
 import * as Constants from '../../constants';
 import {createAction} from 'redux-starter-kit';
+import {getIPCRenderer} from '../../utils';
 
-let ipcRenderer;
+const ipcRenderer = getIPCRenderer();
-if (!process.versions.hasOwnProperty('electron')) {
-  ipcRenderer = ((window && window.require) ? window.require('electron').ipcRenderer : null);
-}
 
 export const installDependency = (source, url, completedCallback) => {
   return (dispatch, getState) => {

src/utils.js

@@ -0,0 +1,13 @@
+const ipcRenderer = (!process.versions.hasOwnProperty('electron') && window && window.require) ?
+  window.require('electron').ipcRenderer :
+  null;
+
+export const extractFileNameFromURL = url => {
+  const parts = url.split('/');
+  return parts[parts.length - 1];
+};
+
+export const getIPCRenderer = () => {
+  return ipcRenderer;
+};
+