From 88006ef10378ae8afb4a6b2ab2ac248963446881 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Fri, 6 Jan 2017 22:18:41 +0100 Subject: [PATCH] Misc --- .../Localization/Strings.Designer.cs | 18 ++++++++++++++++++ ArchiSteamFarm/Localization/Strings.resx | 6 ++++++ ArchiSteamFarm/Program.cs | 18 ++++++++++++------ 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/ArchiSteamFarm/Localization/Strings.Designer.cs b/ArchiSteamFarm/Localization/Strings.Designer.cs index a9728e19f..92aaaed9d 100644 --- a/ArchiSteamFarm/Localization/Strings.Designer.cs +++ b/ArchiSteamFarm/Localization/Strings.Designer.cs @@ -1413,6 +1413,15 @@ namespace ArchiSteamFarm.Localization { } } + /// + /// Looks up a localized string similar to Please review our privacy policy section on the wiki if you're concerned about what ASF is in fact doing!. + /// + internal static string WarningPrivacyPolicy { + get { + return ResourceManager.GetString("WarningPrivacyPolicy", resourceCulture); + } + } + /// /// Looks up a localized string similar to ASF detected unsupported runtime version, program might NOT run correctly in current environment. You're running it at your own risk without support!. /// @@ -1493,5 +1502,14 @@ namespace ArchiSteamFarm.Localization { return ResourceManager.GetString("WCFStarting", resourceCulture); } } + + /// + /// Looks up a localized string similar to It looks like it's your first launch of the program, welcome!. + /// + internal static string Welcome { + get { + return ResourceManager.GetString("Welcome", resourceCulture); + } + } } } diff --git a/ArchiSteamFarm/Localization/Strings.resx b/ArchiSteamFarm/Localization/Strings.resx index 06de49912..fc9e48ce4 100644 --- a/ArchiSteamFarm/Localization/Strings.resx +++ b/ArchiSteamFarm/Localization/Strings.resx @@ -682,4 +682,10 @@ StackTrace: Initializing {0}... {0} will be replaced by service name that is being initialized + + Please review our privacy policy section on the wiki if you're concerned about what ASF is in fact doing! + + + It looks like it's your first launch of the program, welcome! + \ No newline at end of file diff --git a/ArchiSteamFarm/Program.cs b/ArchiSteamFarm/Program.cs index 69dc4a951..325e8e238 100644 --- a/ArchiSteamFarm/Program.cs +++ b/ArchiSteamFarm/Program.cs @@ -162,16 +162,16 @@ namespace ArchiSteamFarm { if (!Runtime.IsRuntimeSupported) { ArchiLogger.LogGenericError(Strings.WarningRuntimeUnsupported); - Thread.Sleep(10000); + await Task.Delay(10 * 1000).ConfigureAwait(false); } - InitServices(); + await InitServices().ConfigureAwait(false); // If debugging is on, we prepare debug directory prior to running if (GlobalConfig.Debug) { if (Directory.Exists(SharedInfo.DebugDirectory)) { Directory.Delete(SharedInfo.DebugDirectory, true); - Thread.Sleep(1000); // Dirty workaround giving Windows some time to sync + await Task.Delay(1000).ConfigureAwait(false); // Dirty workaround giving Windows some time to sync } Directory.CreateDirectory(SharedInfo.DebugDirectory); @@ -195,22 +195,28 @@ namespace ArchiSteamFarm { ASF.InitFileWatcher(); } - private static void InitServices() { + private static async Task InitServices() { string globalConfigFile = Path.Combine(SharedInfo.ConfigDirectory, SharedInfo.GlobalConfigFileName); GlobalConfig = GlobalConfig.Load(globalConfigFile); if (GlobalConfig == null) { ArchiLogger.LogGenericError(string.Format(Strings.ErrorGlobalConfigNotLoaded, globalConfigFile)); - Thread.Sleep(5000); + await Task.Delay(5 * 1000).ConfigureAwait(false); Exit(1); } string globalDatabaseFile = Path.Combine(SharedInfo.ConfigDirectory, SharedInfo.GlobalDatabaseFileName); + if (!File.Exists(globalDatabaseFile)) { + ArchiLogger.LogGenericInfo(Strings.Welcome); + ArchiLogger.LogGenericWarning(Strings.WarningPrivacyPolicy); + await Task.Delay(15 * 1000).ConfigureAwait(false); + } + GlobalDatabase = GlobalDatabase.Load(globalDatabaseFile); if (GlobalDatabase == null) { ArchiLogger.LogGenericError(string.Format(Strings.ErrorDatabaseInvalid, globalDatabaseFile)); - Thread.Sleep(5000); + await Task.Delay(5 * 1000).ConfigureAwait(false); Exit(1); }