Skip to content

Commit 65ea235

Browse files
toyobayashitoyobayashi
committed
refactor: useUnknownInCatchVariables
1 parent ad06625 commit 65ea235

10 files changed

+32
-31
lines changed

‎app/.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ module.exports = {
3434
},
3535
parserOptions: {
3636
parser: '@typescript-eslint/parser',
37-
ecmaVersion: 2018,
37+
ecmaVersion: 2019,
3838
sourceType: 'module',
3939
project: './tsconfig.json',
4040
tsconfigRootDir: __dirname,

‎app/script/release-download-count.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { get } from 'https'
22

3-
const repeat = (s: string, n: number) => {
3+
const repeat = (s: string, n: number): string => {
44
if (n < 0) throw new Error('repeat(s, n < 0)')
55
let str = ''
66
for (let i = 0; i < n; i++) {
@@ -17,23 +17,23 @@ get({
1717
}
1818
}, (response) => {
1919
let body = ''
20-
response.on('data',chunk => body += chunk)
20+
response.on('data', (chunk: string) => { body += chunk })
2121
response.on('end', () => {
2222
console.log('Release' + repeat(' ', 40 - 7) + 'Download Count\n')
2323

24-
let res = JSON.parse(body)
24+
const res = JSON.parse(body)
2525
let total = 0
2626
let lineCount = 0
2727
try {
2828
for (const release of res) {
2929
for (const asset of release.assets) {
30-
total += asset.download_count
31-
let line = asset.name + repeat(' ', 40 - asset.name.length) + asset.download_count
30+
total += asset.download_count as number
31+
const line = `${asset.name}${repeat(' ', 40 - asset.name.length)}${asset.download_count}`
3232
if (lineCount < 20) console.log(line)
3333
lineCount++
3434
}
3535
}
36-
console.log('\nTotal' + repeat(' ', 40 - 5) + total)
36+
console.log(`\nTotal${repeat(' ', 40 - 5)}${total}`)
3737
} catch (err) {
3838
console.log(res)
3939
}

‎app/src/ts/renderer-back.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ipcRenderer.on('openManifestDatabase', async (event, callbackChannel: string, pa
1616
try {
1717
manifest = await DB.open(path)
1818
event.sender.sendTo(mainWindowId, callbackChannel, null)
19-
} catch (err) {
19+
} catch (err: any) {
2020
event.sender.sendTo(mainWindowId, callbackChannel, err.message)
2121
}
2222
})
@@ -29,7 +29,7 @@ ipcRenderer.on('openMasterDatabase', async (event, callbackChannel: string, path
2929
try {
3030
master = await DB.open(path)
3131
event.sender.sendTo(mainWindowId, callbackChannel, null)
32-
} catch (err) {
32+
} catch (err: any) {
3333
event.sender.sendTo(mainWindowId, callbackChannel, err.message)
3434
}
3535
})
@@ -38,7 +38,7 @@ ipcRenderer.on('getMasterHash', async (event, callbackChannel: string) => {
3838
try {
3939
const masterHash = (await manifest!.find('manifests', ['name', 'hash'], { name: 'master.mdb' }))[0].hash as string
4040
event.sender.sendTo(mainWindowId, callbackChannel, null, masterHash)
41-
} catch (err) {
41+
} catch (err: any) {
4242
event.sender.sendTo(mainWindowId, callbackChannel, err.message, '')
4343
}
4444
})
@@ -50,7 +50,7 @@ ipcRenderer.on('readMasterData', async (event, callbackChannel: string, masterFi
5050
await master.close()
5151
master = null
5252
event.sender.sendTo(mainWindowId, callbackChannel, null, masterData)
53-
} catch (err) {
53+
} catch (err: any) {
5454
event.sender.sendTo(mainWindowId, callbackChannel, err.message, '')
5555
}
5656
})
@@ -59,7 +59,7 @@ ipcRenderer.on('getCardHash', async (event, callbackChannel: string, id: string
5959
try {
6060
const res = await manifest!.find('manifests', ['hash'], { name: `card_bg_${id}.unity3d` })
6161
event.sender.sendTo(mainWindowId, callbackChannel, null, res[0].hash)
62-
} catch (err) {
62+
} catch (err: any) {
6363
event.sender.sendTo(mainWindowId, callbackChannel, err.message, '')
6464
}
6565
})
@@ -68,7 +68,7 @@ ipcRenderer.on('getIconHash', async (event, callbackChannel: string, id: string
6868
try {
6969
const res = await manifest!.findOne('manifests', ['hash'], { name: `card_${id}_m.unity3d` })
7070
event.sender.sendTo(mainWindowId, callbackChannel, null, res.hash)
71-
} catch (err) {
71+
} catch (err: any) {
7272
event.sender.sendTo(mainWindowId, callbackChannel, err.message, '')
7373
}
7474
})
@@ -77,7 +77,7 @@ ipcRenderer.on('getEmblemHash', async (event, callbackChannel: string, id: strin
7777
try {
7878
const res = await manifest!.findOne('manifests', ['hash'], { name: `emblem_${id}_l.unity3d` })
7979
event.sender.sendTo(mainWindowId, callbackChannel, null, res.hash)
80-
} catch (err) {
80+
} catch (err: any) {
8181
event.sender.sendTo(mainWindowId, callbackChannel, err.message, '')
8282
}
8383
})
@@ -86,7 +86,7 @@ ipcRenderer.on('searchResources', async (event, callbackChannel: string, querySt
8686
try {
8787
const res = await manifest!.find<{ name: string, hash: string }>('manifests', ['name', 'hash', 'size'], { name: { $like: `%${queryString.trim()}%` } })
8888
event.sender.sendTo(mainWindowId, callbackChannel, null, res)
89-
} catch (err) {
89+
} catch (err: any) {
9090
event.sender.sendTo(mainWindowId, callbackChannel, err.message, '')
9191
}
9292
})
@@ -98,7 +98,7 @@ ipcRenderer.on('startBatchDownload', async (event, callbackChannel: string) => {
9898
batchDownloading = true
9999
await batchDownload(manifest!)
100100
event.sender.sendTo(mainWindowId, callbackChannel, null, batchDownloading)
101-
} catch (err) {
101+
} catch (err: any) {
102102
event.sender.sendTo(mainWindowId, callbackChannel, err.message, '')
103103
}
104104
})
@@ -108,7 +108,7 @@ ipcRenderer.on('stopBatchDownload', async (event, callbackChannel: string) => {
108108
await batchStop()
109109
batchDownloading = false
110110
event.sender.sendTo(mainWindowId, callbackChannel, null, batchDownloading)
111-
} catch (err) {
111+
} catch (err: any) {
112112
event.sender.sendTo(mainWindowId, callbackChannel, err.message, '')
113113
}
114114
})
@@ -117,7 +117,7 @@ ipcRenderer.on('getBatchErrorList', (event, callbackChannel: string) => {
117117
try {
118118
const list = getBatchErrorList()
119119
event.sender.sendTo(mainWindowId, callbackChannel, null, list)
120-
} catch (err) {
120+
} catch (err: any) {
121121
event.sender.sendTo(mainWindowId, callbackChannel, err.message, null)
122122
}
123123
})
@@ -126,7 +126,7 @@ ipcRenderer.on('setDownloaderProxy', (event, callbackChannel: string, proxy: str
126126
try {
127127
setDownloaderProxy(proxy)
128128
event.sender.sendTo(mainWindowId, callbackChannel, null)
129-
} catch (err) {
129+
} catch (err: any) {
130130
event.sender.sendTo(mainWindowId, callbackChannel, err.message)
131131
}
132132
})

‎app/src/ts/renderer/back/batch-download.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export async function batchDownload (manifest: DB): Promise<void> {
120120
})
121121
await currentDownloadPromise
122122
currentDownloadPromise = null
123-
} catch (err) {
123+
} catch (err: any) {
124124
if (stopBatch) {
125125
currentDownloadPromise = null
126126
break

‎app/src/ts/renderer/mishiro-commu.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export default class extends Vue {
165165
let res: ServerResponse
166166
try {
167167
res = await getProfile(/* '646406677' */this.queryString)
168-
} catch (err) {
168+
} catch (err: any) {
169169
this.isSearching = false
170170
this.event.$emit('alert', this.$t('home.errorTitle'), err.message)
171171
return
@@ -218,7 +218,7 @@ export default class extends Vue {
218218
emblemB64 = readFileSync(emblemCache + '.png').toString('base64')
219219
}
220220
}
221-
} catch (err) {
221+
} catch (err: any) {
222222
console.error(err)
223223
this.event.$emit('alert', this.$t('home.errorTitle'), err.message)
224224
}
@@ -236,8 +236,9 @@ export default class extends Vue {
236236
return
237237
}
238238
this.renderer.canvas.toBlob((blob) => {
239+
if (!blob) return
239240
const a = document.createElement('a')
240-
a.download = 'test.png'
241+
a.download = `${this.queryString}.png`
241242
a.href = URL.createObjectURL(blob)
242243
const event = new MouseEvent('click', {
243244
view: window,

‎app/src/ts/renderer/mishiro-home.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export default class extends Vue {
160160
const usmFile = result.filePaths[i]
161161
try {
162162
await this.core.movie.demuxAsync(usmFile)
163-
} catch (err) {
163+
} catch (err: any) {
164164
error(`USM: ${err.message}`)
165165
}
166166
}

‎app/src/ts/renderer/mishiro-idol.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,8 @@ export default class extends Vue {
476476
this.cardDownloadPromise = null
477477
return downloadResult
478478
}
479-
} catch (_err) {
480-
if (_err.message !== 'abort') {
479+
} catch (err: any) {
480+
if (err.message !== 'abort') {
481481
this.cardDownloadPromise = this.dler.downloadSpread(
482482
id.toString(),
483483
cardDir(`bg_${id}.png`),
@@ -487,7 +487,7 @@ export default class extends Vue {
487487
this.cardDownloadPromise = null
488488
return downloadResult
489489
} else {
490-
throw _err
490+
throw err
491491
}
492492
}
493493
}

‎app/src/ts/renderer/mishiro-update.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ export default class extends Vue {
288288
if (getBackgroundResult/* && getBackgroundResult !== 'await ipc' */) {
289289
this.event.$emit('eventBgReady', id)
290290
}
291-
} catch (err) {
291+
} catch (err: any) {
292292
this.event.$emit('alert', this.$t('home.errorTitle'), (this.$t('home.downloadFailed') as string) + '<br/>' + (err.toString() as string))
293293
}
294294
}
@@ -362,7 +362,7 @@ export default class extends Vue {
362362
this.text = this.$t('update.check') as string
363363
this.loading = 0
364364
resVer = await this.getResVer()
365-
} catch (err) {
365+
} catch (err: any) {
366366
console.error(err)
367367
error(`UPDATE getResVer: ${err.stack}`)
368368
if (Number(err.message) === 203) {

‎app/src/ts/renderer/modal-version.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default class extends mixins(modalMixin) {
3838
this.btnDisabled = false
3939
this.updateProgress = 0
4040
}
41-
} catch (err) {
41+
} catch (err: any) {
4242
updater.onDownload(null)
4343
this.btnDisabled = false
4444
this.event.$emit('alert', this.$t('home.errorTitle'), err.message)

‎app/src/vue/modal/ModalOption.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ export default class extends mixins(modalMixin) {
168168
this.batchDownloading = true
169169
try {
170170
await startBatchDownload()
171-
} catch (err) {
171+
} catch (err: any) {
172172
this.event.$emit('alert', this.$t('home.errorTitle'), err.message)
173173
}
174174
this.batchDownloading = false

0 commit comments

Comments
 (0)