Merge pull request #2 from multiprogramm/multiprogramm/1/NationalSymbols

Поддержка национальных символов
multiprogramm · Feb 8, 2022 · 0d15e26 · 0d15e26
2 parents 0e36665 + ee76f6c
commit 0d15e26
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/ListDownloader/App.config b/ListDownloader/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <uri>
+    <idn enabled="All"/>
+  </uri>
+</configuration>
diff --git a/ListDownloader/Download/Downloader.cs b/ListDownloader/Download/Downloader.cs
@@ -104,7 +104,8 @@ void Download()
 		/// </summary>
 		void DownloadSafe()
 		{
-			WebRequest request = WebRequest.Create( mInfo.mUrl );
+			string url = new Uri( mInfo.mUrl ).AbsoluteUri;
+			WebRequest request = WebRequest.Create( url );
 			using( WebResponse response = request.GetResponse() )
 			{
 				string filePathAfterLoad = ResultPathCalc( response );

diff --git a/ListDownloader/ListDownloader.csproj b/ListDownloader/ListDownloader.csproj
@@ -85,6 +85,9 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/ListDownloader/Main/Program.cs b/ListDownloader/Main/Program.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 
 namespace ListDownloader
 {
@@ -17,6 +18,11 @@ static int Main( string[] args )
 			int result = 0;
 			try
 			{
+				ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3
+					| SecurityProtocolType.Tls
+					| SecurityProtocolType.Tls11
+					| SecurityProtocolType.Tls12;
+
 				Options options = new Options( args );
 				Worker worker = new Worker( options );
 				worker.Run();

diff --git a/ListDownloader/Properties/AssemblyInfo.cs b/ListDownloader/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("1.0.2.0")]