Merge pull request #5 from FlashpointProject/dev

optimization: only download configs when needed

Author: tomysshadow

FlashpointSecurePlayer/Program.cs

@@ -876,17 +876,6 @@ private static string GetValidEXEConfigurationName(string name) {
             return invalidNameCharactersRegex.Replace(name, ".").ToLower();
         }
 
-        public static async Task DownloadEXEConfiguration(string name) {
-            try {
-                name = GetValidEXEConfigurationName(name);
-                await DownloadAsync("http://" + CONFIGURATION_DOWNLOAD_NAME + "/" + name + ".config").ConfigureAwait(false);
-            } catch (Exceptions.DownloadFailedException) {
-                // Fail silently.
-            } catch (ConfigurationErrorsException) {
-                // Fail silently.
-            }
-        }
-
         private static Configuration GetActiveEXEConfiguration() {
             // get cached if exists
             if (ActiveEXEConfiguration != null) {
@@ -992,6 +981,20 @@ private static Configuration GetEXEConfiguration(bool create, string name) {
             EXEConfigurationName = name;
             return EXEConfiguration;
         }
+        public static async Task DownloadEXEConfiguration(string name) {
+            try {
+                GetEXEConfiguration(false, name);
+            } catch (ConfigurationErrorsException) {
+                try {
+                    name = GetValidEXEConfigurationName(name);
+                    await DownloadAsync("http://" + CONFIGURATION_DOWNLOAD_NAME + "/" + name + ".config").ConfigureAwait(false);
+                } catch (Exceptions.DownloadFailedException) {
+                    // Fail silently.
+                } catch (ConfigurationErrorsException) {
+                    // Fail silently.
+                }
+            }
+        }
 
         public static FlashpointSecurePlayerSection GetFlashpointSecurePlayerSection(bool create, string exeConfigurationName) {
             FlashpointSecurePlayerSection flashpointSecurePlayerSection = null;

FlashpointSecurePlayer/Properties/AssemblyInfo.cs

@@ -33,7 +33,7 @@
 // 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.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.0")]
 [assembly: NeutralResourcesLanguage("en")]
 

FlashpointSecurePlayer/README.md

@@ -1,4 +1,4 @@
-# Flashpoint Secure Player 1.0.4
+# Flashpoint Secure Player 1.0.5
 This player attempts to solve common compatibility or portability issues posed by browser plugins on Windows for the purpose of playback in BlueMaxima's Flashpoint.
 
 It is compatible with Windows 7, Windows 8, Windows 8.1 and Windows 10, and requires .NET Framework 4.5. If you are on Windows 8.1 or Windows 10, or if you are on Windows 7/8 and have updates enabled, you already have .NET Framework 4.5. Otherwise, you may [download .NET Framework 4.5.](http://www.microsoft.com/en-us/download/details.aspx?id=30653)