Merge branch 'feature/steam-ugc-legacy-check'

KillahPotatoes · May 9, 2020 · 7e529e7 · 7e529e7
2 parents fbbbabc + 3b0e969
commit 7e529e7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/Command/Download/DownloadCommand.cs b/Command/Download/DownloadCommand.cs
@@ -48,12 +48,12 @@ protected override async Task<int> OnExecute(CommandLineApplication app)
                 InitializeSteam();
 
                 Console.Out.WriteLine($"Downloading item {ItemId} for app {AppId}");
-                
+
                 if (!SteamUGC.DownloadItem(new PublishedFileId_t(ItemId), true))
                 {
                     throw new Exception($"Could not download item {ItemId}");
                 }
-                
+
                 Console.Out.WriteLine($"Item {ItemId} queued for download in Steam");
 
                 return 0;

diff --git a/Command/KpSteamCommand.cs b/Command/KpSteamCommand.cs
@@ -6,6 +6,11 @@
 
 namespace KP_Steam_Uploader.Command
 {
+    public enum AppIds
+    {
+        Arma = 107410,
+    }
+
     [Command(
         Name = "kpsteam",
         ThrowOnUnexpectedArgument = false,

diff --git a/Command/Upload/UploadCommand.cs b/Command/Upload/UploadCommand.cs
@@ -1,9 +1,11 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
+using KP_Steam_Uploader.Util;
 using McMaster.Extensions.CommandLineUtils;
 using Microsoft.Extensions.Logging;
 using Steamworks;
@@ -32,8 +34,11 @@ public UploadCommand(ILogger<UploadCommand> logger, IConsole console)
         {
             Logger = logger;
             Console = console;
+            SteamUgcUtil = new SteamUgc(logger);
         }
 
+        protected SteamUgc SteamUgcUtil;
+
         protected override async Task<int> OnExecute(CommandLineApplication app)
         {
             Logger.LogInformation("Executing UploadCommand");
@@ -172,7 +177,19 @@ protected async Task SteamUGCUpload()
             {
                 throw new Exception("Item Content could not be set!");
             }
-
+
+            var itemDetails = await SteamUgcUtil.GetSingleQueryUgcResult(ItemId);
+            // If uploading for Arma check for Scenario tag.
+            // UGC upload over scenario is most likely a mistake which we will prevent.
+            if (AppId == (uint)AppIds.Arma)
+            {
+                var tags = itemDetails.m_rgchTags.Split(',');
+                if (tags.Contains("Scenario"))
+                {
+                    throw new Exception("Scenaarios can't be uploaded via UGC, use --legacy mode!");                    
+                }
+            }
+
             var updateCall = SteamUGC.SubmitItemUpdate(update, ChangeNotes);
 
             _submitItemUpdateResultTask = new TaskCompletionSource<bool>();