diff --git a/src/pages/ExportPage.tsx b/src/pages/ExportPage.tsx index 3119d23..0b15071 100644 --- a/src/pages/ExportPage.tsx +++ b/src/pages/ExportPage.tsx @@ -1023,14 +1023,14 @@ function ExportPage() { const [copiedDetailField, setCopiedDetailField] = useState(null) const [exportFolder, setExportFolder] = useState('') - const [writeLayout, setWriteLayout] = useState('A') + const [writeLayout, setWriteLayout] = useState('B') const [snsExportFormat, setSnsExportFormat] = useState('html') const [snsExportImages, setSnsExportImages] = useState(false) const [snsExportLivePhotos, setSnsExportLivePhotos] = useState(false) const [snsExportVideos, setSnsExportVideos] = useState(false) const [options, setOptions] = useState({ - format: 'arkme-json', + format: 'json', dateRange: { start: new Date(new Date().setHours(0, 0, 0, 0)), end: new Date() @@ -1398,15 +1398,13 @@ function ExportPage() { setIsBaseConfigLoading(true) let isReady = true try { - const [savedPath, savedFormat, savedMedia, savedVoiceAsText, savedExcelCompactColumns, savedTxtColumns, savedConcurrency, savedWriteLayout, savedSessionMap, savedContentMap, savedSessionRecordMap, savedSnsPostCount, exportCacheScope] = await Promise.all([ + const [savedPath, savedMedia, savedVoiceAsText, savedExcelCompactColumns, savedTxtColumns, savedConcurrency, savedSessionMap, savedContentMap, savedSessionRecordMap, savedSnsPostCount, exportCacheScope] = await Promise.all([ configService.getExportPath(), - configService.getExportDefaultFormat(), configService.getExportDefaultMedia(), configService.getExportDefaultVoiceAsText(), configService.getExportDefaultExcelCompactColumns(), configService.getExportDefaultTxtColumns(), configService.getExportDefaultConcurrency(), - configService.getExportWriteLayout(), configService.getExportLastSessionRunMap(), configService.getExportLastContentRunMap(), configService.getExportSessionRecordMap(), @@ -1423,11 +1421,15 @@ function ExportPage() { setExportFolder(downloadsPath) } - setWriteLayout(savedWriteLayout) + setWriteLayout('B') setLastExportBySession(savedSessionMap) setLastExportByContent(savedContentMap) setExportRecordsBySession(savedSessionRecordMap) setLastSnsExportPostCount(savedSnsPostCount) + await Promise.all([ + configService.setExportWriteLayout('B'), + configService.setExportDefaultFormat('json') + ]) if (cachedSnsStats && Date.now() - cachedSnsStats.updatedAt <= EXPORT_SNS_STATS_CACHE_STALE_MS) { setSnsStats({ @@ -1442,7 +1444,7 @@ function ExportPage() { const txtColumns = savedTxtColumns && savedTxtColumns.length > 0 ? savedTxtColumns : defaultTxtColumns setOptions(prev => ({ ...prev, - format: (savedFormat as TextExportFormat) || prev.format, + format: 'json', exportMedia: savedMedia ?? prev.exportMedia, exportVoiceAsText: savedVoiceAsText ?? prev.exportVoiceAsText, excelCompactColumns: savedExcelCompactColumns ?? prev.excelCompactColumns, diff --git a/src/pages/SettingsPage.tsx b/src/pages/SettingsPage.tsx index 5691f32..368bed5 100644 --- a/src/pages/SettingsPage.tsx +++ b/src/pages/SettingsPage.tsx @@ -103,7 +103,7 @@ function SettingsPage() { const [autoTranscribeVoice, setAutoTranscribeVoice] = useState(false) const [transcribeLanguages, setTranscribeLanguages] = useState(['zh']) - const [exportDefaultFormat, setExportDefaultFormat] = useState('excel') + const [exportDefaultFormat, setExportDefaultFormat] = useState('json') const [exportDefaultDateRange, setExportDefaultDateRange] = useState('today') const [exportDefaultMedia, setExportDefaultMedia] = useState(false) const [exportDefaultVoiceAsText, setExportDefaultVoiceAsText] = useState(false) @@ -286,7 +286,6 @@ function SettingsPage() { const savedWhisperModelDir = await configService.getWhisperModelDir() const savedAutoTranscribe = await configService.getAutoTranscribeVoice() const savedTranscribeLanguages = await configService.getTranscribeLanguages() - const savedExportDefaultFormat = await configService.getExportDefaultFormat() const savedExportDefaultDateRange = await configService.getExportDefaultDateRange() const savedExportDefaultMedia = await configService.getExportDefaultMedia() const savedExportDefaultVoiceAsText = await configService.getExportDefaultVoiceAsText() @@ -327,7 +326,8 @@ function SettingsPage() { setLogEnabled(savedLogEnabled) setAutoTranscribeVoice(savedAutoTranscribe) setTranscribeLanguages(savedTranscribeLanguages) - setExportDefaultFormat(savedExportDefaultFormat || 'excel') + setExportDefaultFormat('json') + await configService.setExportDefaultFormat('json') setExportDefaultDateRange(savedExportDefaultDateRange || 'today') setExportDefaultMedia(savedExportDefaultMedia ?? false) setExportDefaultVoiceAsText(savedExportDefaultVoiceAsText ?? false)