Skip to content

Commit 8cf7b26

Browse files
committed
Address issues raised by ESLint.
1 parent 81f4e3b commit 8cf7b26

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

packages/gui/src/electron/main.tsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ import {
1414
import fs from 'fs';
1515
import path from 'path';
1616
import url from 'url';
17-
import sanitizeFilename from 'sanitize-filename';
1817

1918
import { initialize, enable } from '@electron/remote/main';
2019
import axios from 'axios';
2120
import windowStateKeeper from 'electron-window-state';
2221
import React from 'react';
2322
// import os from 'os';
2423
import ReactDOMServer from 'react-dom/server';
24+
import sanitizeFilename from 'sanitize-filename';
2525
import { ServerStyleSheet, StyleSheetManager } from 'styled-components';
2626
import isURL from 'validator/es/lib/isURL';
2727

@@ -32,7 +32,6 @@ import AppIcon from '../assets/img/chia64x64.png';
3232
import About from '../components/about/About';
3333
import { i18n } from '../config/locales';
3434
import chiaEnvironment, { chiaInit } from '../util/chiaEnvironment';
35-
import downloadFile from './utils/downloadFile';
3635
import loadConfig, { checkConfigFileExists } from '../util/loadConfig';
3736
import manageDaemonLifetime from '../util/manageDaemonLifetime';
3837
import { setUserDataDir } from '../util/userData';
@@ -41,6 +40,7 @@ import CacheManager from './CacheManager';
4140
import { readAddressBook, saveAddressBook } from './addressBook';
4241
import installDevTools from './installDevTools.dev';
4342
import { readPrefs, savePrefs, migratePrefs } from './prefs';
43+
import downloadFile from './utils/downloadFile';
4444

4545
/**
4646
* Open the given external protocol URL in the desktop's default manner.
@@ -332,6 +332,7 @@ if (ensureSingleInstance() && ensureCorrectEnvironment()) {
332332

333333
for (let i = 0; i < tasks.length; i++) {
334334
const { url: downloadUrl, filename } = tasks[i];
335+
const curMainWindow = mainWindow;
335336

336337
try {
337338
const sanitizedFilename = sanitizeFilename(filename);
@@ -345,7 +346,7 @@ if (ensureSingleInstance() && ensureCorrectEnvironment()) {
345346

346347
await downloadFile(downloadUrl, filePath, {
347348
onProgress: (progress) => {
348-
mainWindow?.webContents.send('multipleDownloadProgress', {
349+
curMainWindow?.webContents.send('multipleDownloadProgress', {
349350
progress,
350351
url: downloadUrl,
351352
index: i,
@@ -362,7 +363,7 @@ if (ensureSingleInstance() && ensureCorrectEnvironment()) {
362363
if (e.message === 'download aborted' && abortDownloadingFiles) {
363364
break;
364365
}
365-
mainWindow?.webContents.send('errorDownloadingUrl', downloadUrl);
366+
curMainWindow?.webContents.send('errorDownloadingUrl', downloadUrl);
366367
errorFileCount++;
367368
}
368369
}

packages/gui/src/electron/utils/downloadFile.ts

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { promises as fs, createWriteStream, type WriteStream } from 'fs';
44
import debug from 'debug';
55

66
import type Headers from '../../@types/Headers';
7+
78
import fileExists from './fileExists';
89

910
const log = debug('chia-gui:downloadFile');

0 commit comments

Comments
 (0)