From a6c2e1107a120fdd47791a1fcf0f5f95433090f6 Mon Sep 17 00:00:00 2001
From: josesimoes <jose.simoes@eclo.solutions>
Date: Mon, 2 Nov 2020 17:24:59 +0000
Subject: [PATCH 1/2] Add method to return MIME-type given a file name

---
 WebServer/WebServer.cs | 35 +++--------------------------------
 1 file changed, 3 insertions(+), 32 deletions(-)

diff --git a/WebServer/WebServer.cs b/WebServer/WebServer.cs
index f323899..375e371 100644
--- a/WebServer/WebServer.cs
+++ b/WebServer/WebServer.cs
@@ -418,38 +418,8 @@ public static void OutputHttpCode(HttpListenerResponse response, HttpStatusCode
         /// </summary>
         public static void SendFileOverHTTP(HttpListenerResponse response, StorageFile strFilePath)
         {
-            string ContentType = "text/html";
-            //determine the type of file for the http header
-            if (strFilePath.FileType.ToLower() == ".cs" ||
-                strFilePath.FileType.ToLower() == ".txt" ||
-                strFilePath.FileType.ToLower() == ".csproj"
-            )
-            {
-                ContentType = "text/plain";
-            }
-            else if (strFilePath.FileType.ToLower() == ".jpg" ||
-                strFilePath.FileType.ToLower() == ".bmp" ||
-                strFilePath.FileType.ToLower() == ".jpeg" ||
-                strFilePath.FileType.ToLower() == ".png"
-              )
-            {
-                ContentType = "image";
-            }
-            else if (strFilePath.FileType.ToLower() == ".htm" ||
-                strFilePath.FileType.ToLower() == ".html"
-              )
-            {
-                ContentType = "text/html";
-            }
-            else if (strFilePath.FileType.ToLower() == ".mp3")
-            {
-                ContentType = "audio/mpeg";
-            }
-            else if (strFilePath.FileType.ToLower() == ".css")
-            {
-                ContentType = "text/css";
-            }
-
+            string ContentType = GetContentTypeFromFileName(strFilePath.FileType);
+           
             try
             {
                 IBuffer readBuffer = FileIO.ReadBuffer(strFilePath);
@@ -651,6 +621,7 @@ private void ListInterfaces()
             }
         }
 
+        /// Get the MIME-type for a file name.
         /// <summary>
         /// Dispose of any resources.
         /// </summary>

From 27eef7ad29ba23e80280ab08e213a65df44fc82d Mon Sep 17 00:00:00 2001
From: josesimoes <jose.simoes@eclo.solutions>
Date: Mon, 2 Nov 2020 17:37:25 +0000
Subject: [PATCH 2/2] Add favicon to webserver sample

- Add icon as resource (mind that editing a resource file is NOT working in VS2019).
- Add processing for sending favicon (requires previous merge of #6).
---
 WebServer.Sample/Program.cs              |   6 +-
 WebServer.Sample/Resources.Designer.cs   |  38 +++++++
 WebServer.Sample/Resources.resx          | 124 +++++++++++++++++++++++
 WebServer.Sample/Resources/favicon.ico   | Bin 0 -> 1150 bytes
 WebServer.Sample/WebServer.Sample.nfproj |  19 ++++
 WebServer.Sample/packages.config         |   1 +
 6 files changed, 187 insertions(+), 1 deletion(-)
 create mode 100644 WebServer.Sample/Resources.Designer.cs
 create mode 100644 WebServer.Sample/Resources.resx
 create mode 100644 WebServer.Sample/Resources/favicon.ico

diff --git a/WebServer.Sample/Program.cs b/WebServer.Sample/Program.cs
index bbe3b0d..fadbe0b 100644
--- a/WebServer.Sample/Program.cs
+++ b/WebServer.Sample/Program.cs
@@ -16,6 +16,7 @@
 using System.Text;
 using System.Net;
 using System.Security.Cryptography.X509Certificates;
+using WebServer.Sample;
 
 #if HAS_WIFI
 using Windows.Devices.WiFi;
@@ -331,7 +332,10 @@ private static void ServerCommandReceived(object source, WebServerEventArgs e)
                         ApiDefault(e);
                     }
                 }
