Added Ability to choose tabs in Excel files

Author: ArneD

src/UniqueFileRecordsComparer/UniqueFileRecordsComparer.App/ComparerArguments.cs

@@ -4,5 +4,8 @@ public class ComparerArguments
     {
         public string SourceFilePath { get; set; }
         public string TargetFilePath { get; set; }
+
+        public int SourceFileTabIndex { get; set; }
+        public int TargetFileTabIndex { get; set; }
     }
 }

src/UniqueFileRecordsComparer/UniqueFileRecordsComparer.App/SelectColumnsForm.cs

@@ -22,8 +22,8 @@ public SelectColumnsForm(ComparerArguments comparerArguments)
             var targetReader =
                 FileReaderFactory.CreateFromFileName(new FileInfoWrapper(new FileInfo(comparerArguments.TargetFilePath)));
 
-            _sourceRowCollection = sourceReader.Read();
-            _targetRowCollection = targetReader.Read();
+            _sourceRowCollection = sourceReader.Read(comparerArguments.SourceFileTabIndex);
+            _targetRowCollection = targetReader.Read(comparerArguments.TargetFileTabIndex);
 
             AddColumnsToCheckList(SourceColumnsCheckList, _sourceRowCollection);
             AddColumnsToCheckList(TargetColumnsCheckList, _targetRowCollection);

src/UniqueFileRecordsComparer/UniqueFileRecordsComparer.App/SelectFilesForm.Designer.cs

@@ -1,5 +1,9 @@
 using System;
+using System.IO;
+using System.IO.Abstractions;
+using System.Linq;
 using System.Windows.Forms;
+using UniqueFileRecordsComparer.Core.Readers;
 
 namespace UniqueFileRecordsComparer.App
 {
@@ -17,12 +21,33 @@ private void ChooseSourceFileButton_Click(object sender, EventArgs e)
         {
             _comparerArguments.SourceFilePath = GetFilePathFromDialog();
             SourceFilePathLabel.Text = _comparerArguments.SourceFilePath;
+
+            FillTabs(SourceFileTabsDropDown, _comparerArguments.SourceFilePath);
         }
 
         private void ChooseTargetFileButton_Click(object sender, EventArgs e)
         {
             _comparerArguments.TargetFilePath = GetFilePathFromDialog();
             TargetFilePathLabel.Text = _comparerArguments.TargetFilePath;
+
+            FillTabs(TargetFileTabsDropDown, _comparerArguments.TargetFilePath);
+        }
+
+        private void FillTabs(ComboBox fileTabsDropDown, string path)
+        {
+            fileTabsDropDown.Items.Clear();
+            fileTabsDropDown.Enabled = false;
+
+            var fileReader = FileReaderFactory.CreateFromFileName(new FileInfoWrapper(new FileInfo(path)));
+            if (fileReader.GetTabNamesByIndex().Keys.Count > 1)
+            {
+                foreach (var tab in fileReader.GetTabNamesByIndex())
+                {
+                    fileTabsDropDown.Items.Insert(tab.Key, tab.Value);
+                }
+                fileTabsDropDown.Enabled = true;
+                fileTabsDropDown.SelectedIndex = 0;
+            }
         }
 
         private static string GetFilePathFromDialog()
@@ -34,7 +59,7 @@ private static string GetFilePathFromDialog()
                 dialog.Filter = @"Data file |*.csv;*.xlsx";
 
                 var result = dialog.ShowDialog();
-                
+
                 if(result == DialogResult.OK)
                     return dialog.FileName;
             }
@@ -45,6 +70,9 @@ private void NextButton_Click(object sender, EventArgs e)
         {
             if (IsFormValid())
             {
+                _comparerArguments.SourceFileTabIndex = SourceFileTabsDropDown.SelectedIndex;
+                _comparerArguments.TargetFileTabIndex = TargetFileTabsDropDown.SelectedIndex;
+
                 var selectColumnsForm = new SelectColumnsForm(_comparerArguments);
                 selectColumnsForm.Show();
                 Hide();
@@ -57,7 +85,7 @@ private void NextButton_Click(object sender, EventArgs e)
 
         private bool IsFormValid()
         {
-            return !string.IsNullOrEmpty(_comparerArguments.SourceFilePath) && 
+            return !string.IsNullOrEmpty(_comparerArguments.SourceFilePath) &&
                    !string.IsNullOrEmpty(_comparerArguments.TargetFilePath);
         }
     }

src/UniqueFileRecordsComparer/UniqueFileRecordsComparer.App/SelectFilesForm.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Abstractions;
@@ -17,12 +18,17 @@ public CsvReader(FileInfoBase fileInfo)
             _fileInfo = fileInfo;
         }
 
