remove duplicate code
This commit is contained in:
parent
32a128917c
commit
caf22368d2
|
@ -13,9 +13,9 @@ import {
|
||||||
setupNextElectronServe,
|
setupNextElectronServe,
|
||||||
enableSharedArrayBufferSupport,
|
enableSharedArrayBufferSupport,
|
||||||
handleDockIconHideOnAutoLaunch,
|
handleDockIconHideOnAutoLaunch,
|
||||||
setupLogging,
|
|
||||||
} from './utils/main';
|
} from './utils/main';
|
||||||
import { initSentry } from './services/sentry';
|
import { initSentry } from './services/sentry';
|
||||||
|
import { setupLogging } from './utils/logging';
|
||||||
|
|
||||||
let mainWindow: BrowserWindow;
|
let mainWindow: BrowserWindow;
|
||||||
|
|
||||||
|
|
|
@ -33,9 +33,10 @@ import {
|
||||||
exists,
|
exists,
|
||||||
} from './api/export';
|
} from './api/export';
|
||||||
import { selectRootDirectory, logToDisk, openLogDirectory } from './api/common';
|
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 { isFolder, getDirFiles } from './api/fs';
|
||||||
import { convertHEIC } from './api/heicConvert';
|
import { convertHEIC } from './api/heicConvert';
|
||||||
|
import { setupLogging } from './utils/logging';
|
||||||
|
|
||||||
fixHotReloadNext12();
|
fixHotReloadNext12();
|
||||||
setupLogging();
|
setupLogging();
|
||||||
|
|
|
@ -8,3 +8,7 @@ export function logToDisk(logLine: string) {
|
||||||
export function openLogDirectory() {
|
export function openLogDirectory() {
|
||||||
ipcRenderer.invoke('open-log-dir');
|
ipcRenderer.invoke('open-log-dir');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function logError(error: Error, message: string, info?: string): void {
|
||||||
|
ipcRenderer.invoke('log-error', error, message, info);
|
||||||
|
}
|
||||||
|
|
|
@ -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 {
|
export function setupLogging() {
|
||||||
ipcRenderer.invoke('log-error', error, message, info);
|
log.transports.file.fileName = LOG_FILENAME;
|
||||||
|
log.transports.file.maxSize = MAX_LOG_SIZE;
|
||||||
|
log.transports.console.level = false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,4 @@
|
||||||
import {
|
import { PROD_HOST_URL, RENDERER_OUTPUT_DIR } from '../config';
|
||||||
LOG_FILENAME,
|
|
||||||
MAX_LOG_SIZE,
|
|
||||||
PROD_HOST_URL,
|
|
||||||
RENDERER_OUTPUT_DIR,
|
|
||||||
} from '../config';
|
|
||||||
import { nativeImage, Tray, app, BrowserWindow, Menu } from 'electron';
|
import { nativeImage, Tray, app, BrowserWindow, Menu } from 'electron';
|
||||||
import electronReload from 'electron-reload';
|
import electronReload from 'electron-reload';
|
||||||
import serveNextAt from 'next-electron-server';
|
import serveNextAt from 'next-electron-server';
|
||||||
|
@ -14,7 +9,6 @@ import { isDev } from './common';
|
||||||
import { buildContextMenu, buildMenuBar } from './menu';
|
import { buildContextMenu, buildMenuBar } from './menu';
|
||||||
import autoLauncher from '../services/autoLauncher';
|
import autoLauncher from '../services/autoLauncher';
|
||||||
import { getHideDockIconPreference } from '../services/userPreference';
|
import { getHideDockIconPreference } from '../services/userPreference';
|
||||||
import log from 'electron-log';
|
|
||||||
|
|
||||||
export function handleUpdates(mainWindow: BrowserWindow, tray: Tray) {
|
export function handleUpdates(mainWindow: BrowserWindow, tray: Tray) {
|
||||||
if (!isDev) {
|
if (!isDev) {
|
||||||
|
@ -105,9 +99,3 @@ export async function handleDockIconHideOnAutoLaunch() {
|
||||||
export function enableSharedArrayBufferSupport() {
|
export function enableSharedArrayBufferSupport() {
|
||||||
app.commandLine.appendSwitch('enable-features', 'SharedArrayBuffer');
|
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;
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
import { LOG_FILENAME, MAX_LOG_SIZE } from '../config';
|
|
||||||
import { webFrame } from 'electron';
|
import { webFrame } from 'electron';
|
||||||
import log from 'electron-log';
|
|
||||||
|
|
||||||
export const fixHotReloadNext12 = () => {
|
export const fixHotReloadNext12 = () => {
|
||||||
webFrame.executeJavaScript(`Object.defineProperty(globalThis, 'WebSocket', {
|
webFrame.executeJavaScript(`Object.defineProperty(globalThis, 'WebSocket', {
|
||||||
|
@ -24,9 +22,3 @@ export function isPlatformMac() {
|
||||||
export function isPlatformWindows() {
|
export function isPlatformWindows() {
|
||||||
return process.platform === 'win32';
|
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;
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in a new issue