Fixing issue #2.

mattkol · mattkol · commit 119b181a1fef · 2020-11-22T07:10:26.000-05:00
diff --git a/src/Chromely.CefSharp/Browser/Handlers/DefaultAssemblyResourceSchemeHandler.cs b/src/Chromely.CefSharp/Browser/Handlers/DefaultAssemblyResourceSchemeHandler.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Net;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using CefSharp;
@@ -56,17 +57,15 @@ public override CefReturnValue ProcessRequestAsync(IRequest request, ICallback c
             // Check if file exists 
             if (!fileInfo.Exists)
             {
-                StatusCode = (int)HttpStatusCode.NotFound;
-                StatusText = STATUSTEXT_FILENOTFOUND;
+                SetResponseInfoOnFailure((int)HttpStatusCode.NotFound, STATUSTEXT_FILENOTFOUND);
                 callback.Continue();
 
                 Logger.Instance.Log.LogWarning($"File: {file}: {StatusText}");
             }
             // Check if file exists but empty
             else if (fileInfo.Length == 0)
             {
-                StatusCode = (int)HttpStatusCode.BadRequest;
-                StatusText = STATUSTEXT_ZEROFILESIZE;
+                SetResponseInfoOnFailure((int)HttpStatusCode.BadRequest, STATUSTEXT_ZEROFILESIZE);
                 callback.Continue();
 
                 Logger.Instance.Log.LogWarning($"File: {file}: {StatusText}");
@@ -89,9 +88,7 @@ public override CefReturnValue ProcessRequestAsync(IRequest request, ICallback c
                         }
                         catch (Exception exception)
                         {
-                            _stream = null;
-                            StatusCode = (int)HttpStatusCode.BadRequest;
-                            StatusText = STATUSTEXT_BADREQUEST;
+                            SetResponseInfoOnFailure((int)HttpStatusCode.BadRequest, STATUSTEXT_BADREQUEST);
                             Logger.Instance.Log.LogError(exception, exception.Message);
                         }
 
@@ -163,5 +160,12 @@ protected void SetResponseInfoOnSuccess()
             StatusText = STATUSTEXT_OK;
             Stream = _stream;
         }
+
+        protected void SetResponseInfoOnFailure(int status, string statusText)
+        {
+            _stream = GetMemoryStream(statusText, Encoding.UTF8);
+            StatusCode = status;
+            StatusText = statusText;
+        }
     }
 }
diff --git a/src/Chromely.CefSharp/Browser/Handlers/DefaultResourceSchemeHandler.cs b/src/Chromely.CefSharp/Browser/Handlers/DefaultResourceSchemeHandler.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Net;
+using System.Text;
 using System.Threading.Tasks;
 using CefSharp;
 using Chromely.Core.Logging;
