Merge pull request #13 from CenterEdge/issue12-refreshlogexception

Issue #12: Fix Ctrl-R causes exception and no reload
CenterEdge · Dec 29, 2016 · d12ae5e · d12ae5e
2 parents 7b89ace + 483fcfd
commit d12ae5e
Show file tree

Hide file tree

Showing 5 changed files with 222 additions and 22 deletions.
diff --git a/src/Positron.UI/Internal/KeyboardHandler.cs b/src/Positron.UI/Internal/KeyboardHandler.cs
@@ -26,33 +26,44 @@ public KeyboardHandler(CefSettings settings, ILogger<KeyboardHandler> logger)
 
         public bool OnKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey)
         {
-            var isHandled = false;
-
-            switch (type)
+            try
             {
-                case KeyType.RawKeyDown:
-                    if (windowsKeyCode == F12Code && Settings.RemoteDebuggingPort != default(int))
-                    {
-                        _logger.LogInformation(LoggerEventIds.OpenDebugTools, "F12: Opening debug tools");
+                var isHandled = false;
 
-                        Process.Start("chrome.exe", "http://localhost:" + Settings.RemoteDebuggingPort);
-                        isHandled = true;
-                    }
-                    break;
-                case KeyType.KeyUp:
-                    break;
-                case KeyType.Char:
-                    if (windowsKeyCode == ControlRCode)
-                    {
-                        _logger.LogInformation(LoggerEventIds.Refresh, "Ctrl-R: Triggering reload of '{0}'", browserControl.Address);
+                switch (type)
+                {
+                    case KeyType.RawKeyDown:
+                        if (windowsKeyCode == F12Code && Settings.RemoteDebuggingPort != default(int))
+                        {
+                            _logger.LogInformation(LoggerEventIds.OpenDebugTools, "F12: Opening debug tools");
 
-                        browserControl.Reload();
-                        isHandled = true;
-                    }
-                    break;
+                            Process.Start("chrome.exe", "http://localhost:" + Settings.RemoteDebuggingPort);
+                            isHandled = true;
+                        }
+                        break;
+                    case KeyType.KeyUp:
+                        break;
+                    case KeyType.Char:
+                        if (windowsKeyCode == ControlRCode)
+                        {
+                            _logger.LogInformation(LoggerEventIds.Refresh, "Ctrl-R: Triggering reload of '{0}'",
+                                browser.MainFrame?.Url ?? "unknown");
+
+                            browserControl.Reload();
+                            isHandled = true;
+                        }
+                        break;
+                }
+
+                return isHandled;
             }
+            catch (Exception ex)
+            {
+                // Unhandled exceptions may cause app crash, so trap and log
+                _logger.LogError(LoggerEventIds.UnhandledError, ex, Resources.LogMessage_Unhandled_Error);
 
-            return isHandled;
+                return false;
+            }
         }
 
         public bool OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut)

diff --git a/src/Positron.UI/Internal/LoggerEventIds.cs b/src/Positron.UI/Internal/LoggerEventIds.cs
@@ -2,6 +2,8 @@
 {
     internal static class LoggerEventIds
     {
+        public const int UnhandledError = 0;
+
         // PositronResourceHandler
         public const int RequestStarting = 1;
         public const int RequestFinished = 2;

diff --git a/src/Positron.UI/Positron.UI.csproj b/src/Positron.UI/Positron.UI.csproj
@@ -80,6 +80,11 @@
     <Compile Include="Internal\RequestHandler.cs" />
     <Compile Include="Internal\PositronUi.cs" />
     <Compile Include="ResourceRequestContext.cs" />
+    <Compile Include="Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="project.json" />
@@ -100,6 +105,12 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/src/Positron.UI/Resources.Designer.cs b/src/Positron.UI/Resources.Designer.cs
diff --git a/src/Positron.UI/Resources.resx b/src/Positron.UI/Resources.resx
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+  <data name="LogMessage_Unhandled_Error" xml:space="preserve">
+    <value>Unhandled Error</value>
+  </data>
+</root>