Fixed get content disposition filename of issue #23

bezzad · Dec 6, 2020 · b419fe2 · b419fe2
1 parent d6fd813
commit b419fe2
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 14 deletions.
diff --git a/src/Downloader.Sample/DownloadList.json b/src/Downloader.Sample/DownloadList.json
@@ -2,7 +2,7 @@
   //{ "FileName": "D:\\TestDownload\\H2017.06.06.0000.0001a.patch", "Url": "http://patch-dl.ffxiv.com/game/4e9a232b/H2017.06.06.0000.0001a.patch" },
   //{ "FileName": "D:\\TestDownload\\2020.rar", "Url": "http://test.download.pokecity.club/2020.rar" },
   //{ "FileName": "D:\\TestDownload\\test.pdf", "Url": "https://download.taaghche.com/download/kaaurZ7Rj7yQQrd4P7MWwUqtTInMypDA" },
-  { "FolderPath": "D:\\TestDownload", "Url": "https://raw.githubusercontent.com/bezzad/Downloader/master/src/Downloader.Test/Assets/excel_sample.xls?test=1" },
+  //{ "FolderPath": "D:\\TestDownload", "Url": "https://raw.githubusercontent.com/bezzad/Downloader/master/src/Downloader.Test/Assets/excel_sample.xls?test=1" },
   { "FolderPath": "D:\\TestDownload", "Url": "https://5743-zanjan.medu.ir/portal/fileLoader.php?code=0a1c53101df0e93134a7771606813229" },
   { "FolderPath": "D:\\TestDownload", "Url": "http://ipv4.download.thinkbroadband.com/100MB.zip" }
 ]
diff --git a/src/Downloader.Test/RequestTest.cs b/src/Downloader.Test/RequestTest.cs
@@ -1,5 +1,5 @@
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Text;
 
 namespace Downloader.Test
 {
@@ -22,6 +22,25 @@ public void GetFileNameTest()
             Assert.AreEqual(new Request("http://www.a.com/a/b/c/d/e/").GetFileName(), "");                         // ""
         }
 
+        [TestMethod]
+        public void GetUrlDispositionFilenameAsyncTest()
+        {
+            Assert.IsNull(new Request("").GetUrlDispositionFilenameAsync().Result);
+            Assert.IsNull(new Request("test").GetUrlDispositionFilenameAsync().Result);
+            Assert.IsNull(new Request("test.xml").GetUrlDispositionFilenameAsync().Result);
+            Assert.IsNull(new Request("/test.xml").GetUrlDispositionFilenameAsync().Result);
+            Assert.IsNull(new Request("/test.xml?q=1").GetUrlDispositionFilenameAsync().Result);
+            Assert.IsNull(new Request("/test.xml?q=1&x=3").GetUrlDispositionFilenameAsync().Result);
+            Assert.IsNull(new Request("test.xml?q=1&x=3").GetUrlDispositionFilenameAsync().Result);
+            Assert.IsNull(new Request("http://www.a.com/test.xml?q=1&x=3").GetUrlDispositionFilenameAsync().Result);
+            Assert.IsNull(new Request("http://www.a.com/test.xml?q=1&x=3#aidjsf").GetUrlDispositionFilenameAsync().Result);
+            Assert.IsNull(new Request("http://www.a.com/a/b/c/d").GetUrlDispositionFilenameAsync().Result);
+            Assert.IsNull(new Request("http://www.a.com/a/b/c/d/e/").GetUrlDispositionFilenameAsync().Result);
+            Assert.IsNull(new Request("https://raw.githubusercontent.com/bezzad/Downloader/master/src/Downloader.Test/Assets/excel_sample.xls?test=1").GetUrlDispositionFilenameAsync().Result);
+            Assert.AreEqual("مسابقه‌ی ایده‌ی کسب و کار دانش‌آموزی در ایام کرونا کلیه‌ی مدارس دوره‌ی دوم متوسطه.rar",
+                new Request("https://5743-zanjan.medu.ir/portal/fileLoader.php?code=0a1c53101df0e93134a7771606813229").GetUrlDispositionFilenameAsync().Result);
+        }
+
         [TestMethod]
         public void GetFileSizeTest()
         {
@@ -32,5 +51,16 @@ public void GetFileSizeTest()
             Assert.AreEqual(DownloadTestHelper.FileSize10Mb, new Request(DownloadTestHelper.File10MbUrl).GetFileSize().Result);
             Assert.AreEqual(DownloadTestHelper.FileSize100Mb, new Request(DownloadTestHelper.File100MbUrl).GetFileSize().Result);
         }