@@ -49,17 +50,15 @@ public override CefReturnValue ProcessRequestAsync(IRequest request, ICallback c
             // Check if file exists 
             if (!fileInfo.Exists)
             {
-                StatusCode = (int)HttpStatusCode.NotFound;
-                StatusText = STATUSTEXT_FILENOTFOUND;
+                SetResponseInfoOnFailure((int)HttpStatusCode.NotFound, STATUSTEXT_FILENOTFOUND);
                 callback.Continue();
 
                 Logger.Instance.Log.LogWarning($"File: {file}: {StatusText}");
             }
             // Check if file exists but empty
             else if (fileInfo.Length == 0)
             {
-                StatusCode = (int)HttpStatusCode.BadRequest;
-                StatusText = STATUSTEXT_ZEROFILESIZE;
+                SetResponseInfoOnFailure((int)HttpStatusCode.BadRequest, STATUSTEXT_ZEROFILESIZE);
                 callback.Continue();
 
                 Logger.Instance.Log.LogWarning($"File: {file}: {StatusText}");
@@ -83,9 +82,7 @@ public override CefReturnValue ProcessRequestAsync(IRequest request, ICallback c
                         }
                         catch (Exception exception)
                         {
-                            _stream = null;
-                            StatusCode = (int)HttpStatusCode.BadRequest;
-                            StatusText = STATUSTEXT_BADREQUEST;
+                            SetResponseInfoOnFailure((int)HttpStatusCode.BadRequest, STATUSTEXT_BADREQUEST);
                             Logger.Instance.Log.LogError(exception, exception.Message);
                         }
 
@@ -116,5 +113,12 @@ protected virtual void SetResponseInfoOnSuccess()
             StatusText = STATUSTEXT_OK;
             Stream = _stream;
         }
+
+        protected void SetResponseInfoOnFailure(int status, string statusText)
+        {
+            _stream = GetMemoryStream(statusText, Encoding.UTF8);
+            StatusCode = status;
+            StatusText = statusText;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System;`
`5`	`5`	`using System.IO;`
`6`	`6`	`using System.Net;`
	`7`	`+using System.Text;`
`7`	`8`	`using System.Text.RegularExpressions;`
`8`	`9`	`using System.Threading.Tasks;`
`9`	`10`	`using CefSharp;`
`@@ -56,17 +57,15 @@ public override CefReturnValue ProcessRequestAsync(IRequest request, ICallback c`
`56`	`57`	`// Check if file exists`
`57`	`58`	`if (!fileInfo.Exists)`
`58`	`59`	`{`
`59`		`- StatusCode = (int)HttpStatusCode.NotFound;`
`60`		`- StatusText = STATUSTEXT_FILENOTFOUND;`
	`60`	`+ SetResponseInfoOnFailure((int)HttpStatusCode.NotFound, STATUSTEXT_FILENOTFOUND);`
`61`	`61`	`callback.Continue();`
`62`	`62`
`63`	`63`	`Logger.Instance.Log.LogWarning($"File: {file}: {StatusText}");`
`64`	`64`	`}`
`65`	`65`	`// Check if file exists but empty`
`66`	`66`	`else if (fileInfo.Length == 0)`
`67`	`67`	`{`
`68`		`- StatusCode = (int)HttpStatusCode.BadRequest;`
`69`		`- StatusText = STATUSTEXT_ZEROFILESIZE;`
	`68`	`+ SetResponseInfoOnFailure((int)HttpStatusCode.BadRequest, STATUSTEXT_ZEROFILESIZE);`
`70`	`69`	`callback.Continue();`
`71`	`70`
`72`	`71`	`Logger.Instance.Log.LogWarning($"File: {file}: {StatusText}");`
`@@ -89,9 +88,7 @@ public override CefReturnValue ProcessRequestAsync(IRequest request, ICallback c`
`89`	`88`	`}`
`90`	`89`	`catch (Exception exception)`
`91`	`90`	`{`
`92`		`- _stream = null;`
`93`		`- StatusCode = (int)HttpStatusCode.BadRequest;`
`94`		`- StatusText = STATUSTEXT_BADREQUEST;`
	`91`	`+ SetResponseInfoOnFailure((int)HttpStatusCode.BadRequest, STATUSTEXT_BADREQUEST);`
`95`	`92`	`Logger.Instance.Log.LogError(exception, exception.Message);`
`96`	`93`	`}`
`97`	`94`
`@@ -163,5 +160,12 @@ protected void SetResponseInfoOnSuccess()`
`163`	`160`	`StatusText = STATUSTEXT_OK;`
`164`	`161`	`Stream = _stream;`
`165`	`162`	`}`
	`163`	`+`
	`164`	`+ protected void SetResponseInfoOnFailure(int status, string statusText)`
	`165`	`+ {`
	`166`	`+ _stream = GetMemoryStream(statusText, Encoding.UTF8);`
	`167`	`+ StatusCode = status;`
	`168`	`+ StatusText = statusText;`
	`169`	`+ }`
`166`	`170`	`}`
`167`	`171`	`}`