APFirmware: use httpclient

srtm: useragent check
avrem · Feb 1, 2020 · bb0176c · bb0176c
1 parent 1ee02bb
commit bb0176c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/ExtLibs/ArduPilot/APFirmware.cs b/ExtLibs/ArduPilot/APFirmware.cs
@@ -5,8 +5,10 @@
 using System.IO.Compression;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Text.RegularExpressions;
 using log4net;
+using MissionPlanner.Utilities;
 
 namespace MissionPlanner.ArduPilot
 {
@@ -110,7 +112,12 @@ public static void GetList(string url = "https://firmware.ardupilot.org/manifest
 
             log.Info(url);
 
-            var manifestgz = new WebClient().DownloadData(url);
+            var client = new HttpClient();
+
+            if (!String.IsNullOrEmpty(Settings.Instance.UserAgent))
+                client.DefaultRequestHeaders.Add("User-Agent", Settings.Instance.UserAgent);
+
+            var manifestgz = client.GetByteArrayAsync(url).GetAwaiter().GetResult();
             var mssrc = new MemoryStream(manifestgz);
             var msdest = new MemoryStream();
             GZipStream gz = new GZipStream(mssrc, CompressionMode.Decompress);

diff --git a/ExtLibs/Utilities/Download.cs b/ExtLibs/Utilities/Download.cs
@@ -20,7 +20,7 @@ public class DownloadStream : Stream
         string _uri = "";
         public int chunksize { get; set; } = 1000 * 250;
 
-        static HttpClient client = new HttpClient();
+        HttpClient client = new HttpClient();
 
         private static object _lock = new object();
         /// <summary>
@@ -73,13 +73,14 @@ static void expireCache()
 
         private static Timer _timer;
 
-        static DownloadStream()
+        internal DownloadStream()
         {
             _timer = new Timer(a => { expireCache(); }, null, 1000 * 30, 1000 * 30);
-            client.DefaultRequestHeaders.Add("User-Agent", Settings.Instance.UserAgent);
+            if (!String.IsNullOrEmpty(Settings.Instance.UserAgent))
+                client.DefaultRequestHeaders.Add("User-Agent", Settings.Instance.UserAgent);
         }
 
-        public DownloadStream(string uri)
+        public DownloadStream(string uri): this()
         {
             _uri = uri;
             SetLength(Download.GetFileSize(uri));
@@ -374,7 +375,8 @@ public static async Task<bool> getFilefromNetAsync(string url, string saveto, Ac
 
         static Download()
         {
-            client.DefaultRequestHeaders.Add("User-Agent", Settings.Instance.UserAgent);
+            if (!String.IsNullOrEmpty(Settings.Instance.UserAgent))
+                client.DefaultRequestHeaders.Add("User-Agent", Settings.Instance.UserAgent);
         }
 
         static HttpClient client = new HttpClient();

diff --git a/ExtLibs/Utilities/ParameterMetaDataParser.cs b/ExtLibs/Utilities/ParameterMetaDataParser.cs
@@ -49,7 +49,8 @@ public static class ParameterMetaDataParser
         public static void GetParameterInformation(string urls, string file = null)
         {
             httpClient = new HttpClient();
-            httpClient.DefaultRequestHeaders.Add("User-Agent", Settings.Instance.UserAgent);
+            if (!String.IsNullOrEmpty(Settings.Instance.UserAgent))
+                httpClient.DefaultRequestHeaders.Add("User-Agent", Settings.Instance.UserAgent);
             httpClient.Timeout = TimeSpan.FromSeconds(30);
 
             var parameterLocationsString = urls;

diff --git a/ExtLibs/Utilities/srtm.cs b/ExtLibs/Utilities/srtm.cs
@@ -81,7 +81,8 @@ static srtm()
                 }
             }
 
-            client.DefaultRequestHeaders.Add("User-Agent", Settings.Instance.UserAgent);
+            if (!String.IsNullOrEmpty(Settings.Instance.UserAgent))
+                client.DefaultRequestHeaders.Add("User-Agent", Settings.Instance.UserAgent);
 
             StartQueueProcess();
         }