重构代码

oldrev · Feb 6, 2017 · 9b6b13c · 9b6b13c
1 parent 773f0e0
commit 9b6b13c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/Sandwych.Reporting.Test/OpenDocument/OdtTemplateTest.cs b/Sandwych.Reporting.Test/OpenDocument/OdtTemplateTest.cs
@@ -114,8 +114,9 @@ public void TestStatements()
         [Test]
         public void UseImageShouldBeOk()
         {
+            var image1Path = TemplateTestHelper.GetTestResourceAbsolutleFilePath("resources/go-home.PNG");
             var ctx = new Dictionary<string, object>() {
-                { "image1", new Image("png", File.ReadAllBytes("resources/go-home.PNG")) },
+                { "image1", new Image("png", File.ReadAllBytes(image1Path)) },
             };
 
             var result = OdfTemplateTestHelper.RenderTemplate(

diff --git a/Sandwych.Reporting/OpenDocument/OdfTemplate.cs b/Sandwych.Reporting/OpenDocument/OdfTemplate.cs
@@ -65,24 +65,20 @@ public override void Save(Stream outStream)
                 throw new ArgumentNullException("outStream");
             }
 
-            //ODF 格式约定 mimetype 必须为第一个文件
+            //ODF 格式约定 mimetype 必须为 ZIP 包里的第一个文件
             if (!this.entries.ContainsKey(MimeTypeEntryPath))
             {
                 throw new InvalidDataException("Entry 'mimetype' not found");
             }
 
-            using (var ze = new ZipArchive(outStream, ZipArchiveMode.Create))
+            using (var zip = new ZipArchive(outStream, ZipArchiveMode.Create))
             {
-                this.AppendZipEntry(ze, MimeTypeEntryPath);
+                this.AppendZipEntry(zip, MimeTypeEntryPath);
+                this.entries.Remove(MimeTypeEntryPath);
 
                 foreach (var item in this.entries)
                 {
-                    if (item.Key == MimeTypeEntryPath)
-                    {
-                        continue;
-                    }
-
-                    this.AppendZipEntry(ze, item.Key);
+                    this.AppendZipEntry(zip, item.Key);
                 }
             }
         }
@@ -102,11 +98,13 @@ private void AppendZipEntry(ZipArchive archive, string name)
                 case "JPEG":
                 case "JPG":
                 case "PNG":
+                case "MP3":
+                case "MP4":
                     cl = CompressionLevel.NoCompression;
                     break;
 
                 default:
-                    cl = CompressionLevel.Optimal;
+                    cl = CompressionLevel.Fastest;
                     break;
             }
             var zae = archive.CreateEntry(name, cl);