paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-11-03 05:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove fs-extra dependency.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-12-17 17:02:19 -08:00
parent d7adce0ebf
commit 2e90e24552
3 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/renderer/js/pages/preference/general-section.ts
View File

@@ -1,9 +1,9 @@
import {ipcRenderer, remote, OpenDialogOptions} from 'electron';
import fs from 'fs';
import path from 'path';
import Tagify from '@yaireo/tagify';
import {htmlEscape} from 'escape-goat';
import fs from 'fs-extra';
import ISO6391 from 'iso-639-1';
import supportedLocales from '../../../../translations/supported-locales.json';
@@ -494,7 +494,7 @@ export default class GeneralSection extends BaseSection {
detail: clearAppDataMessage
});
if (response === 0) {
await fs.remove(getAppPath);
await fs.promises.rmdir(getAppPath, {recursive: true});
setTimeout(() => ipcRenderer.send('clear-app-settings'), 1000);
}
}

30
app/renderer/js/utils/logger-util.ts
View File

@@ -70,9 +70,9 @@ export default class Logger {
// Trim log according to type of process
if (process.type === 'renderer') {
requestIdleCallback(() => this.trimLog(file));
requestIdleCallback(async () => this.trimLog(file));
} else {
process.nextTick(() => this.trimLog(file));
process.nextTick(async () => this.trimLog(file));
}
const fileStream = fs.createWriteStream(file, {flags: 'a'});
@@ -133,22 +133,18 @@ export default class Logger {
}
}
trimLog(file: string): void {
fs.readFile(file, 'utf8', (err, data) => {
if (err) {
throw err;
}
async trimLog(file: string): Promise<void> {
const data = await fs.promises.readFile(file, 'utf8');
const MAX_LOG_FILE_LINES = 500;
const logs = data.split(os.EOL);
const logLength = logs.length - 1;
const MAX_LOG_FILE_LINES = 500;
const logs = data.split(os.EOL);
const logLength = logs.length - 1;
// Keep bottom MAX_LOG_FILE_LINES of each log instance
if (logLength > MAX_LOG_FILE_LINES) {
const trimmedLogs = logs.slice(logLength - MAX_LOG_FILE_LINES);
const toWrite = trimmedLogs.join(os.EOL);
fs.writeFileSync(file, toWrite);
}
});
// Keep bottom MAX_LOG_FILE_LINES of each log instance
if (logLength > MAX_LOG_FILE_LINES) {
const trimmedLogs = logs.slice(logLength - MAX_LOG_FILE_LINES);
const toWrite = trimmedLogs.join(os.EOL);
await fs.promises.writeFile(file, toWrite);
}
}
}