Compatibility with ASF v2.1.3.9

alvr · Aug 6, 2016 · a471bb2 · a471bb2
1 parent c069adc
commit a471bb2
Show file tree

Hide file tree

Showing 13 changed files with 92 additions and 52 deletions.
diff --git a/ASFui/API.cs b/ASFui/API.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Net;
 using System.Text;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace ASFui
 {
@@ -20,14 +18,6 @@ private IEnumerable<string> GetBots()
             return _data.Bot.Keys;
         }
 
-        private static string GetAppName(uint id)
-        {
-            var url = "http://store.steampowered.com/api/appdetails?appids=" + id;
-            var content = new WebClient().DownloadString(url);
-            var json = JObject.Parse(content);
-            return json[id.ToString()]["data"]["name"].ToString();
-        }
-
         public string AllApi()
         {
             var result = new StringBuilder();
@@ -38,15 +28,16 @@ public string AllApi()
                 result.Append(@"    ⟐ Active: " + _data.Bot[bot].KeepRunning + Environment.NewLine);
 
                 var games = _data.Bot[bot].CardsFarmer.GamesToFarm;
-                if (games.Keys.Count > 0)
+                if (games.Count > 0)
                 {
                     result.Append(@"    ⟐ Games to Farm:" + Environment.NewLine);
 
                     foreach (var game in games)
                     {
-                        var timePlayed = TimeSpan.FromHours(game.Value);
-                        result.Append(@"        ◇ " + GetAppName(game.Key) + @"; Time Farmed: " 
-                            + string.Format("{0:00}:{1:00}", timePlayed.Hours, timePlayed.Minutes) + Environment.NewLine);
+                        var timePlayed = TimeSpan.FromHours(game.HoursPlayed);
+                        result.Append(@"        ◇ " + game.GameName + @"; Hours Played: " 
+                            + $"{timePlayed.Hours:00}:{timePlayed.Minutes:00}"
+                            + @"; Cards Remaining: " + game.CardsRemaining + Environment.NewLine);
                     }
                 }
                 else
@@ -62,7 +53,7 @@ public string AllApi()
 
                     foreach (var game in farming)
                     {
-                        result.Append(@"        ◇ " + GetAppName(game) + Environment.NewLine);
+                        result.Append(@"        ◇ " + game.GameName + Environment.NewLine);
                     }
                 }
                 else

diff --git a/ASFui/ASFui.Designer.cs b/ASFui/ASFui.Designer.cs
diff --git a/ASFui/ASFui.cs b/ASFui/ASFui.cs
@@ -609,7 +609,6 @@ private void EnableElements()
             btnASFVersion.Enabled = true;
             btnAPI.Enabled = true;
             btn2FA.Enabled = true;
-            btn2FAOff.Enabled = true;
             btn2FAOk.Enabled = true;
             btn2FANo.Enabled = true;
         }
@@ -638,7 +637,6 @@ private void DisableElements()
             btnASFVersion.Enabled = false;
             btnAPI.Enabled = false;
             btn2FA.Enabled = false;
-            btn2FAOff.Enabled = false;
             btn2FAOk.Enabled = false;
             btn2FANo.Enabled = false;
 

diff --git a/ASFui/ASFui.csproj b/ASFui/ASFui.csproj
@@ -157,6 +157,9 @@
     <Content Include="NLog.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="Resources\settings.png" />
+    <None Include="Resources\refresh.png" />
+    <None Include="Resources\help.png" />
     <None Include="NLog.xsd">
       <SubType>Designer</SubType>
     </None>

diff --git a/ASFui/Bot.cs b/ASFui/Bot.cs
@@ -1,8 +1,10 @@
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using Newtonsoft.Json;
 
 namespace ASFui
 {
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
     public class Bot
     {
         public class Root
@@ -23,14 +25,29 @@ public class Bots
         public class CardsFarmer
         {
             [JsonProperty("GamesToFarm")]
-            public Dictionary<uint, float> GamesToFarm { get; set; }
+            public HashSet<Game> GamesToFarm { get; set; }
 
             [JsonProperty("CurrentGamesFarming")]
-            public HashSet<uint> CurrentGamesFarming { get; set; }
+            public HashSet<Game> CurrentGamesFarming { get; set; }
 
             [JsonProperty("ManualMode")]
             public bool ManualMode { get; set; }
         }
 
+        public class Game
+        {
+            [JsonProperty("AppID")]
+            public uint AppID { get; set; }
+
+            [JsonProperty("GameName")]
+            public string GameName { get; set; }
+
+            [JsonProperty("HoursPlayed")]
+            public float HoursPlayed { get; set; }
+
+            [JsonProperty("CardsRemaining")]
+            public ushort CardsRemaining { get; set; }
+        }
+
     }
-}
+}
diff --git a/ASFui/Client.cs b/ASFui/Client.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+using Newtonsoft.Json;
 
 namespace ASFui
 {

diff --git a/ASFui/Properties/AssemblyInfo.cs b/ASFui/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@
 // Puede especificar todos los valores o usar los valores predeterminados de número de compilación y de revisión 
 // mediante el carácter '*', como se muestra a continuación:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.3.0")]
-[assembly: AssemblyFileVersion("0.3.3.0")]
+[assembly: AssemblyVersion("0.3.4.0")]
+[assembly: AssemblyFileVersion("0.3.4.0")]
diff --git a/ASFui/Properties/Resources.Designer.cs b/ASFui/Properties/Resources.Designer.cs
diff --git a/ASFui/Properties/Resources.resx b/ASFui/Properties/Resources.resx
@@ -1784,4 +1784,14 @@
         AAAAAAAAAAAAAAAAAAAAAAAA
 </value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="help" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/ASFui/Resources/help.png b/ASFui/Resources/help.png
diff --git a/ASFui/Resources/refresh.png b/ASFui/Resources/refresh.png
diff --git a/ASFui/Resources/settings.png b/ASFui/Resources/settings.png
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.3.3.0
+0.3.4.0