Load HTML instead JSON feature for Item page

Slower but more stable method
Maxx53 · Jul 5, 2014 · ec6eef5 · ec6eef5
1 parent 76ba99a
commit ec6eef5
Show file tree

Hide file tree

Showing 11 changed files with 2,511 additions and 2,353 deletions.
diff --git a/scr/SCMBot/Main.Designer.cs b/scr/SCMBot/Main.Designer.cs
diff --git a/scr/SCMBot/Main.cs b/scr/SCMBot/Main.cs
@@ -35,7 +35,7 @@ public partial class Main : Form
         bool relog = false;
 
         static bool isLog = true;
-
+        public static bool isHTML = true;
         //ItemComparer itemComparer = new ItemComparer();
 
         static public Semaphore reqPool;
@@ -187,7 +187,7 @@ private void LoadSettings(bool loadtabs)
             label3Stretch();
 
             isLog = settings.keepLog;
-            settingsForm.keepLogBox.Checked = isLog;
+            settingsForm.keepLogBox.Checked = settings.keepLog;
 
             settingsForm.checkBox2.Checked = settings.loginOnstart;
             settingsForm.logCountBox.Text = settings.logCount.ToString();
@@ -196,6 +196,9 @@ private void LoadSettings(bool loadtabs)
             settingsForm.ignoreBox.Checked = settings.ignoreWarn;
             settingsForm.actualBox.Checked = settings.loadActual;
 
+            isHTML = settings.scanHTML;
+            settingsForm.scanHtlmBox.Checked = settings.scanHTML;
+
             settingsForm.stopFundsBox.Text = MainScanItem.LogItem.DoFracture(settings.StopFunds.ToString());
             stopfundsVal = settings.StopFunds;
 
@@ -306,6 +309,10 @@ private void SaveSettings(bool savetabs)
 
             settings.playSnd = settingsForm.playSndCheckBox.Checked;
 
+
+            isHTML = settingsForm.scanHtlmBox.Checked;
+            settings.scanHTML = isHTML;
+
             settings.delayVal = steam_srch.mainDelay;
 
             settings.InvType = comboBox3.SelectedIndex;

diff --git a/scr/SCMBot/Main.resx b/scr/SCMBot/Main.resx
diff --git a/scr/SCMBot/Main.ru-RU.resx b/scr/SCMBot/Main.ru-RU.resx
@@ -349,9 +349,6 @@
   <data name="label19.Text" xml:space="preserve">
     <value>Получите:</value>
   </data>
-  <data name="textBox3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>157, 49</value>
-  </data>
   <data name="filterTypeBox.Items" xml:space="preserve">
     <value>Тип</value>
   </data>
@@ -362,10 +359,10 @@
     <value>Цена</value>
   </data>
   <data name="filterTypeBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>521, 46</value>
+    <value>521, 48</value>
   </data>
   <data name="label18.Location" type="System.Drawing.Point, System.Drawing">
-    <value>450, 52</value>
+    <value>455, 52</value>
   </data>
   <data name="label18.Size" type="System.Drawing.Size, System.Drawing">
     <value>62, 13</value>

diff --git a/scr/SCMBot/MainUtils.cs b/scr/SCMBot/MainUtils.cs
@@ -460,7 +460,7 @@ public static string GetRequest(string url, CookieContainer cookie, bool UseProx
                     request.Timeout = 30000;
 
                     //KeepAlive is True by default
-                    request.KeepAlive = keepAlive;
+                    //request.KeepAlive = keepAlive;
 
                     //LOL, really?
                     request.UserAgent = steamUA;

diff --git a/scr/SCMBot/Properties/Settings.Designer.cs b/scr/SCMBot/Properties/Settings.Designer.cs
diff --git a/scr/SCMBot/SettingsFrm.Designer.cs b/scr/SCMBot/SettingsFrm.Designer.cs