Merge pull request #14 from maxzh1999tw/develop

優化 workflow 的使用者體驗
maxzh1999tw · Apr 3, 2024 · 7b99897 · 7b99897
2 parents 2299f49 + a5d6449
commit 7b99897
Show file tree

Hide file tree

Showing 4 changed files with 138 additions and 93 deletions.
diff --git a/Excely.ClosedXML/Workflows/XlsxImporter.cs b/Excely.ClosedXML/Workflows/XlsxImporter.cs
@@ -3,27 +3,36 @@
 
 namespace Excely.Workflows
 {
-    /// <summary>
-    /// 提供快速建立從 Excel 到指定資料結構之 Importer 的方法。
-    /// </summary>
-    public class XlsxImporter : ExcelyImporterBase<IXLWorksheet>
-    {
-        protected XlsxTableFactory XlsxTableFactory { get; set; } = new XlsxTableFactory();
+	/// <summary>
+	/// 提供快速建立從 Excel 到指定資料結構之 Importer 的方法。
+	/// </summary>
+	public class XlsxImporter : ExcelyImporterBase<IXLWorksheet>
+	{
+		protected XlsxTableFactory XlsxTableFactory { get; set; } = new XlsxTableFactory();
 
-        #region === 建構子 ==
-        public XlsxImporter() { }
+		#region === 建構子 ==
 
-        public XlsxImporter(CellLocation? startCell, CellLocation? endCell)
-        {
-            XlsxTableFactory = new XlsxTableFactory();
-            if (startCell != null)
-            {
-                XlsxTableFactory.StartCell = startCell.Value;
-            }
-            XlsxTableFactory.EndCell = endCell;
-        }
-        #endregion
+		public XlsxImporter()
+		{ }
 
-        protected override ExcelyTable GetTable(IXLWorksheet input) => XlsxTableFactory.GetTable(input);
-    }
-}
+		public XlsxImporter(CellLocation? startCell, CellLocation? endCell)
+		{
+			XlsxTableFactory = new XlsxTableFactory();
+			if (startCell != null)
+			{
+				XlsxTableFactory.StartCell = startCell.Value;
+			}
+			XlsxTableFactory.EndCell = endCell;
+		}
+
+		#endregion === 建構子 ==
+
+		protected override ExcelyTable GetTable(IXLWorksheet input) => XlsxTableFactory.GetTable(input);
+
+		protected override IXLWorksheet GetDataSource(string filePath)
+		{
+			var workbook = new XLWorkbook(filePath);
+			return workbook.Worksheet(0);
+		}
+	}
+}
diff --git a/Excely.EPPlus.LGPL/Workflows/XlsxImporter.cs b/Excely.EPPlus.LGPL/Workflows/XlsxImporter.cs
@@ -3,27 +3,36 @@
 
 namespace Excely.Workflows
 {
-    /// <summary>
-    /// 提供快速建立從 Excel 到指定資料結構之 Importer 的方法。
-    /// </summary>
-    public class XlsxImporter : ExcelyImporterBase<ExcelWorksheet>
-    {
-        protected XlsxTableFactory XlsxTableFactory { get; set; } = new XlsxTableFactory();
+	/// <summary>
+	/// 提供快速建立從 Excel 到指定資料結構之 Importer 的方法。
+	/// </summary>
+	public class XlsxImporter : ExcelyImporterBase<ExcelWorksheet>
+	{
+		protected XlsxTableFactory XlsxTableFactory { get; set; } = new XlsxTableFactory();
 
-        #region === 建構子 ==
-        public XlsxImporter() { }
+		#region === 建構子 ==
 
-        public XlsxImporter(CellLocation? startCell, CellLocation? endCell)
-        {
-            XlsxTableFactory = new XlsxTableFactory();
-            if (startCell != null)
-            {
-                XlsxTableFactory.StartCell = startCell.Value;
-            }
-            XlsxTableFactory.EndCell = endCell;
-        }
-        #endregion
+		public XlsxImporter()
+		{ }
 
-        protected override ExcelyTable GetTable(ExcelWorksheet input) => XlsxTableFactory.GetTable(input);
-    }
-}
+		public XlsxImporter(CellLocation? startCell, CellLocation? endCell)
+		{
+			XlsxTableFactory = new XlsxTableFactory();
+			if (startCell != null)
+			{
+				XlsxTableFactory.StartCell = startCell.Value;
+			}
+			XlsxTableFactory.EndCell = endCell;
+		}
+
+		#endregion === 建構子 ==
+
+		protected override ExcelyTable GetTable(ExcelWorksheet input) => XlsxTableFactory.GetTable(input);
+
+		protected override ExcelWorksheet GetDataSource(string filePath)
+		{
+			var package = new ExcelPackage(new FileInfo(filePath));
+			return package.Workbook.Worksheets[0];
+		}
+	}
+}
diff --git a/Excely/Workflows/CsvStringImporter.cs b/Excely/Workflows/CsvStringImporter.cs
@@ -2,17 +2,26 @@
 
 namespace Excely.Workflows
 {
-    /// <summary>
-    /// 以 Csv 字串為來源資料的 Importer。
-    /// </summary>
-    public class CsvStringImporter : ExcelyImporterBase<string>
-    {
-        protected CsvStringTableFactory CsvTableFactory { get; set; } = new();
+	/// <summary>
+	/// 以 Csv 字串為來源資料的 Importer。
+	/// </summary>
+	public class CsvStringImporter : ExcelyImporterBase<string>
+	{
+		protected CsvStringTableFactory CsvTableFactory { get; set; } = new();
 
-        #region === 建構子 ==
-        public CsvStringImporter() { }
-        #endregion
+		#region === 建構子 ==
 
-        protected override ExcelyTable GetTable(string input) => CsvTableFactory.GetTable(input);
-    }
-}
+		public CsvStringImporter()
+		{ }
+
+		#endregion === 建構子 ==
+
+		protected override ExcelyTable GetTable(string input) => CsvTableFactory.GetTable(input);
+
+		protected override string GetDataSource(string filePath)
+		{
+			using var streamReader = new StreamReader(filePath);
+			return streamReader.ReadToEnd();
+		}
+	}
+}
diff --git a/Excely/Workflows/ExcelyImporterBase.cs b/Excely/Workflows/ExcelyImporterBase.cs
@@ -2,45 +2,63 @@
 
 namespace Excely.Workflows
 {
-    /// <summary>
-    /// 提供從資料輸入到轉換為資料結構的完整工作流程之基底類別。
-    /// </summary>
-    /// <typeparam name="TInput">資料的輸入型別</typeparam>
-    public abstract class ExcelyImporterBase<TInput>
-    {
-        protected abstract ExcelyTable GetTable(TInput input);
+	/// <summary>
+	/// 提供從資料輸入到轉換為資料結構的完整工作流程之基底類別。
+	/// </summary>
+	/// <typeparam name="TInput">資料的輸入型別</typeparam>
+	public abstract class ExcelyImporterBase<TInput>
+	{
+		protected abstract ExcelyTable GetTable(TInput input);
 
-        /// <summary>
-        /// 將資料匯入為物件列表。
-        /// </summary>
-        /// <typeparam name="TClass">目標類別</typeparam>
-        /// <param name="dataSource">資料來源</param>
-        /// <param name="options">匯入邏輯</param>
-        /// <returns>匯入結果</returns>
-        public IEnumerable<TClass> ToClassList<TClass>(
-            TInput dataSource,
-            ClassListTableConverterOptions<TClass>? options = null)
-            where TClass : class, new()
-        {
-            var table = GetTable(dataSource);
-            var converter = options == null ? new ClassListTableConverter<TClass>() : new ClassListTableConverter<TClass>(options);
-            return converter.ConvertFrom(table);
-        }
+		/// <summary>
+		/// 將資料匯入為物件列表。
+		/// </summary>
+		/// <typeparam name="TClass">目標類別</typeparam>
+		/// <param name="dataSource">資料來源</param>
+		/// <param name="options">匯入邏輯</param>
+		/// <returns>匯入結果</returns>
+		public IEnumerable<TClass> ToClassList<TClass>(
+			TInput dataSource,
+			ClassListTableConverterOptions<TClass>? options = null)
+			where TClass : class, new()
+		{
+			var table = GetTable(dataSource);
+			var converter = options == null ? new ClassListTableConverter<TClass>() : new ClassListTableConverter<TClass>(options);
+			return converter.ConvertFrom(table);
+		}
 
-        /// <summary>
-        /// 將資料匯入為字典列表。
-        /// </summary>=
-        /// <param name="dataSource">資料來源</param>
-        /// <param name="options">匯入邏輯</param>
-        /// <returns>匯入結果</returns>
-        public IEnumerable<Dictionary<string, object?>> ToDictionaryList(
-            TInput dataSource,
-            DictionaryListTableConverterOptions? options = null)
-        {
-            var table = GetTable(dataSource);
-            var converter = options == null ? new DictionaryListTableConverter() : new DictionaryListTableConverter(options);
-            return converter.ConvertFrom(table);
-        }
-    }
-}
+		/// <summary>
+		/// 將資料匯入為字典列表。
+		/// </summary>=
+		/// <param name="dataSource">資料來源</param>
+		/// <param name="options">匯入邏輯</param>
+		/// <returns>匯入結果</returns>
+		public IEnumerable<Dictionary<string, object?>> ToDictionaryList(
+			TInput dataSource,
+			DictionaryListTableConverterOptions? options = null)
+		{
+			var table = GetTable(dataSource);
+			var converter = options == null ? new DictionaryListTableConverter() : new DictionaryListTableConverter(options);
+			return converter.ConvertFrom(table);
+		}
 
+		protected abstract TInput GetDataSource(string filePath);
+
+		public IEnumerable<TClass> ToClassList<TClass>(
+			string filePath,
+			ClassListTableConverterOptions<TClass>? options = null)
+			where TClass : class, new()
+		{
+			var dataSource = GetDataSource(filePath);
+			return ToClassList(dataSource, options);
+		}
+
+		public IEnumerable<Dictionary<string, object?>> ToDictionaryList(
+			string filePath,
+			DictionaryListTableConverterOptions? options = null)
+		{
+			var dataSource = GetDataSource(filePath);
+			return ToDictionaryList(dataSource, options);
+		}
+	}
+}