优化显示格式

chr233 · May 28, 2022 · 35075e1 · 35075e1
1 parent 8b583a4
commit 35075e1
Show file tree

Hide file tree

Showing 12 changed files with 89 additions and 61 deletions.
diff --git a/ASFEnhance/AssemblyInfo.cs b/ASFEnhance/AssemblyInfo.cs
@@ -1,8 +1,8 @@
 using System.Reflection;
 
 [assembly: System.CLSCompliant(false)]
-[assembly: AssemblyVersion("1.6.2.451")]
-[assembly: AssemblyFileVersion("1.6.2.451")]
+[assembly: AssemblyVersion("1.6.2.457")]
+[assembly: AssemblyFileVersion("1.6.2.457")]
 
 [assembly: AssemblyCopyright("Copyright © 2022 Chr_")]
 [assembly: AssemblyProduct("ASFEnhance")]

diff --git a/ASFEnhance/Cart/Command.cs b/ASFEnhance/Cart/Command.cs
@@ -175,31 +175,46 @@ internal static class Command
                 return bot.FormatBotResponse(Strings.BotNotConnected);
             }
 
-            Dictionary<string, SteamGameID> gameIDs = FetchGameIDs(query, SteamGameIDType.App);
+            Dictionary<string, SteamGameID> itemIDs = FetchItemIDs(query);
+
+            if (itemIDs.Count < 2)
+            {
+                return bot.FormatBotResponse("参数错误, 最少需要两个参数");
+            }
+            else if (itemIDs.First().Value.GameType == SteamGameIDType.Error)
+            {
+                return bot.FormatBotResponse(string.Format(Langs.ArgumentNotInteger, "AppID"));
+            }
 
             StringBuilder response = new();
             response.AppendLine(Langs.MultipleLineResult);
 
-            foreach (KeyValuePair<string, SteamGameID> item in gameIDs)
+            uint appID = itemIDs.First().Value.GameID;
+            response.AppendLine(string.Format("AppID : {0}", appID));
+
+            bool first = true;
+            foreach (KeyValuePair<string, SteamGameID> item in itemIDs)
             {
-                if (response.Length != 0) { response.AppendLine(); }
+                if (first)
+                {
+                    first = false;
+                    continue;
+                }
 
                 string input = item.Key;
-                SteamGameID gameID = item.Value;
+                SteamGameID itemID = item.Value;
 
-                switch (gameID.GameType)
+                if (itemID.GameType == SteamGameIDType.Item)
                 {
-                    case SteamGameIDType.Sub:
-                    case SteamGameIDType.Bundle:
-                        bool? success = await WebRequest.AddCart(bot, gameID).ConfigureAwait(false);
-                        response.AppendLine(bot.FormatBotResponse(string.Format(Strings.BotAddLicense, input, success == null ? Langs.CartNetworkError : (bool)success ? EResult.OK : EResult.Fail)));
-                        break;
-                    default:
-                        response.AppendLine(bot.FormatBotResponse(string.Format(Langs.CartInvalidType, input)));
-                        break;
+                    EResult? success = await WebRequest.AddCart(bot, appID, itemID.GameID).ConfigureAwait(false);
+                    response.AppendLine(bot.FormatBotResponse(string.Format("- {0}|{1} : {2}", appID, itemID.GameID, success == null ? Langs.CartNetworkError : success)));
+                }
+                else
+                {
+                    response.AppendLine(bot.FormatBotResponse(string.Format("- {0} : {1}", input, string.Format(Langs.ArgumentNotInteger, "itemID"))));
                 }
             }
-            return response.Length > 0 ? response.ToString() : null;
+            return response.ToString();
         }
 
         /// <summary>

diff --git a/ASFEnhance/Cart/WebRequest.cs b/ASFEnhance/Cart/WebRequest.cs
@@ -2,10 +2,12 @@
 
 using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Steam.Data;
 using ArchiSteamFarm.Web.Responses;
 using ASFEnhance.Data;
 using ASFEnhance.Localization;
 using static ASFEnhance.Cart.Response;
+using static ASFEnhance.Data.SteamGameID;
 using static ASFEnhance.Utils;
 
 namespace ASFEnhance.Cart
@@ -59,14 +61,11 @@ internal static class WebRequest
             Uri request = new(SteamStoreURL, "/cart/");
             Uri referer = new(SteamStoreURL, $"/{type}/{subID}");
 
-            Random random = new();
-
             Dictionary<string, string> data = new(5, StringComparer.Ordinal)
             {
                 { "action", "add_to_cart" },
                 { type + "id", subID.ToString() },
                 { "originating_snr", "1_direct-navigation__" },
-                { "snr", string.Format("{0}_{1}_{2}__{3}", 1, random.Next(1, 10), random.Next(1, 10), random.Next(100, 999)) }
             };
 
             HtmlDocumentResponse? response = await bot.ArchiWebHandler.UrlPostToHtmlDocumentWithSession(request, data: data, referer: referer).ConfigureAwait(false);
@@ -75,29 +74,32 @@ internal static class WebRequest
         }
 
         /// <summary>
