Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
9b08b39a1f |
@@ -30,9 +30,8 @@ namespace Torch.Server
|
|||||||
private bool _init;
|
private bool _init;
|
||||||
private const string TOOL_DIR = "tool";
|
private const string TOOL_DIR = "tool";
|
||||||
private const string TOOL_ZIP = "temp.zip";
|
private const string TOOL_ZIP = "temp.zip";
|
||||||
private static readonly string TOOL_EXE = "DepotDownloader.exe";
|
private static readonly string TOOL_EXE = "steamcmd.exe";
|
||||||
private const string TOOL_ARGS = "-app 298740 -depot {1} -dir \"{0}\" -manifest {2}";
|
private const string TOOL_ARGS = "+login anonymous +app_update 298740 +force_install_dir \"{0}\"";
|
||||||
private static readonly int[] Depots = { 298741, 1004 };
|
|
||||||
private TorchServer _server;
|
private TorchServer _server;
|
||||||
|
|
||||||
internal Persistent<TorchConfig> ConfigPersistent { get; }
|
internal Persistent<TorchConfig> ConfigPersistent { get; }
|
||||||
@@ -131,7 +130,7 @@ namespace Torch.Server
|
|||||||
|
|
||||||
public static async Task RunSteamCmdAsync(IConfiguration configuration)
|
public static async Task RunSteamCmdAsync(IConfiguration configuration)
|
||||||
{
|
{
|
||||||
var log = LogManager.GetLogger("SteamTool");
|
var log = LogManager.GetLogger("SteamCMD");
|
||||||
|
|
||||||
var path = configuration.GetValue<string>("steamToolPath") ?? ApplicationContext.Current.TorchDirectory
|
var path = configuration.GetValue<string>("steamToolPath") ?? ApplicationContext.Current.TorchDirectory
|
||||||
.CreateSubdirectory(TOOL_DIR).FullName;
|
.CreateSubdirectory(TOOL_DIR).FullName;
|
||||||
@@ -141,39 +140,32 @@ namespace Torch.Server
|
|||||||
Directory.CreateDirectory(path);
|
Directory.CreateDirectory(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
var steamCmdExePath = Path.Combine(path, TOOL_EXE);
|
var toolExe = Path.Combine(path, TOOL_EXE);
|
||||||
if (!File.Exists(steamCmdExePath))
|
if (!File.Exists(toolExe))
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
log.Info("Downloading Steam Tool.");
|
log.Info("Downloading SteamCMD.");
|
||||||
using (var client = new HttpClient())
|
using (var client = new HttpClient())
|
||||||
await using (var file = File.Create(TOOL_ZIP))
|
await using (var file = File.Create(TOOL_ZIP))
|
||||||
await using (var stream = await client.GetStreamAsync("https://github.com/SteamRE/DepotDownloader/releases/download/DepotDownloader_2.4.7/depotdownloader-2.4.7.zip"))
|
await using (var stream = await client.GetStreamAsync("https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip"))
|
||||||
await stream.CopyToAsync(file);
|
await stream.CopyToAsync(file);
|
||||||
|
|
||||||
ZipFile.ExtractToDirectory(TOOL_ZIP, path);
|
ZipFile.ExtractToDirectory(TOOL_ZIP, path);
|
||||||
File.Delete(TOOL_ZIP);
|
File.Delete(TOOL_ZIP);
|
||||||
log.Info("Steam Tool downloaded successfully!");
|
log.Info("SteamCMD downloaded successfully!");
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
log.Error(e, "Failed to download Steam Tool, unable to update the DS.");
|
log.Error(e, "Failed to download SteamCMD, unable to update the DS.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Info("Checking for DS updates.");
|
log.Info("Checking for DS updates.");
|
||||||
foreach (var depot in Depots)
|
var steamCmdProc = new ProcessStartInfo(toolExe)
|
||||||
{
|
{
|
||||||
await DownloadDepot(depot);
|
Arguments = string.Format(TOOL_ARGS, configuration.GetValue("gamePath", "../")),
|
||||||
}
|
|
||||||
|
|
||||||
async Task DownloadDepot(int depotId)
|
|
||||||
{
|
|
||||||
var steamCmdProc = new ProcessStartInfo(steamCmdExePath)
|
|
||||||
{
|
|
||||||
Arguments = string.Format(TOOL_ARGS, configuration.GetValue("gamePath", "../"), depotId, "14195799952783859"),
|
|
||||||
WorkingDirectory = path,
|
WorkingDirectory = path,
|
||||||
RedirectStandardOutput = true
|
RedirectStandardOutput = true
|
||||||
};
|
};
|
||||||
@@ -182,8 +174,7 @@ namespace Torch.Server
|
|||||||
while (!cmd.HasExited)
|
while (!cmd.HasExited)
|
||||||
{
|
{
|
||||||
if (await cmd.StandardOutput.ReadLineAsync() is { } line)
|
if (await cmd.StandardOutput.ReadLineAsync() is { } line)
|
||||||
log.Info(line);
|
log.Info(line); //seems to hang sometimes, maybe switch back to Thread.Sleep?
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user