Update Magicodes.IE.Tools

dotnetcore · Oct 20, 2023 · 79e8e09 · 79e8e09
1 parent 08455fd
commit 79e8e09
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 31 deletions.
diff --git a/src/Magicodes.ExporterAndImporter.Tests/ExcelExporter_Tests.cs b/src/Magicodes.ExporterAndImporter.Tests/ExcelExporter_Tests.cs
@@ -1021,7 +1021,7 @@ public async Task AttrExportWithColFontColorData_Test()
             }
         }
 
-        [Fact(DisplayName = "Linux环境时导出JPG图片到Excel的测试", Timeout = 10000)]
+        [Fact(DisplayName = "Linux环境时导出JPG图片到Excel的测试", Timeout = 100000)]
         public async Task ExportWithJPG_Test()
         {
             var imagePath = Path.Combine(Directory.GetCurrentDirectory(), "TestFiles", "Images", "zero-DPI.Jpeg");

diff --git a/src/Magicodes.IE.Tools/Magicodes.IE.Tools.csproj b/src/Magicodes.IE.Tools/Magicodes.IE.Tools.csproj
@@ -32,10 +32,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.2" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.6" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Magicodes.ExporterAndImporter.Excel\Magicodes.IE.Excel.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <None Update="zero-DPI.Jpeg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/src/Magicodes.IE.Tools/Program.cs b/src/Magicodes.IE.Tools/Program.cs
@@ -8,6 +8,7 @@
 using Magicodes.Benchmarks.Models;
 using System.Threading.Tasks;
 using Magicodes.ExporterAndImporter.Excel.Utility;
+using System.Dynamic;
 
 namespace Magicodes.IE.Tools
 {
@@ -16,45 +17,44 @@ internal class Program
         private readonly static List<ExportTestDataWithAttrs> _exportTestData = new List<ExportTestDataWithAttrs>();
         private static async Task Main(string[] args)
         {
-            args = new string[] { "TEST" };
-            //if (args.Length == 0)
-            //{
-            //    var versionString = Assembly.GetEntryAssembly()
-            //                            .GetCustomAttribute<AssemblyInformationalVersionAttribute>()
-            //                            .InformationalVersion
-            //                            .ToString();
+            if (args.Length == 0)
+            {
+                var versionString = Assembly.GetEntryAssembly()
+                                        .GetCustomAttribute<AssemblyInformationalVersionAttribute>()
+                                        .InformationalVersion
+                                        .ToString();
 
-            //    Console.WriteLine($"mie v{versionString}");
-            //    Console.WriteLine("-------------");
-            //    Console.WriteLine("\nGithub:");
-            //    Console.WriteLine("  https://github.com/dotnetcore/Magicodes.IE");
-            //    return;
-            //}
-            //else if (args.Any(p => "TEST".Equals(p, StringComparison.CurrentCultureIgnoreCase)))
-            //{
-            IExporter exporter = new ExcelExporter();
-            var data = new List<ExportTestDataWithPicture>
+                Console.WriteLine($"mie v{versionString}");
+                Console.WriteLine("-------------");
+                Console.WriteLine("\nGithub:");
+                Console.WriteLine("  https://github.com/dotnetcore/Magicodes.IE");
+                return;
+            }
+            else if (args.Any(p => "TEST".Equals(p, StringComparison.CurrentCultureIgnoreCase)))
+            {
+                ExcelExporter exporter = new ExcelExporter();
+                var data = new List<ExportTestDataWithPicture>
                 {
                     new ExportTestDataWithPicture
                     {
-                        Img = "C:\\Users\\hueifeng\\Pictures\\avatar.png",
-                        Text="张三"
+                        Img = Path.Combine(Directory.GetCurrentDirectory(), "zero-DPI.Jpeg"),
+                        Text ="张三"
                     }
                 };
 
-            Parallel.For(0, 100000, (i) =>
-            {
-                data.Add(new ExportTestDataWithPicture
+                Parallel.For(0, 10, (i) =>
                 {
-                    Img = "C:\\Users\\hueifeng\\Pictures\\avatar.png",
-                    Text = "张三"
+                    data.Add(new ExportTestDataWithPicture
+                    {
+                        Img = Path.Combine(Directory.GetCurrentDirectory(), "zero-DPI.Jpeg"),
+                        Text = "张三"
+                    });
                 });
-            });
 
-            var filePath = Path.Combine(System.IO.Directory.GetCurrentDirectory(), "test.xlsx");
-            var result = await exporter.Export("test.xlsx", data);
-            Console.WriteLine($"导出成功：{filePath}！");
-            //   }
+                var filePath = Path.Combine(System.IO.Directory.GetCurrentDirectory(), "test.xlsx");
+                var result = await exporter.Export("test.xlsx", data);
+                Console.WriteLine($"导出成功：{filePath}！");
+            }
             Console.WriteLine("完成");
             Console.ReadLine();
         }

diff --git a/src/Magicodes.IE.Tools/zero-DPI.Jpeg b/src/Magicodes.IE.Tools/zero-DPI.Jpeg