-        /// 添加购物车
+        /// 添加购物车(游戏物品)
         /// </summary>
         /// <param name="bot"></param>
         /// <param name="appID"></param>
         /// <param name="classID"></param>
         /// <returns></returns>
-        internal static async Task<bool?> AddCart(Bot bot, uint appID, uint classID)
+        internal static async Task<SteamKit2.EResult?> AddCart(Bot bot, uint appID, uint classID)
         {
             Uri request = new(SteamStoreURL, "/cart/addtocart");
             Uri referer = new(SteamStoreURL, $"/itemstore/{appID}/detail/{classID}/");
 
-            Random random = new();
-
             Dictionary<string, string> data = new(5, StringComparer.Ordinal)
             {
                 { "action", "add_to_cart" },
                 { "microtxnappid", appID.ToString() },
                 { "microtxnassetclassid", classID.ToString() },
             };
 
-            HtmlDocumentResponse? response = await bot.ArchiWebHandler.UrlPostToHtmlDocumentWithSession(request, data: data, referer: referer).ConfigureAwait(false);
+            ObjectResponse<ResultResponse>? response = await bot.ArchiWebHandler.UrlPostToJsonObjectWithSession<ResultResponse>(request, data: data, referer: referer).ConfigureAwait(false);
 
-            return response != null;
+            if (response == null)
+            {
+                return null;
+            }
+
+            return response.Content.Result;
         }
 
         /// <summary>

diff --git a/ASFEnhance/Data/SteamGameID.cs b/ASFEnhance/Data/SteamGameID.cs
@@ -1,20 +1,23 @@
-namespace ASFEnhance.Data
+using ASFEnhance.Localization;
+
+namespace ASFEnhance.Data
 {
     internal sealed class SteamGameID
     {
-        internal SteamGameIDType GameType { get; set; }
-        internal uint GameID { get; set; }
-
+        public SteamGameIDType GameType { get; set; }
+        public uint GameID { get; set; }
 
-
-        internal SteamGameID(SteamGameIDType type, uint gameID)
+        public SteamGameID(SteamGameIDType type, uint gameID)
         {
             GameType = type;
             GameID = gameID;
         }
-    }
-
 
+        public override string ToString()
+        {
+            return $"{GameType}/{GameID}";
+        }
+    }
     internal enum SteamGameIDType
     {
         Error = 0,

diff --git a/ASFEnhance/Event/WebRequest.cs b/ASFEnhance/Event/WebRequest.cs
@@ -58,7 +58,6 @@ internal static class WebRequest
 
             Dictionary<string, string> data = new(3, StringComparer.Ordinal)
             {
-                { "sessionid" , bot.GetBotSessionID() },
                 { "authwgtoken", authwgToken },
                 { "door_index", "5" },
             };

diff --git a/ASFEnhance/Localization/Langs.Designer.cs b/ASFEnhance/Localization/Langs.Designer.cs
diff --git a/ASFEnhance/Localization/Langs.en-US.resx b/ASFEnhance/Localization/Langs.en-US.resx
@@ -130,13 +130,13 @@
     <value>Response is empty</value>
   </data>
   <data name="CartInvalidType" xml:space="preserve">
-    <value>{0}: Invalid type [SUB|BUNDLE]</value>
+    <value>- {0}: Invalid type [SUB|BUNDLE]</value>
   </data>
   <data name="CartIsEmpty" xml:space="preserve">
     <value>Shopping cart is emoty</value>
   </data>
   <data name="CartItemInfo" xml:space="preserve">
-    <value>{0} {1} {2:F2}</value>
+    <value>- {0} {1} {2:F2}</value>
   </data>
   <data name="CartNetworkError" xml:space="preserve">
     <value>Network Error</value>
@@ -253,10 +253,10 @@
     <value>Set billing address: {0}</value>
   </data>
   <data name="StoreItem" xml:space="preserve">
-    <value>{0}/{1} {2} {3:F2} {4}</value>
+    <value>  - {0}/{1} {2} {3:F2} {4}</value>
   </data>
   <data name="StoreItemHeader" xml:space="preserve">
-    <value>{0}/{1}: {2}</value>
+    <value>- {0}: {1}</value>
   </data>
   <data name="StorePageNotFound" xml:space="preserve">
     <value>Store page not found</value>

diff --git a/ASFEnhance/Localization/Langs.resx b/ASFEnhance/Localization/Langs.resx
@@ -130,13 +130,13 @@
     <value>响应为空</value>
   </data>
   <data name="CartInvalidType" xml:space="preserve">
-    <value>{0}: 类型无效 [SUB|BUNDLE]</value>
+    <value>- {0}: 类型无效 [SUB|BUNDLE]</value>
   </data>
   <data name="CartIsEmpty" xml:space="preserve">
     <value>购物车是空的</value>
   </data>
   <data name="CartItemInfo" xml:space="preserve">
-    <value>{0} {1} {2:F2}</value>
+    <value>- {0} {1} {2:F2}</value>
   </data>
   <data name="CartNetworkError" xml:space="preserve">
     <value>网络错误</value>
@@ -253,10 +253,10 @@
     <value>结算货币设置: {0}</value>
   </data>
   <data name="StoreItem" xml:space="preserve">
-    <value>{0}/{1} {2} {3:F2} {4}</value>
+    <value>  - {0}/{1} {2} {3:F2} {4}</value>
   </data>
   <data name="StoreItemHeader" xml:space="preserve">
-    <value>{0}/{1}: {2}</value>
+    <value>- {0}: {1}</value>
   </data>
   <data name="StorePageNotFound" xml:space="preserve">
     <value>未找到商店页</value>

diff --git a/ASFEnhance/Localization/Langs.zh-Hans.resx b/ASFEnhance/Localization/Langs.zh-Hans.resx
@@ -130,13 +130,13 @@
     <value>响应为空</value>
   </data>
   <data name="CartInvalidType" xml:space="preserve">
-    <value>{0}: 类型无效 [SUB|BUNDLE]</value>
+    <value>- {0}: 类型无效 [SUB|BUNDLE]</value>
   </data>
   <data name="CartIsEmpty" xml:space="preserve">
     <value>购物车是空的</value>
   </data>
   <data name="CartItemInfo" xml:space="preserve">
-    <value>{0} {1} {2:F2}</value>
+    <value>- 0} {1} {2:F2}</value>
   </data>
   <data name="CartNetworkError" xml:space="preserve">
     <value>网络错误</value>
