merge

7 files changed, 345 insertions, 5 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Console/DefaultConsoleEngineService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Console/DefaultConsoleEngineService.cs
index 42228614e..4a9ee468a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Console/DefaultConsoleEngineService.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Console/DefaultConsoleEngineService.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Console;
+using Tango.Console.Network;
 using Tango.Core.DI;
 using Tango.Integration.ExternalBridge;
 using Tango.PPC.Common.ExternalBridge;
@@ -21,16 +22,31 @@ namespace Tango.PPC.Common.Console
             externalBridge.RegisterRequestHandler(this);
         }
 
-        [ExternalBridgeRequestHandlerMethod(typeof(ConsoleCommandDTO))]
-        public async void OnConsoleCommandReceived(ConsoleCommandDTO command, String token, ITransporter transporter)
+        [ExternalBridgeRequestHandlerMethod(typeof(GetCurrentDirectoryRequest))]
+        public async void OnGetCurrentDirectoryRequest(GetCurrentDirectoryRequest request, String token, ITransporter transporter)
+        {
+            await transporter.SendGenericResponse(new GetCurrentDirectoryResponse()
+            {
+                CurrentDirectory = Environment.CurrentDirectory,
+                Suggestions = ConsoleExecutionEngine.GetSuggestions(Environment.CurrentDirectory)
+            }, token);
+        }
+
+        [ExternalBridgeRequestHandlerMethod(typeof(ConsoleCommandRequest))]
+        public async void OnConsoleCommandRequest(ConsoleCommandRequest request, String token, ITransporter transporter)
         {
             if (Enabled)
             {
                 try
                 {
                     ConsoleExecutionEngine engine = new ConsoleExecutionEngine();
-                    var result = await engine.Execute(command);
-                    await transporter.SendGenericResponse<ConsoleCommandExecutionResult>(result, token, new TransportResponseConfig()
+                    var result = await engine.Execute(request);
+                    await transporter.SendGenericResponse<ConsoleCommandResponse>(new ConsoleCommandResponse()
+                    {
+                        Output = result.Output,
+                        Suggestions = result.Suggestions,
+                        WorkingFolder = result.WorkingFolder
+                    }, token, new TransportResponseConfig()
                     {
                         Immediate = true,
                     });
@@ -44,7 +60,7 @@ namespace Tango.PPC.Common.Console
 
         public void OnReceiverDisconnected(ExternalBridgeReceiver receiver)
         {
-            
+
         }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Performance/DefaultPerformanceService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Performance/DefaultPerformanceService.cs
new file mode 100644
index 000000000..2279d204c
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Performance/DefaultPerformanceService.cs
@@ -0,0 +1,227 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Tango.Core;
+using Tango.Core.DI;
+using Tango.Integration.ExternalBridge;
+using Tango.Integration.ExternalBridge.Network.Performance;
+using Tango.PPC.Common.ExternalBridge;
+
+namespace Tango.PPC.Common.Performance
+{
+    [TangoCreateWhenRegistered]
+    public class DefaultPerformanceService : ExtendedObject, IPerformanceService
+    {
+        #region Nested Classes
+
+        public static class PerformanceInfo
+        {
+            [DllImport("psapi.dll", SetLastError = true)]
+            [return: MarshalAs(UnmanagedType.Bool)]
+            public static extern bool GetPerformanceInfo([Out] out PerformanceInformation PerformanceInformation, [In] int Size);
+
+            [StructLayout(LayoutKind.Sequential)]
+            public struct PerformanceInformation
+            {
+                public int Size;
+                public IntPtr CommitTotal;
+                public IntPtr CommitLimit;
+                public IntPtr CommitPeak;
+                public IntPtr PhysicalTotal;
+                public IntPtr PhysicalAvailable;
+                public IntPtr SystemCache;
+                public IntPtr KernelTotal;
+                public IntPtr KernelPaged;
+                public IntPtr KernelNonPaged;
+                public IntPtr PageSize;
+                public int HandlesCount;
+                public int ProcessCount;
+                public int ThreadCount;
+            }
+
+            public static Int64 GetPhysicalAvailableMemoryInMiB()
+            {
+                PerformanceInformation pi = new PerformanceInformation();
+                if (GetPerformanceInfo(out pi, Marshal.SizeOf(pi)))
+                {
+                    return Convert.ToInt64((pi.PhysicalAvailable.ToInt64() * pi.PageSize.ToInt64() / 1048576));
+                }
+                else
+                {
+                    return -1;
+                }
+
+            }
+
+            public static Int64 GetTotalMemoryInMiB()
+            {
+                PerformanceInformation pi = new PerformanceInformation();
+                if (GetPerformanceInfo(out pi, Marshal.SizeOf(pi)))
+                {
+                    return Convert.ToInt64((pi.PhysicalTotal.ToInt64() * pi.PageSize.ToInt64() / 1048576));
+                }
+                else
+                {
+                    return -1;
+                }
+
+            }
+        }
+
+        #endregion
+
+        private class PerformanceClient
+        {
+            public ExternalBridgeReceiver Receiver { get; set; }
+            public String Token { get; set; }
+        }
+
+        private List<PerformanceClient> _clients;
+        private PerformancePackage _package;
+        private bool _isStarted;
+        private Thread _performanceThread;
+
+        public bool Enabled { get; set; } = true;
+
+        public DefaultPerformanceService(IPPCExternalBridgeService externalBridge)
+        {
+            _package = new PerformancePackage();
+            _clients = new List<PerformanceClient>();
+            externalBridge.RegisterRequestHandler(this);
+        }
+
+        [ExternalBridgeRequestHandlerMethod(typeof(StartPerformanceUpdatesRequest))]
+        public async void OnStartPerformanceUpdatesRequest(StartPerformanceUpdatesRequest request, String token, ExternalBridgeReceiver receiver)
+        {
+            if (Enabled)
+            {
+                try
+                {
+                    if (!_clients.Exists(x => x.Receiver == receiver))
+                    {
+                        _clients.Add(new PerformanceClient() { Receiver = receiver, Token = token });
+                        OnReceiversChanged();
+                    }
+
+                    await receiver.SendGenericResponse(new StartPerformanceUpdatesResponse() { Package = _package }, token);
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Error sending performance package.");
+                }
+            }
+        }
+
+        public void OnReceiverDisconnected(ExternalBridgeReceiver receiver)
+        {
+            _clients.RemoveAll(x => x.Receiver == receiver);
+            OnReceiversChanged();
+        }
+
+        private void OnReceiversChanged()
+        {
+            if (_clients.Count > 0 && !_isStarted)
+            {
+                _isStarted = true;
+                _performanceThread = new Thread(PerformanceThreadMethod);
+                _performanceThread.IsBackground = true;
+                _performanceThread.Start();
+            }
+            else if (_clients.Count == 0 && _isStarted)
+            {
+                _isStarted = false;
+            }
+        }
+
+        private async void PerformanceThreadMethod()
+        {
+            while (_isStarted)
+            {
+                try
+                {
+                    _package.ApplicationCPU = (int)GetAppCPU();
+                    _package.CPU = (int)GetTotalCPU();
+                    _package.ApplicationRAM = (int)BytesToMegaBytes(GetAppRam());
+                    _package.MaxRAM = (int)BytesToMegaBytes((long)new Microsoft.VisualBasic.Devices.ComputerInfo().TotalPhysicalMemory);
+                    _package.RAM = _package.MaxRAM - (int)PerformanceInfo.GetPhysicalAvailableMemoryInMiB();
+
+                    DriveInfo info = new DriveInfo("C");
+                    _package.DiskCapacity = (int)BytesToMegaBytes(info.TotalSize);
+                    _package.AvailableDiskSpace = (int)BytesToMegaBytes(info.AvailableFreeSpace);
+                    _package.DateTime = DateTime.Now;
+
+                    foreach (var client in _clients.ToList())
+                    {
+                        try
+                        {
+                            await client.Receiver.SendGenericResponse(new StartPerformanceUpdatesResponse() { Package = _package }, client.Token);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, "Error sending performance package.");
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Error creating performance package.");
+                }
+
+                Thread.Sleep(200);
+            }
+        }
+
+        #region Helpers
+
+        private float BytesToMegaBytes(long bytes)
+        {
+            return bytes / 1024f / 1024f;
+        }
+
+        public float GetAppCPU()
+        {
+            PerformanceCounter cpuCounter = new PerformanceCounter();
+            cpuCounter.CategoryName = "Process";
+            cpuCounter.CounterName = "% Processor Time";
+            cpuCounter.InstanceName = Process.GetCurrentProcess().ProcessName;
+
+            // will always start at 0
+            float firstValue = cpuCounter.NextValue();
+            System.Threading.Thread.Sleep(1000);
+            // now matches task manager reading
+            float secondValue = cpuCounter.NextValue();
+
+            return secondValue / Environment.ProcessorCount;
+        }
+
+        public float GetTotalCPU()
+        {
+            PerformanceCounter cpuCounter = new PerformanceCounter();
+            cpuCounter.CategoryName = "Processor";
+            cpuCounter.CounterName = "% Processor Time";
+            cpuCounter.InstanceName = "_Total";
+
+            // will always start at 0
+            float firstValue = cpuCounter.NextValue();
+            System.Threading.Thread.Sleep(1000);
+            // now matches task manager reading
+            float secondValue = cpuCounter.NextValue();
+
+            return secondValue;
+        }
+
+        public long GetAppRam()
+        {
+            Process proc = Process.GetCurrentProcess();
+            return proc.PrivateMemorySize64;
+        }
+
+        #endregion
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Performance/IPerformanceService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Performance/IPerformanceService.cs
new file mode 100644
index 000000000..c3bfd1543
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Performance/IPerformanceService.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Integration.ExternalBridge;
+
+namespace Tango.PPC.Common.Performance
+{
+    public interface IPerformanceService : IExternalBridgeRequestHandler
+    {
+        bool Enabled { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/SystemInfo/DefaultSystemInfoService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/SystemInfo/DefaultSystemInfoService.cs
new file mode 100644
index 000000000..0f1c81416
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/SystemInfo/DefaultSystemInfoService.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core;
+using Tango.Core.DI;
+using Tango.Integration.ExternalBridge;
+using Tango.Integration.ExternalBridge.Network.Information;
+using Tango.PPC.Common.ExternalBridge;
+
+namespace Tango.PPC.Common.SystemInfo
+{
+    [TangoCreateWhenRegistered]
+    public class DefaultSystemInfoService : ExtendedObject, ISystemInfoService, IExternalBridgeRequestHandler
+    {
+        public bool Enabled { get; set; } = true;
+
+        private GetMachineInformationResponse response;
+
+        public DefaultSystemInfoService(IPPCExternalBridgeService externalBridge)
+        {
+            externalBridge.RegisterRequestHandler(this);
+        }
+
+        [ExternalBridgeRequestHandlerMethod(typeof(GetMachineInformationRequest))]
+        public async void OnGetMachineInformationRequest(GetMachineInformationRequest request, String token, ExternalBridgeReceiver receiver)
+        {
+            try
+            {
+                if (response == null)
+                {
+                    response = new GetMachineInformationResponse()
+                    {
+                        Package = new InformationPackage()
+                        {
+                            System = Tango.SystemInfo.SystemObjectsCollection.Create(),
+                        }
+                    };
+                }
+
+                await receiver.SendGenericResponse(response, token);
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error sending system information.");
+            }
+        }
+
+        public void OnReceiverDisconnected(ExternalBridgeReceiver receiver)
+        {
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/SystemInfo/ISystemInfoService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/SystemInfo/ISystemInfoService.cs
new file mode 100644
index 000000000..0cc493891
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/SystemInfo/ISystemInfoService.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.PPC.Common.SystemInfo
+{
+    public interface ISystemInfoService
+    {
+        bool Enabled { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
index f7b3f9e4c..4551fe427 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
@@ -72,6 +72,7 @@
     <Reference Include="Microsoft.Azure.Common.NetFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.SqlServer.AzureStorageEnum, Version=14.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -159,6 +160,8 @@
     <Compile Include="MachineSetup\MachineSetupManager.cs" />
     <Compile Include="MachineSetup\MachineSetupProgress.cs" />
     <Compile Include="MachineSetup\MachineSetupResult.cs" />
+    <Compile Include="Performance\DefaultPerformanceService.cs" />
+    <Compile Include="Performance\IPerformanceService.cs" />
     <Compile Include="RemoteDesktop\DefaultRemoteDesktopService.cs" />
     <Compile Include="RemoteDesktop\IRemoteDesktopService.cs" />
     <Compile Include="Synchronization\DefaultMachineDataSynchronizer.cs" />
@@ -167,6 +170,8 @@
     <Compile Include="Synchronization\SynchronizationState.cs" />
     <Compile Include="Synchronization\SynchronizationStatus.cs" />
     <Compile Include="Synchronization\SynchronizationStatusChangedEventArgs.cs" />
+    <Compile Include="SystemInfo\DefaultSystemInfoService.cs" />
+    <Compile Include="SystemInfo\ISystemInfoService.cs" />
     <Compile Include="UpdatePackages\DefaultPackageRunner.cs" />
     <Compile Include="UpdatePackages\IPackageRunner.cs" />
     <Compile Include="UpdatePackages\IPPCPackage.cs" />
@@ -391,6 +396,10 @@
       <Project>{e1e66ed9-597d-45fa-8048-de90a6930484}</Project>
       <Name>Tango.SQLExaminer</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tango.SystemInfo\Tango.SystemInfo.csproj">
+      <Project>{997a961c-beda-4b56-aa0f-c39e532f7ffa}</Project>
+      <Name>Tango.SystemInfo</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Tango.Touch\Tango.Touch.csproj">
       <Project>{fd86424c-6e84-491b-8df9-3d0f5c236a2a}</Project>
       <Name>Tango.Touch</Name>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
index a8cbcfe2d..9e150221d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
@@ -20,11 +20,13 @@ using Tango.PPC.Common.Modules;
 using Tango.PPC.Common.Navigation;
 using Tango.PPC.Common.Notifications;
 using Tango.PPC.Common.OS;
+using Tango.PPC.Common.Performance;
 using Tango.PPC.Common.Printing;
 using Tango.PPC.Common.RemoteAssistance;
 using Tango.PPC.Common.RemoteDesktop;
 using Tango.PPC.Common.Storage;
 using Tango.PPC.Common.Synchronization;
+using Tango.PPC.Common.SystemInfo;
 using Tango.PPC.Common.Threading;
 using Tango.PPC.Common.UpdatePackages;
 using Tango.PPC.Common.UWF;
@@ -82,6 +84,8 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Unregister<IMachineDataSynchronizer>();
             TangoIOC.Default.Unregister<IConsoleEngineService>();
             TangoIOC.Default.Unregister<IRemoteDesktopService>();
+            TangoIOC.Default.Unregister<IPerformanceService>();
+            TangoIOC.Default.Unregister<ISystemInfoService>();
 
             if (App.StartupArgs.Contains("-webDebug"))
             {
@@ -117,6 +121,8 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Register<IUnifiedWriteFilterManager, AlternativeUnifiedWriteFilterManager>();
             TangoIOC.Default.Register<IOperationSystemManager, DefaultOperationSystemManager>();
             TangoIOC.Default.Register<IBackupManager, DefaultBackupManager>();
+            TangoIOC.Default.Register<IPerformanceService, DefaultPerformanceService>();
+            TangoIOC.Default.Register<ISystemInfoService, DefaultSystemInfoService>();
 
             TangoIOC.Default.Register<LoadingViewVM>();
             TangoIOC.Default.Register<MainViewVM>();