-        public RowCollection Read()
+        public RowCollection Read(int? tabIndex)
         {
             IList<Row> rows = ReadCsv().ToList();
             return new RowCollection(rows);
         }
 
+        public IDictionary<int, string> GetTabNamesByIndex()
+        {
+            return new Dictionary<int, string>();
+        }
+
         private IEnumerable<Row> ReadCsv()
         {
             using (var reader = CreateCsvReader())

src/UniqueFileRecordsComparer/UniqueFileRecordsComparer.Core/Readers/CsvReader.cs

@@ -16,28 +16,41 @@ public ExcelReader(FileInfoBase fileInfo)
             _fileInfo = fileInfo;
         }
 
-        public RowCollection Read()
+        public RowCollection Read(int? tabIndex)
         {
-            return new RowCollection(ExtractDataSet().ToList());
+            return new RowCollection(ExtractDataSet(tabIndex ?? 0).ToList());
         }
 
-        private IEnumerable<Row> ExtractDataSet()
+        public IDictionary<int, string> GetTabNamesByIndex()
+        {
+            var dictionary = new Dictionary<int, string>();
+            int index = 0;
+            using (var excelReader = ExcelReaderFactory.CreateOpenXmlReader(_fileInfo.OpenRead()))
+            {
+                foreach (DataTable table in excelReader.AsDataSet().Tables)
+                {
+                    dictionary.Add(index++, table.TableName);
+                }
+            }
+
+            return dictionary;
+        }
+
+        private IEnumerable<Row> ExtractDataSet(int tabIndex)
         {
             using (var excelReader = ExcelReaderFactory.CreateOpenXmlReader(_fileInfo.Open(FileMode.Open, FileAccess.Read)))
             {
                 excelReader.IsFirstRowAsColumnNames = true;
-                using (var result = excelReader.AsDataSet())
+                using (var table = excelReader.AsDataSet().Tables[tabIndex])
                 {
-                    return GetRows(result);
+                    return GetRows(table);
                 }
             }
         }
 
-        private static IEnumerable<Row> GetRows(DataSet result)
+        private IEnumerable<Row> GetRows(DataTable table)
         {
-            var dataTable = result.Tables[0];
-
-            return dataTable
+            return table
                     .Rows
                     .Cast<DataRow>()
                     .Select(GetRow);

src/UniqueFileRecordsComparer/UniqueFileRecordsComparer.Core/Readers/ExcelReader.cs

@@ -1,7 +1,10 @@
+using System.Collections.Generic;
+
 namespace UniqueFileRecordsComparer.Core.Readers
 {
     public interface IFileReader
     {
-        RowCollection Read();
+        RowCollection Read(int? tabIndex);
+        IDictionary<int, string> GetTabNamesByIndex();
     }
 }

src/UniqueFileRecordsComparer/UniqueFileRecordsComparer.Core/Readers/IFileReader.cs

@@ -65,7 +65,7 @@ private static RowCollection ReadRowCollection(string path)
         {
             var reader = FileReaderFactory.CreateFromFileName(new FileInfoWrapper(new FileInfo(path)));
 
-            return reader.Read();
+            return reader.Read(0);
         }
 
         private static void CheckFilesExist()

src/UniqueFileRecordsComparer/_NCrunch_UniqueFileRecordsComparer/UniqueFileRecordsComparer.crunchsolution.cache

@@ -67,7 +67,7 @@ public void Then_returns_the_expected_result()
                 }
             };
 
-            var result = FileReaderFactory.CreateFromFileName(new FileInfoWrapper(new FileInfo(CsvFilePath))).Read();
+            var result = FileReaderFactory.CreateFromFileName(new FileInfoWrapper(new FileInfo(CsvFilePath))).Read(0);
 
             result.ShouldAllBeEquivalentTo(expectedResult);
         }