Skip to content

Commit d4dab6d

Browse files
committed
fix: linux parse argv
1 parent deae5e8 commit d4dab6d

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
"allowToChangeInstallationDirectory": true
132132
},
133133
"linux": {
134-
"category": "Network;Download;Utility",
134+
"category": "Network",
135135
"target": [
136136
"deb",
137137
"snap",

src/main/Application.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { EventEmitter } from 'events'
22
import { app, shell, dialog, ipcMain } from 'electron'
33
import is from 'electron-is'
4-
import * as fs from 'fs'
4+
import { readFile } from 'fs'
55
import { extname, basename } from 'path'
6+
67
import logger from './core/Logger'
78
import ConfigManager from './core/ConfigManager'
89
import { setupLocaleManager } from '@/ui/Locale'
@@ -163,7 +164,7 @@ export default class Application extends EventEmitter {
163164
this.show()
164165

165166
const fileName = basename(filePath)
166-
fs.readFile(filePath, (err, data) => {
167+
readFile(filePath, (err, data) => {
167168
if (err) {
168169
logger.warn(`[Motrix] read file error: ${filePath}`, err.message)
169170
return

src/main/Launcher.js

-3
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ export default class Launcher extends EventEmitter {
3333
app.quit()
3434
} else {
3535
app.on('second-instance', (event, argv, workingDirectory) => {
36-
logger.warn('second-instance argv===>', argv)
37-
logger.warn('second-instance workingDirectory===>', workingDirectory)
3836
global.application.showPage('index')
3937
if (!is.macOS() && argv.length > 1) { // Windows, Linux
4038
this.file = parseArgv(argv)
@@ -94,7 +92,6 @@ export default class Launcher extends EventEmitter {
9492
this.sendFileToApplication()
9593
})
9694
} else if (process.argv.length > 1) { // Windows, Linux
97-
logger.warn('handleOpenFile argv===>', process.argv)
9895
this.file = parseArgv(process.argv)
9996
this.sendFileToApplication()
10097
}

src/main/utils/index.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,13 @@ export function isDirectory (path) {
6565
}
6666

6767
export function parseArgv (argv) {
68-
logger.warn('parseArgv==111==>', argv)
69-
const arg = argv[1]
68+
let arg = argv[1]
7069
if (!arg || isDirectory(arg)) {
7170
return
7271
}
73-
logger.warn('parseArgv==222==>', arg)
74-
return resolve(arg)
72+
73+
if (is.linux()) {
74+
arg = arg.replace('file://', '')
75+
}
76+
return arg
7577
}

0 commit comments

Comments
 (0)