Added support for remote ASF.

alvr · Jun 25, 2016 · 74b26a5 · 74b26a5
1 parent 3b5bfb8
commit 74b26a5
Show file tree

Hide file tree

Showing 10 changed files with 242 additions and 43 deletions.
diff --git a/ASFui/ASFui.Designer.cs b/ASFui/ASFui.Designer.cs
diff --git a/ASFui/ASFui.cs b/ASFui/ASFui.cs
@@ -37,6 +37,7 @@ public ASFui()
                 Environment.Exit(-2);
             }
             InitializeComponent();
+            ASFProcess.StartInfo.FileName = Properties.Settings.Default.ASFBinary;
         }
 
         private void ASFui_Resize(object sender, EventArgs e)
@@ -48,20 +49,21 @@ private void ASFui_Resize(object sender, EventArgs e)
 
         private void ASFui_FormClosing(object sender, FormClosingEventArgs e)
         {
-            if (!_asfRunning) return;
+            if (!_asfRunning || !Properties.Settings.Default.IsLocal) return;
             ASFProcess.Kill();
             ASFProcess.CancelOutputRead();
             BackgroundWorker.CancelAsync();
         }
 
         private void BackgroundWorker_DoWork(object sender, System.ComponentModel.DoWorkEventArgs e)
         {
+            if (!Properties.Settings.Default.IsLocal) return;
             ASFProcess.Start();
             ASFProcess.BeginOutputReadLine();
             ASFProcess.WaitForExit();
         }
 
-        private void ProcesoASF_OutputDataReceived(object sender, DataReceivedEventArgs e)
+        private void ASFProcess_OutputDataReceived(object sender, DataReceivedEventArgs e)
         {
             rtbOutput.AppendText(e.Data + Environment.NewLine);
             rtbOutput.SelectionStart = rtbOutput.Text.Length;
@@ -141,14 +143,20 @@ private void btnASFuiSettings_Click(object sender, EventArgs e)
         #region Cards Buttons
         private void btnFarm_Click(object sender, EventArgs e)
         {
-            var result = Util.SendCommand(Util.GenerateCommand("farm", cbBotList.SelectedItem.ToString()));
-            tsslCommandOutput.Text = @"!farm <" + cbBotList.SelectedItem + @">: " + result;
+            Task.Run(() =>
+            {
+                var result = Util.SendCommand(Util.GenerateCommand("farm", cbBotList.SelectedItem.ToString()));
+                tsslCommandOutput.Text = @"!farm <" + cbBotList.SelectedItem + @">: " + result;
+            });
         }
 
         private void btnLoot_Click(object sender, EventArgs e)
         {
-            var result = Util.SendCommand(Util.GenerateCommand("loot", cbBotList.SelectedItem.ToString()));
-            tsslCommandOutput.Text = @"!loot <" + cbBotList.SelectedItem + @">: " + result;
+            Task.Run(() =>
+            {
+                var result = Util.SendCommand(Util.GenerateCommand("loot", cbBotList.SelectedItem.ToString()));
+                tsslCommandOutput.Text = @"!loot <" + cbBotList.SelectedItem + @">: " + result;
+            });
         }
         #endregion
 
@@ -181,8 +189,12 @@ private void btnOwns_Click(object sender, EventArgs e)
 
         private void btnPlay_Click(object sender, EventArgs e)
         {
-            var result = Util.SendCommand(Util.GenerateCommand("play", cbBotList.SelectedItem.ToString(), Util.MultiToOne(tbInput.Lines)));
-            tsslCommandOutput.Text = @"!play <" + cbBotList.SelectedItem + @">: " + result;
+            Task.Run(() =>
+            {
+                var result =
+                    Util.SendCommand(Util.GenerateCommand("play", cbBotList.SelectedItem.ToString(), Util.MultiToOne(tbInput.Lines)));
+                tsslCommandOutput.Text = @"!play <" + cbBotList.SelectedItem + @">: " + result;
+            });
         }
         #endregion
 

diff --git a/ASFui/ASFui.csproj b/ASFui/ASFui.csproj
@@ -95,6 +95,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ASFProcess.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="ASFui.cs">
       <SubType>Form</SubType>
     </Compile>

diff --git a/ASFui/ASFui.resx b/ASFui/ASFui.resx
@@ -117,19 +117,19 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="ASFProcess.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>174, 17</value>
-  </metadata>
-  <metadata name="StatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>504, 17</value>
-  </metadata>
   <metadata name="BackgroundWorker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
   <metadata name="TrayIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>287, 17</value>
+    <value>274, 17</value>
   </metadata>
   <metadata name="cmsTrayIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>385, 17</value>
+    <value>372, 17</value>
+  </metadata>
+  <metadata name="StatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>491, 17</value>
+  </metadata>
+  <metadata name="ASFProcess.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>174, 17</value>
   </metadata>
 </root>
diff --git a/ASFui/App.config b/ASFui/App.config
@@ -13,6 +13,12 @@
             <setting name="ASFBinary" serializeAs="String">
                 <value>ASF.exe</value>
             </setting>
+            <setting name="IsLocal" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="RemoteURL" serializeAs="String">
+                <value />
+            </setting>
         </ASFui.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/ASFui/Properties/Settings.Designer.cs b/ASFui/Properties/Settings.Designer.cs
diff --git a/ASFui/Properties/Settings.settings b/ASFui/Properties/Settings.settings
@@ -5,5 +5,11 @@
     <Setting Name="ASFBinary" Type="System.String" Scope="User">
       <Value Profile="(Default)">ASF.exe</Value>
     </Setting>
+    <Setting Name="IsLocal" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="RemoteURL" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/ASFui/SettingsForm.Designer.cs b/ASFui/SettingsForm.Designer.cs