remove duplicate code

This commit is contained in:
Abhinav 2022-10-18 14:00:43 +05:30
parent 32a128917c
commit caf22368d2
6 changed files with 14 additions and 26 deletions

View file

@ -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;

View file

@ -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();

View file

@ -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);
}

View file

@ -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;
}

View file

@ -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;
}

View file

@ -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;
}