When only one file is present in container, autoselect this one

RNoeldner · Jun 26, 2023 · 7fa35bf · 7fa35bf
1 parent 953babc
commit 7fa35bf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/Application/FormEditSettings.cs b/Application/FormEditSettings.cs
@@ -132,6 +132,8 @@ private async void BtnOpenFile_Click(object? sender, EventArgs e)
             m_ViewSettings.FillGuessSettings,
             list =>
             {
+              if (list.Count==1)
+                return list.First();
               using var frm = new FormSelectInDropdown(list, list.First(x => x.AssumeDelimited()));
               if (frm.ShowWithFont(this, true) == DialogResult.Cancel)
                 throw new OperationCanceledException();

diff --git a/Application/FormMain.cs b/Application/FormMain.cs
@@ -229,10 +229,12 @@ public async Task LoadCsvOrZipFileAsync(string fileName, CancellationToken cance
           m_ViewSettings.GuessHasHeader, m_ViewSettings.GuessNewLine, m_ViewSettings.GuessComment,
           m_ViewSettings.FillGuessSettings, list =>
           {
-           using var frm = new FormSelectInDropdown(list, list.First(x => x.AssumeDelimited()));
-              if (frm.ShowWithFont(this, true) == DialogResult.Cancel)
-                throw new OperationCanceledException();
-              return frm.SelectedText;
+            if (list.Count==1)
+              return list.First();
+            using var frm = new FormSelectInDropdown(list, list.First(x => x.AssumeDelimited()));
+            if (frm.ShowWithFont(this, true) == DialogResult.Cancel)
+              throw new OperationCanceledException();
+            return frm.SelectedText;
           }, m_ViewSettings.DefaultInspectionResult,
           PgpHelper.GetKeyAndValidate(fileName, m_ViewSettings.KeyFileRead), cancellationToken);
 

diff --git a/Library/ClassLibraryCSV/CsvHelper.cs b/Library/ClassLibraryCSV/CsvHelper.cs
@@ -273,7 +273,7 @@ public static IEnumerable<ZipEntry> GetFilesInZip(this ZipFile archive)
       bool guessCodePage, bool guessEscapePrefix,
       bool guessDelimiter, bool guessQualifier, bool guessStartRow,
       bool guessHasHeader, bool guessNewLine, bool guessCommentLine,
-      FillGuessSettings fillGuessSettings, Func<IEnumerable<string>, string>? selectFile,
+      FillGuessSettings fillGuessSettings, Func<IReadOnlyCollection<string>, string>? selectFile,
       InspectionResult defaultInspectionResult
 #if SupportPGP
       , string privateKey
@@ -357,7 +357,7 @@ InspectionResult defaultInspectionResult
           return setting;
         }
         using var zipFile = new ZipFile(fileName2);
-        var list = zipFile.GetFilesInZip().OrderByDescending(x => x.Name.AssumeDelimited()).ThenByDescending(x => x.Size).Select(x => $"{x.Name}");
+        var list = zipFile.GetFilesInZip().OrderByDescending(x => x.Name.AssumeDelimited()).ThenByDescending(x => x.Size).Select(x => $"{x.Name}").ToList();
         selectedFile = selectFile?.Invoke(list) ?? list.First();
       }