Import load http async

openchargemap · Dec 7, 2023 · de41086 · de41086
1 parent 78bd0e6
commit de41086
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/Import/OCM.Import.Common/ImportManager.cs b/Import/OCM.Import.Common/ImportManager.cs
@@ -852,7 +852,7 @@ public async Task<ImportReport> PerformImport(ImportProcessSettings settings, AP
                 }
                 else if (p is ImportProvider_Sitronics)
                 {
-                    (p as ImportProvider_Sitronics).AuthHeaderValue = "Token openchargemapDkxXXliO4542YWQzY2M0NGQyCgn";
+                    (p as ImportProvider_Sitronics).AuthHeaderValue = "Token";
                 }
 
                 if (p.ImportInitialisationRequired && p is IImportProviderWithInit)
@@ -869,7 +869,7 @@ public async Task<ImportReport> PerformImport(ImportProcessSettings settings, AP
                 {
                     Log("Loading input data from URL..");
                     var sw = Stopwatch.StartNew();
-                    loadOK = provider.LoadInputFromURL(p.AutoRefreshURL);
+                    loadOK = await provider.LoadInputFromURL(p.AutoRefreshURL);
                     sw.Stop();
                     Log($"Data downloaded in {sw.Elapsed.TotalSeconds}s.");
                 }
@@ -879,7 +879,7 @@ public async Task<ImportReport> PerformImport(ImportProcessSettings settings, AP
                     {
                         Log("Loading input data from file..");
 
-                        loadOK = provider.LoadInputFromURL(p.InputPath);
+                        loadOK = await provider.LoadInputFromURL(p.InputPath);
                     }
                     else
                     {

diff --git a/Import/OCM.Import.Common/Providers/BaseImportProvider.cs b/Import/OCM.Import.Common/Providers/BaseImportProvider.cs
@@ -5,9 +5,11 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Net.Http;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 
 
 namespace OCM.Import.Providers
@@ -230,14 +232,15 @@ public string CalculateMD5Hash(string input)
             return sb.ToString();
         }
 
-        public bool LoadInputFromURL(string url)
+        public async Task<bool> LoadInputFromURL(string url)
         {
+            HttpClient client = new HttpClient();
             try
             {
                 if (String.IsNullOrEmpty(HTTPPostVariables))
                 {
                     //get
-                    InputData = webClient.DownloadString(url);
+                    InputData = await client.GetStringAsync(url);
                 }
                 else
                 {

diff --git a/Import/OCM.Import.Common/Providers/IImportProvider.cs b/Import/OCM.Import.Common/Providers/IImportProvider.cs
@@ -1,5 +1,6 @@
 using OCM.API.Common.Model;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace OCM.Import.Providers
 {
@@ -8,7 +9,7 @@ public interface IImportProvider
         string GetProviderName();
         List<ChargePoint> Process(CoreReferenceData coreRefData);
 
-        bool LoadInputFromURL(string url);
+        Task<bool> LoadInputFromURL(string url);
     }
 
     public interface IImportProviderWithInit : IImportProvider