-
+                else if (url.ToLower().IndexOf("/favicon.ico") == 0)
+                {
+                    WebServer.SendFileOverHTTP(e.Context.Response, "favicon.ico", Resources.GetBytes(Resources.BinaryResources.favicon));
+                }
 #if HAS_STORAGE
                 else
                 {
diff --git a/WebServer.Sample/Resources.Designer.cs b/WebServer.Sample/Resources.Designer.cs
new file mode 100644
index 0000000..63a7fbd
--- /dev/null
+++ b/WebServer.Sample/Resources.Designer.cs
@@ -0,0 +1,38 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebServer.Sample
+{
+    
+    internal partial class Resources
+    {
+        private static System.Resources.ResourceManager manager;
+        internal static System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if ((Resources.manager == null))
+                {
+                    Resources.manager = new System.Resources.ResourceManager("WebServer.Sample.Resources", typeof(Resources).Assembly);
+                }
+                return Resources.manager;
+            }
+        }
+        internal static byte[] GetBytes(Resources.BinaryResources id)
+        {
+            return ((byte[])(nanoFramework.Runtime.Native.ResourceUtility.GetObject(ResourceManager, id)));
+        }
+        [System.SerializableAttribute()]
+        internal enum BinaryResources : short
+        {
+            favicon = -22914,
+        }
+    }
+}
diff --git a/WebServer.Sample/Resources.resx b/WebServer.Sample/Resources.resx
new file mode 100644
index 0000000..149ef4f
--- /dev/null
+++ b/WebServer.Sample/Resources.resx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    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">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </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.Runtime.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:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <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" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </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>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="favicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\favicon.ico;System.Byte[], mscorlib, Version=1.9.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebServer.Sample/Resources/favicon.ico b/WebServer.Sample/Resources/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..03a028f0cee5cfca6208c2472a7ef09fcbc549b4
GIT binary patch
literal 1150
zcma))Jt)Ls9LK-PXdq>gvN4!$@sc`&7?hNBS8NOhWs=Lnpp;1|MU-T8ce+6-gUv!l
zq`V{p<zA3GuYaGPJN2YL?ym3szR&mN`9JscmrD4Smy6$84VOw)lIj5xN?vD3c*T4o
zA@zcZ@sI|J$-9}{f~r$7-KJyOW_p>pnqB`to{VXk-n`}5V+|z!>$rX@t~vVeoIlL`
zV7=@5#c+BnAPGDJdvz4kBNyP#+TASu9or+jrAGV;*K;|UE|9Y<c>Lk*6?F67lTp>U
zzH#)kyQq2!{Dt)!ceix2p=stR>x1#ITH%Y}!Ka@kGs+p8m>=MkoZbH_{28RIla8t%
ze)+S1x2XX7*L^XsT|XVye!;VI8HQZ{n@{zrgy+|NuWj=Dgmu#i4dQi!7T5RV<S)S^
zI0F}vu!4R$KaKn$ILfZ8o9Sg@n)S>5rqMai9;wrO&VC9X`7P_GbH5|@TySEO|J&x5
u`%B{;Y@inz>r>fZIrBVE%7OdIJaSAgC|%7+$CaQu&rLJWa!+2qW8F_W-sWon

literal 0
HcmV?d00001

diff --git a/WebServer.Sample/WebServer.Sample.nfproj b/WebServer.Sample/WebServer.Sample.nfproj
index 137101a..cb415b9 100644
--- a/WebServer.Sample/WebServer.Sample.nfproj
+++ b/WebServer.Sample/WebServer.Sample.nfproj
@@ -25,6 +25,11 @@
     <Compile Include="NetworkHelpers.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\WebServer\WebServer.nfproj" />
@@ -38,6 +43,11 @@
       <Private>True</Private>
       <SpecificVersion>True</SpecificVersion>
     </Reference>
+    <Reference Include="nanoFramework.ResourceManager, Version=1.1.2.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\packages\nanoFramework.ResourceManager.1.1.2-preview.11\lib\nanoFramework.ResourceManager.dll</HintPath>
+      <Private>True</Private>
+      <SpecificVersion>True</SpecificVersion>
+    </Reference>
     <Reference Include="nanoFramework.Runtime.Events, Version=1.8.2.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.Runtime.Events.1.8.2-preview.10\lib\nanoFramework.Runtime.Events.dll</HintPath>
       <Private>True</Private>
@@ -84,6 +94,15 @@
       <SpecificVersion>True</SpecificVersion>
     </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources.resx">
+      <Generator>nFResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\favicon.ico" />
+  </ItemGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
   <ProjectExtensions>
     <ProjectCapabilities>
diff --git a/WebServer.Sample/packages.config b/WebServer.Sample/packages.config
index 4af3204..05fc831 100644
--- a/WebServer.Sample/packages.config
+++ b/WebServer.Sample/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="nanoFramework.CoreLibrary" version="1.9.1-preview.6" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.ResourceManager" version="1.1.2-preview.11" targetFramework="netnanoframework10" />
   <package id="nanoFramework.Runtime.Events" version="1.8.2-preview.10" targetFramework="netnanoframework10" />
   <package id="nanoFramework.System.Collections" version="1.2.0-preview.14" targetFramework="netnanoframework10" />
   <package id="nanoFramework.System.Device.Gpio" version="1.0.0-preview.14" targetFramework="netnanoframework10" />