Skip to content

Commit 085a736

Browse files
authored
Show error notification if selected file is inaccessible (#843)
* send error message using ipc * remove redundant log * linting and copilot * change to return success and message technique * delete unused import * null safety * use error message as message * linting
1 parent 781cfdb commit 085a736

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

gcs/electron/main.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,19 @@ ipcMain.handle("window:select-file-in-explorer", async (_event, filters) => {
192192
try {
193193
const stats = fs.statSync(filePath)
194194
return {
195+
success: true,
195196
path: filePath,
196197
name: path.basename(filePath),
197198
size: stats.size,
198199
}
199200
} catch (err) {
200-
// File is inaccessible or deleted
201-
return null
201+
return {
202+
success: false,
203+
message:
204+
err instanceof Error
205+
? err.message
206+
: "File is inaccessible or deleted",
207+
}
202208
}
203209
}
204210
return null

gcs/src/components/fla/SelectFlightLog.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ export default function SelectFlightLog({ getLogSummary }) {
3838
"window:select-file-in-explorer",
3939
[{ name: "Flight Logs", extensions: ["log", "ftlog"] }],
4040
)
41-
if (result) {
41+
if (result?.success) {
4242
handleFile(result)
43+
} else if (result) {
44+
showErrorNotification(result.message)
4345
}
4446
}
4547

gcs/src/missions.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,13 +239,15 @@ export default function Missions() {
239239
"window:select-file-in-explorer",
240240
[{ name: "Waypoint files", extensions: ["waypoints", "txt"] }],
241241
)
242-
if (result) {
242+
if (result?.success) {
243243
dispatch(
244244
emitImportMissionFromFile({
245245
type: activeTabRef.current,
246246
file_path: result.path,
247247
}),
248248
)
249+
} else if (result) {
250+
showErrorNotification(result.message)
249251
}
250252
}
251253

0 commit comments

Comments
 (0)