+
+        [TestMethod]
+        public void ToUnicodeTest()
+        {
+            var requestInstance = new Request("");
+            var encodingLatin1 = Encoding.GetEncoding("iso-8859-1");
+            Assert.AreEqual("test1", requestInstance.ToUnicode(encodingLatin1.GetString(Encoding.UTF8.GetBytes("test1"))));
+            Assert.AreEqual("متن تستی.ext", requestInstance.ToUnicode(encodingLatin1.GetString(Encoding.UTF8.GetBytes("متن تستی.ext"))));
+            Assert.AreEqual("متن تستی.ext", requestInstance.ToUnicode(encodingLatin1.GetString(Encoding.UTF8.GetBytes("متن تستی.ext"))));
+            Assert.AreEqual("متن تستی1230456789.ext", requestInstance.ToUnicode(encodingLatin1.GetString(Encoding.UTF8.GetBytes("متن تستی1230456789.ext"))));
+        }
     }
 }
diff --git a/src/Downloader/DownloadService.cs b/src/Downloader/DownloadService.cs
@@ -51,7 +51,8 @@ public async Task DownloadFileAsync(string address, DirectoryInfo folder)
         {
             InitialBegin(address);
             folder.Create();
-            Package.FileName = Path.Combine(folder.FullName, RequestInstance.GetFileName());
+            var filename = await RequestInstance.GetUrlDispositionFilenameAsync() ?? RequestInstance.GetFileName();
+            Package.FileName = Path.Combine(folder.FullName, filename);
 
             await StartDownload();
         }

diff --git a/src/Downloader/Request.cs b/src/Downloader/Request.cs
@@ -1,9 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Text;
 using System.Threading.Tasks;
+using System.Web;
 
 namespace Downloader
 {
@@ -31,6 +34,7 @@ protected HttpWebRequest GetRequest(string method)
             var request = (HttpWebRequest)WebRequest.CreateDefault(Address);
             request.Timeout = -1;
             request.Method = method;
+            request.ContentType = "application/x-www-form-urlencoded;charset=utf-8;";
             request.Accept = Configuration.Accept;
             request.KeepAlive = Configuration.KeepAlive;
             request.AllowAutoRedirect = Configuration.AllowAutoRedirect;
@@ -64,7 +68,7 @@ protected async Task FetchResponseHeaders()
         {
             if (ResponseHeaders.Any())
                 return;
-         
+
             var response = await GetRequest().GetResponseAsync();
             if (response?.SupportsHeaders == true)
             {
@@ -90,15 +94,6 @@ public async Task<long> GetFileSize()
         }
         public string GetFileName()
         {
-            // await FetchResponseHeaders();
-            // var contentLengthKey = "Content-Length";
-            // if (ResponseHeaders.TryGetValue(contentLengthKey, out var contentLengthText))
-            // {
-            //     if (long.TryParse(contentLengthText, out var contentLength))
-            //     {
-            //         return contentLength;
-            //     }
-            // }
             var filename = Path.GetFileName(Address.LocalPath);
             var queryIndex = filename.IndexOf("?", StringComparison.Ordinal);
             if (queryIndex >= 0)
@@ -107,5 +102,48 @@ public string GetFileName()
             }
             return filename;
         }
+
+        public async Task<string> GetUrlDispositionFilenameAsync()
+        {
+            try
+            {
+                if (Address?.IsWellFormedOriginalString() == true
+                    && Address?.Segments.Length > 1)
+                {
+                    await FetchResponseHeaders();
+                    if (ResponseHeaders.TryGetValue(HeaderContentDispositionKey, out var disposition))
+                    {
+                        var unicodeDisposition = ToUnicode(disposition);
+                        if (string.IsNullOrWhiteSpace(unicodeDisposition) == false)
+                        {
+                            var filenameStartPointKey = "filename=";
+                            var dispositionParts = unicodeDisposition.Split(';');
+                            var filenamePart = dispositionParts.FirstOrDefault(part => part.Trim().StartsWith(filenameStartPointKey, StringComparison.OrdinalIgnoreCase));
+                            if (string.IsNullOrWhiteSpace(filenamePart) == false)
+                            {
+                                var filename = filenamePart.Replace(filenameStartPointKey, "")
+                                    .Replace("\"", "").Trim();
+
+                                return filename;
+                            }
+                        }
+                    }
+                }
+            }
+            catch (WebException e)
+            {
+                Debug.WriteLine(e);
+                // No matter in this point
+            }
+
+            return null;
+        }
+
+        public string ToUnicode(string otherEncodedText)
+        {
+            // decode 'latin-1' to 'utf-8'
+            var unicode = Encoding.UTF8.GetString(Encoding.GetEncoding("iso-8859-1").GetBytes(otherEncodedText));
+            return unicode;
+        }
     }
 }