@@ -253,10 +253,10 @@
     <value>结算货币设置: {0}</value>
   </data>
   <data name="StoreItem" xml:space="preserve">
-    <value>{0}/{1} {2} {3:F2} {4}</value>
+    <value>  - {0}/{1} {2} {3:F2} {4}</value>
   </data>
   <data name="StoreItemHeader" xml:space="preserve">
-    <value>{0}/{1}: {2}</value>
+    <value>- {0}: {1}</value>
   </data>
   <data name="StorePageNotFound" xml:space="preserve">
     <value>未找到商店页</value>

diff --git a/ASFEnhance/Store/Command.cs b/ASFEnhance/Store/Command.cs
@@ -7,8 +7,9 @@
 using ASFEnhance.Localization;
 using SteamKit2;
 using System.Text;
-using static ASFEnhance.Store.Response;
 using static ASFEnhance.Utils;
+using static ASFEnhance.Data.SteamGameID;
+using static ASFEnhance.Store.Response;
 
 namespace ASFEnhance.Store
 {
@@ -35,14 +36,18 @@ internal static class Command
 
             string walletCurrency = bot.WalletCurrency != ECurrencyCode.Invalid ? bot.WalletCurrency.ToString() : Langs.WalletAreaUnknown;
 
+            if (CurrencyHelper.Currency2Symbol.ContainsKey(walletCurrency))
+            {
+                walletCurrency = CurrencyHelper.Currency2Symbol[walletCurrency];
+            }
+
             Dictionary<string, SteamGameID> gameIDs = FetchGameIDs(query, SteamGameIDType.App);
 
             StringBuilder response = new();
+            response.AppendLine(bot.FormatBotResponse(Langs.MultipleLineResult));
 
             foreach (KeyValuePair<string, SteamGameID> item in gameIDs)
             {
-                if (response.Length != 0) { response.AppendLine(); }
-
                 string input = item.Key;
                 SteamGameID gameID = item.Value;
 
@@ -52,17 +57,15 @@ internal static class Command
                     case SteamGameIDType.Sub:
                     case SteamGameIDType.Bundle:
 
-                        string type = gameID.GameType.ToString();
-
                         GameStorePageResponse? storeResponse = await WebRequest.GetStoreSubs(bot, gameID).ConfigureAwait(false);
 
                         if (storeResponse.SubDatas.Count == 0)
                         {
-                            response.AppendLine(bot.FormatBotResponse(string.Format(Langs.StoreItemHeader, type, gameID, storeResponse.GameName)));
+                            response.AppendLine(string.Format(Langs.StoreItemHeader, gameID, storeResponse.GameName));
                         }
                         else
                         {
-                            response.AppendLine(bot.FormatBotResponse(string.Format(Langs.StoreItemHeader, type, gameID, storeResponse.GameName)));
+                            response.AppendLine(string.Format(Langs.StoreItemHeader, gameID, storeResponse.GameName));
 
                             foreach (SingleSubData sub in storeResponse.SubDatas)
                             {
@@ -76,7 +79,8 @@ internal static class Command
                         break;
                 }
             }
-            return response.Length > 0 ? response.ToString() : null;
+
+            return response.ToString();
         }
 
         /// <summary>

diff --git a/ASFEnhance/Store/Response.cs b/ASFEnhance/Store/Response.cs
@@ -34,6 +34,11 @@ public SingleSubData(bool bundle = false, uint subID = 0, string name = "", uint
                 this.Name = name;
                 this.Price = price;
             }
+
+            public override string ToString()
+            {
+                return base.ToString();
+            }
         }
 
         /// <summary>