fix: track result of export

This commit is contained in:
7w1 committed 2026-07-29 22:54:34 -05:00
1 parent d9eb43e4fa
commit ff98677d77
4 files changed
+31 -12

No files matched your search

@@ -1313,11 +1313,19 @@ function DiagnosticsAndPrivacy() {
frontendLogs,
});
const filename = `sable-diagnostics-${dayjs().format('YYYY-MM-DD-HHmmss')}.zip`;
await saveFileToDevice(
const saveResult = await saveFileToDevice(
new Blob([new Uint8Array(zipBytes)], { type: 'application/zip' }),
filename,
'application/zip'
);
if (saveResult === 'cancelled') {
setDiagnosticsState('idle');
return;
}
if (saveResult === 'failed') {
setDiagnosticsState('error');
return;
}
} else {
const sanitizedLogs = sanitizeDiagnosticsLogs(frontendLogs);
if (sanitizedLogs === null) {
+5 -1
View File
@@ -1,4 +1,5 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
import * as Sentry from '@sentry/react';
import { createDebugLogger, getDebugLogger } from './debugLogger';
vi.mock('@sentry/react', () => ({
@@ -16,12 +17,13 @@ vi.mock('@sentry/react', () => ({
describe('DebugLoggerService', () => {
beforeEach(() => {
vi.clearAllMocks();
const debugLogger = getDebugLogger();
debugLogger.clear();
debugLogger.setEnabled(false);
});
it('includes normal events in exports when debug mode is disabled', () => {
it('stores normal events for local export without sending them to Sentry when disabled', () => {
createDebugLogger('test').info('general', 'normal event');
const exported = JSON.parse(getDebugLogger().exportLogs()) as {
@@ -33,5 +35,7 @@ describe('DebugLoggerService', () => {
expect(exported.logs).toEqual([
expect.objectContaining({ level: 'info', message: 'normal event' }),
]);
expect(Sentry.addBreadcrumb).not.toHaveBeenCalled();
expect(Sentry.logger.info).not.toHaveBeenCalled();
});
});
+10 -5
View File
@@ -65,8 +65,9 @@ afterEach(() => {
describe('saveFileToDevice', () => {
it('scans an Android Downloads file after making it public', async () => {
await saveFileToDevice(new Blob(['data'], { type: 'text/plain' }), 'file.txt');
const result = await saveFileToDevice(new Blob(['data'], { type: 'text/plain' }), 'file.txt');
expect(result).toBe('saved');
expect(androidFs.createNewPublicFile).toHaveBeenCalledWith(
'Download',
'file.txt',
@@ -82,8 +83,9 @@ describe('saveFileToDevice', () => {
const error = new Error('write failed');
androidFs.writeFile.mockRejectedValue(error);
await saveFileToDevice(new Blob(['data']), 'file.txt');
const result = await saveFileToDevice(new Blob(['data']), 'file.txt');
expect(result).toBe('failed');
expect(androidFs.removeFile).toHaveBeenCalledWith('content://download/file');
expect(showToast).toHaveBeenCalledWith('Failed to save file: write failed');
});
@@ -91,8 +93,9 @@ describe('saveFileToDevice', () => {
it('does not write or toast when the iOS save picker is cancelled', async () => {
vi.mocked(osType).mockReturnValue('ios');
await saveFileToDevice(new Blob(['data']), 'file.txt');
const result = await saveFileToDevice(new Blob(['data']), 'file.txt');
expect(result).toBe('cancelled');
expect(save).toHaveBeenCalledWith({ defaultPath: 'file.txt' });
expect(writeFile).not.toHaveBeenCalled();
expect(showToast).not.toHaveBeenCalled();
@@ -102,8 +105,9 @@ describe('saveFileToDevice', () => {
vi.mocked(osType).mockReturnValue('ios');
save.mockResolvedValue('file:///exports/file.txt');
await saveFileToDevice(new Blob(['data']), 'file.txt');
const result = await saveFileToDevice(new Blob(['data']), 'file.txt');
expect(result).toBe('saved');
expect(writeFile).toHaveBeenCalledWith('file:///exports/file.txt', expect.any(Uint8Array));
expect(showToast).toHaveBeenCalledWith('File saved');
expect(invoke).not.toHaveBeenCalled();
@@ -112,8 +116,9 @@ describe('saveFileToDevice', () => {
it('keeps browser downloads on FileSaver', async () => {
vi.mocked(isTauri).mockReturnValue(false);
await saveFileToDevice(new Blob(['data']), 'file.txt');
const result = await saveFileToDevice(new Blob(['data']), 'file.txt');
expect(result).toBe('saved');
expect(FileSaver.saveAs).toHaveBeenCalledWith(expect.any(Blob), 'file.txt');
});
});
+7 -5
View File
@@ -128,7 +128,7 @@ export async function saveFileToDevice(
input: Blob | string,
filename: string,
mimeType?: string
): Promise<void> {
): Promise<'saved' | 'cancelled' | 'failed'> {
if (isTauri()) {
try {
const blob = await resolveBlob(input);
@@ -154,7 +154,7 @@ export async function saveFileToDevice(
await AndroidFs.setPublicFilePending(uri, false);
await AndroidFs.scanPublicFile(uri);
showToast('Saved to Downloads');
return;
return 'saved';
} catch (error) {
if (uri) await AndroidFs.removeFile(uri).catch(() => undefined);
throw error;
@@ -164,22 +164,24 @@ export async function saveFileToDevice(
if (osType() === 'ios') {
const { save } = await import('@tauri-apps/plugin-dialog');
const path = await save({ defaultPath: filename });
if (!path) return;
if (!path) return 'cancelled';
const { writeFile } = await import('@tauri-apps/plugin-fs');
await writeFile(path, bytes);
showToast('File saved');
return;
return 'saved';
}
const saved = await invoke<boolean>('save_download', { filename, bytes: Array.from(bytes) });
if (saved) showToast('File saved');
return saved ? 'saved' : 'cancelled';
} catch (error) {
const message = error instanceof Error ? error.message : 'unknown error';
showToast(`Failed to save file: ${message}`);
return 'failed';
}
return;
}
FileSaver.saveAs(input, filename);
return 'saved';
}