From caf22368d2cb4bea5abaa89d5b8e1fdfa8a68d5d Mon Sep 17 00:00:00 2001
From: Abhinav <abhinavk.grd@gmail.com>
Date: Tue, 18 Oct 2022 14:00:43 +0530
Subject: [PATCH] remove duplicate code

---
 src/main.ts             |  2 +-
 src/preload.ts          |  3 ++-
 src/services/logging.ts |  4 ++++
 src/utils/logging.ts    |  9 ++++++---
 src/utils/main.ts       | 14 +-------------
 src/utils/preload.ts    |  8 --------
 6 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index 0623dd127..f211585e3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -13,9 +13,9 @@ import {
     setupNextElectronServe,
     enableSharedArrayBufferSupport,
     handleDockIconHideOnAutoLaunch,
-    setupLogging,
 } from './utils/main';
 import { initSentry } from './services/sentry';
+import { setupLogging } from './utils/logging';
 
 let mainWindow: BrowserWindow;
 
diff --git a/src/preload.ts b/src/preload.ts
index 0e861594b..86f36c27c 100644
--- a/src/preload.ts
+++ b/src/preload.ts
@@ -33,9 +33,10 @@ import {
     exists,
 } from './api/export';
 import { selectRootDirectory, logToDisk, openLogDirectory } from './api/common';
-import { fixHotReloadNext12, setupLogging } from './utils/preload';
+import { fixHotReloadNext12 } from './utils/preload';
 import { isFolder, getDirFiles } from './api/fs';
 import { convertHEIC } from './api/heicConvert';
+import { setupLogging } from './utils/logging';
 
 fixHotReloadNext12();
 setupLogging();
diff --git a/src/services/logging.ts b/src/services/logging.ts
index d72c806e1..4bbb561cc 100644
--- a/src/services/logging.ts
+++ b/src/services/logging.ts
@@ -8,3 +8,7 @@ export function logToDisk(logLine: string) {
 export function openLogDirectory() {
     ipcRenderer.invoke('open-log-dir');
 }
+
+export function logError(error: Error, message: string, info?: string): void {
+    ipcRenderer.invoke('log-error', error, message, info);
+}
diff --git a/src/utils/logging.ts b/src/utils/logging.ts
index e50d533ff..8a7bbbea6 100644
--- a/src/utils/logging.ts
+++ b/src/utils/logging.ts
@@ -1,5 +1,8 @@
-import { ipcRenderer } from 'electron';
+import log from 'electron-log';
+import { LOG_FILENAME, MAX_LOG_SIZE } from '../config';
 
-export function logError(error: Error, message: string, info?: string): void {
-    ipcRenderer.invoke('log-error', error, message, info);
+export function setupLogging() {
+    log.transports.file.fileName = LOG_FILENAME;
+    log.transports.file.maxSize = MAX_LOG_SIZE;
+    log.transports.console.level = false;
 }
diff --git a/src/utils/main.ts b/src/utils/main.ts
index 18a357fec..30b58e721 100644
--- a/src/utils/main.ts
+++ b/src/utils/main.ts
@@ -1,9 +1,4 @@
-import {
-    LOG_FILENAME,
-    MAX_LOG_SIZE,
-    PROD_HOST_URL,
-    RENDERER_OUTPUT_DIR,
-} from '../config';
+import { PROD_HOST_URL, RENDERER_OUTPUT_DIR } from '../config';
 import { nativeImage, Tray, app, BrowserWindow, Menu } from 'electron';
 import electronReload from 'electron-reload';
 import serveNextAt from 'next-electron-server';
@@ -14,7 +9,6 @@ import { isDev } from './common';
 import { buildContextMenu, buildMenuBar } from './menu';
 import autoLauncher from '../services/autoLauncher';
 import { getHideDockIconPreference } from '../services/userPreference';
-import log from 'electron-log';
 
 export function handleUpdates(mainWindow: BrowserWindow, tray: Tray) {
     if (!isDev) {
@@ -105,9 +99,3 @@ export async function handleDockIconHideOnAutoLaunch() {
 export function enableSharedArrayBufferSupport() {
     app.commandLine.appendSwitch('enable-features', 'SharedArrayBuffer');
 }
-
-export function setupLogging() {
-    log.transports.file.fileName = LOG_FILENAME;
-    log.transports.file.maxSize = MAX_LOG_SIZE;
-    log.transports.console.level = false;
-}
diff --git a/src/utils/preload.ts b/src/utils/preload.ts
index d0d68a8ea..1da5bd833 100644
--- a/src/utils/preload.ts
+++ b/src/utils/preload.ts
@@ -1,6 +1,4 @@
-import { LOG_FILENAME, MAX_LOG_SIZE } from '../config';
 import { webFrame } from 'electron';
-import log from 'electron-log';
 
 export const fixHotReloadNext12 = () => {
     webFrame.executeJavaScript(`Object.defineProperty(globalThis, 'WebSocket', {
@@ -24,9 +22,3 @@ export function isPlatformMac() {
 export function isPlatformWindows() {
     return process.platform === 'win32';
 }
-
-export function setupLogging() {
-    log.transports.file.fileName = LOG_FILENAME;
-    log.transports.file.maxSize = MAX_LOG_SIZE;
-    log.transports.console.level = false;
-}