Fixed version number issue and added better error message for Github …

…API problems.
gw2-addon-loader · Sep 29, 2021 · ea81b46 · ea81b46
1 parent e57edc7
commit ea81b46
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 25 deletions.
diff --git a/application/GW2 Addon Manager/Backend/Addons/ApprovedList.cs b/application/GW2 Addon Manager/Backend/Addons/ApprovedList.cs
@@ -28,10 +28,9 @@ public ApprovedList(IConfigurationManager configManager)
         public void FetchListFromRepo()
         {
             const string tempFileName = "addonlist";
-            var client = new WebClient();
-            client.Headers.Add("User-Agent", "Gw2 Addon Manager");
+            var client = UpdateHelpers.GetClient();
 
-            var raw = client.DownloadString(RepoUrl + "/branches");
+            var raw = client.DownloadStringFromGithubAPI(RepoUrl + "/branches");
             var result = JsonConvert.DeserializeObject<BranchInfo[]>(raw);
             var master = result.Single(r => r.Name == "master").Commit.Sha;
 
@@ -43,9 +42,7 @@ public void FetchListFromRepo()
                 File.Delete(tempFileName);
 
             //fetching new version
-            client = new WebClient();
-            client.Headers.Add("User-Agent", "Gw2 Addon Manager");
-            client.DownloadFile(RepoUrl + "/zipball", tempFileName);
+            client.DownloadFileFromGithubAPI(RepoUrl + "/zipball", tempFileName);
             ZipFile.ExtractToDirectory(tempFileName, AddonFolder);
             var downloaded = Directory.EnumerateDirectories(AddonFolder).First();
             foreach (var entry in Directory.EnumerateFileSystemEntries(downloaded))

diff --git a/application/GW2 Addon Manager/Backend/Configuration/SelfUpdate.cs b/application/GW2 Addon Manager/Backend/Configuration/SelfUpdate.cs
@@ -52,8 +52,7 @@ public async Task downloadLatestRelease()
             viewModel.UpdateAvailable = $"{StaticText.Downloading} {latestInfo.tag_name}";
 
             Directory.CreateDirectory(update_folder);
-            WebClient client = new WebClient();
-            client.Headers.Add("User-Agent", "request");
+            var client = UpdateHelpers.GetClient();
             client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(selfUpdate_DownloadProgress);
             client.DownloadFileCompleted += new AsyncCompletedEventHandler(selfUpdate_DownloadCompleted);
             await client.DownloadFileTaskAsync(new System.Uri(downloadUrl), Path.Combine(update_folder, update_name));

diff --git a/application/GW2 Addon Manager/Backend/LoaderSetup/LoaderSetup.cs b/application/GW2 Addon Manager/Backend/LoaderSetup/LoaderSetup.cs
@@ -61,8 +61,7 @@ public async Task HandleLoaderUpdate()
         private async Task Download(string url)
         {
             viewModel.ProgBarLabel = "Downloading Addon Loader";
-            var client = new WebClient();
-            client.Headers.Add("User-Agent", "request");
+            var client = UpdateHelpers.GetClient();
 
             fileName = Path.Combine(Path.GetTempPath(), Path.GetFileName(url));
 

diff --git a/application/GW2 Addon Manager/Backend/Updating/GenericUpdater.cs b/application/GW2 Addon Manager/Backend/Updating/GenericUpdater.cs
@@ -57,8 +57,7 @@ public async Task Update()
         /// </summary>
         private async Task GitCheckUpdate()
         {
-            var client = new WebClient();
-            client.Headers.Add("User-Agent", "request");
+            var client = UpdateHelpers.GetClient();
 
             dynamic release_info = UpdateHelpers.GitReleaseInfo(addon_info.host_url);
             latestVersion = release_info.tag_name;
@@ -74,7 +73,7 @@ private async Task GitCheckUpdate()
 
         private async Task StandaloneCheckUpdate()
         {
-            var client = new WebClient();
+            var client = UpdateHelpers.GetClient();
             string downloadURL = addon_info.host_url;
 
             if (addon_info.version_url != null)

diff --git a/application/GW2 Addon Manager/Backend/Updating/UpdateHelpers.cs b/application/GW2 Addon Manager/Backend/Updating/UpdateHelpers.cs
@@ -7,26 +7,45 @@
 
 namespace GW2_Addon_Manager
 {
-    class UpdateHelpers
+    static class UpdateHelpers
     {
-        public static dynamic GitReleaseInfo(string gitUrl)
+        public static WebClient GetClient()
         {
             var client = new WebClient();
-            client.Headers.Add("User-Agent", "request");
-            try
-            {
-                string release_info_json = client.DownloadString(gitUrl);
-                return JsonConvert.DeserializeObject(release_info_json);
+            client.Headers.Add("User-Agent", "Gw2 Addon Manager");
+
+            return client;
+        }
 
+        public static string DownloadStringFromGithubAPI(this WebClient wc, string url)
+        {
+            try {
+                return wc.DownloadString(url);
             }
             catch (WebException)
             {
-                //TODO: Add this catch to API calls made at application startup as well
-                MessageBox.Show("Github Servers returned an error; please try again in a few minutes.", "Github API Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                SelfUpdate.startUpdater();
+                MessageBox.Show("Github servers returned an error; please try again in a few minutes.", "Github API Error", MessageBoxButton.OK, MessageBoxImage.Error);
                 Application.Current.Shutdown();
-                return null;
+                return "";
             }
+        }
+
+        public static void DownloadFileFromGithubAPI(this WebClient wc, string url, string destPath)
+        {
+            try {
+                wc.DownloadFile(url, destPath);
+            }
+            catch (WebException) {
+                MessageBox.Show("Github servers returned an error; please try again in a few minutes.", "Github API Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                Application.Current.Shutdown();
+            }
+        }
+
+        public static dynamic GitReleaseInfo(string gitUrl)
+        {
+            var client = UpdateHelpers.GetClient();
+            string release_info_json = client.DownloadStringFromGithubAPI(gitUrl);
+            return JsonConvert.DeserializeObject(release_info_json);
 
         }
 

diff --git a/application/GW2 Addon Manager/Properties/AssemblyInfo.cs b/application/GW2 Addon Manager/Properties/AssemblyInfo.cs
@@ -53,5 +53,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.3.0.2")]
+[assembly: AssemblyVersion("1.4.2.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]