From 515d116c8e249994c090fc63facaa145c59cb8aa Mon Sep 17 00:00:00 2001 From: Pierre-Yves Nicolas <6371790+pynicolas@users.noreply.github.com> Date: Mon, 1 Dec 2025 07:07:04 +0100 Subject: [PATCH] Avoid adding index to file name if only 1 file --- .../org/fairscan/app/ui/screens/export/ExportViewModel.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/fairscan/app/ui/screens/export/ExportViewModel.kt b/app/src/main/java/org/fairscan/app/ui/screens/export/ExportViewModel.kt index aa02526..8ae7f49 100644 --- a/app/src/main/java/org/fairscan/app/ui/screens/export/ExportViewModel.kt +++ b/app/src/main/java/org/fairscan/app/ui/screens/export/ExportViewModel.kt @@ -138,8 +138,10 @@ class ExportViewModel(container: AppContainer): ViewModel() { } is ExportResult.Jpeg -> { val base = desiredFilename.removeSuffix(".jpg") - val renamedFiles = result.files.mapIndexed { index, file -> - val newFile = File(file.parentFile, "${base}_${index + 1}.jpg") + val files = result.files + val renamedFiles = files.mapIndexed { index, file -> + val indexSuffix = if (files.size == 1) "" else "_${index + 1}" + val newFile = File(file.parentFile, "${base}${indexSuffix}.jpg") if (newFile.exists()) newFile.delete() file.renameTo(newFile) newFile