Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 06:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring for upcoming GUI app

Browse Source
This commit is contained in:
JustArchi
2016-08-02 06:04:44 +02:00
parent 9918861c66
commit 7025659151
13 changed files with 311 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ConfigGenerator/ASFConfig.cs
View File

@@ -26,6 +26,7 @@ using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.IO;
using ArchiSteamFarm;
namespace ConfigGenerator {
internal abstract class ASFConfig {
@@ -60,7 +61,7 @@ namespace ConfigGenerator {
internal void Remove() {
string queryPath = Path.GetFileNameWithoutExtension(FilePath);
lock (FileLock) {
foreach (string botFile in Directory.EnumerateFiles(Program.ConfigDirectory, queryPath + ".*")) {
foreach (string botFile in Directory.EnumerateFiles(SharedInfo.ConfigDirectory, queryPath + ".*")) {
try {
File.Delete(botFile);
} catch (Exception e) {
@@ -80,15 +81,15 @@ namespace ConfigGenerator {
string queryPath = Path.GetFileNameWithoutExtension(FilePath);
lock (FileLock) {
foreach (string botFile in Directory.EnumerateFiles(Program.ConfigDirectory, queryPath + ".*")) {
foreach (string botFile in Directory.EnumerateFiles(SharedInfo.ConfigDirectory, queryPath + ".*")) {
try {
File.Move(botFile, Path.Combine(Program.ConfigDirectory, botName + Path.GetExtension(botFile)));
File.Move(botFile, Path.Combine(SharedInfo.ConfigDirectory, botName + Path.GetExtension(botFile)));
} catch (Exception e) {
Logging.LogGenericException(e);
}
}
FilePath = Path.Combine(Program.ConfigDirectory, botName + ".json");
FilePath = Path.Combine(SharedInfo.ConfigDirectory, botName + ".json");
}
}
}

10
ConfigGenerator/MainForm.cs
View File

@@ -52,14 +52,14 @@ namespace ConfigGenerator {
return;
}
ASFTab = new ConfigPage(GlobalConfig.Load(Path.Combine(Program.ConfigDirectory, Program.GlobalConfigFile)));
ASFTab = new ConfigPage(GlobalConfig.Load(Path.Combine(SharedInfo.ConfigDirectory, SharedInfo.GlobalConfigFileName)));
MainTab.TabPages.Add(ASFTab);
foreach (string configFile in Directory.EnumerateFiles(Program.ConfigDirectory, "*.json")) {
foreach (string configFile in Directory.EnumerateFiles(SharedInfo.ConfigDirectory, "*.json")) {
string botName = Path.GetFileNameWithoutExtension(configFile);
switch (botName) {
case Program.ASF:
case SharedInfo.ASF:
case "example":
case "minimal":
continue;
@@ -161,7 +161,7 @@ namespace ConfigGenerator {
}
switch (input) {
case Program.ASF:
case SharedInfo.ASF:
case "example":
case "minimal":
Logging.LogGenericErrorWithoutStacktrace("This name is reserved!");
@@ -173,7 +173,7 @@ namespace ConfigGenerator {
return;
}
input = Path.Combine(Program.ConfigDirectory, input + ".json");
input = Path.Combine(SharedInfo.ConfigDirectory, input + ".json");
ConfigPage newConfigPage = new ConfigPage(BotConfig.Load(input));
MainTab.TabPages.Insert(MainTab.TabPages.Count - ReservedTabs, newConfigPage);

10
ConfigGenerator/Program.cs
View File

@@ -32,12 +32,8 @@ using ArchiSteamFarm;
namespace ConfigGenerator {
internal static class Program {
internal const string ASF = "ASF";
internal const string ConfigDirectory = "config";
internal const string GlobalConfigFile = ASF + ".json";
private const string ASFDirectory = "ArchiSteamFarm";
private const string ASFExecutableFile = ASF + ".exe";
private const string ASFExecutableFile = SharedInfo.ASF + ".exe";
/// <summary>
/// The main entry point for the application.
@@ -73,13 +69,13 @@ namespace ConfigGenerator {
}
// If config directory doesn't exist after our adjustment, abort all of that
if (!Directory.Exists(ConfigDirectory)) {
if (!Directory.Exists(SharedInfo.ConfigDirectory)) {
Directory.SetCurrentDirectory(homeDirectory);
}
}
}
if (!Directory.Exists(ConfigDirectory)) {
if (!Directory.Exists(SharedInfo.ConfigDirectory)) {
Logging.LogGenericErrorWithoutStacktrace("Config directory could not be found!");
Environment.Exit(1);
}

4
ConfigGenerator/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using ArchiSteamFarm;
// 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(SharedInfo.Version)]
[assembly: AssemblyFileVersion(SharedInfo.Version)]
[assembly: AssemblyVersion(SharedInfo.VersionNumber)]
[assembly: AssemblyFileVersion(SharedInfo.VersionNumber)]