[v1.1.5] add a function to send an object as json directly

Bot-Utils/Properties/AssemblyInfo.cs

@@ -6,12 +6,12 @@ using System.Runtime.InteropServices;
 // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
 // die einer Assembly zugeordnet sind.
 [assembly: AssemblyTitle("Bot-Utils")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Bot-Utils are helpers for programming a bot")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("BlubbFish")]
 [assembly: AssemblyProduct("Bot-Utils")]
-[assembly: AssemblyCopyright("Copyright ©  2018 - 17.02.2019")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCopyright("Copyright ©  2018 - 12.03.2019")]
+[assembly: AssemblyTrademark("© BlubbFish")]
 [assembly: AssemblyCulture("")]
 
 // Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
@@ -32,10 +32,14 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.1")]
-[assembly: AssemblyFileVersion("1.1.1")]
+[assembly: AssemblyVersion("1.1.5")]
+[assembly: AssemblyFileVersion("1.1.5")]
 
 /*
  * 1.1.0 Remove Helper from Bot-Utils
  * 1.1.1 Update to local librarys
+ * 1.1.2 Fixing bug for Contenttype
+ * 1.1.3 Variables parsing now as a String
+ * 1.1.4 add Woff as Binary type
+ * 1.1.5 add a function to send an object as json directly
  */

Bot-Utils/Webserver.cs

@@ -1,5 +1,6 @@
 using BlubbFish.Utils.IoT.Connector;
 using BlubbFish.Utils.IoT.Events;
+using LitJson;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -55,22 +56,28 @@ namespace BlubbFish.Utils.IoT.Bots
         String end = restr.IndexOf('.') != -1 ? restr.Substring(restr.IndexOf('.')+1) : "";
         if (File.Exists("resources/"+ restr)) {
           try {
-            if (end  == "png" || end == ".jpg" || end == ".jpeg" || end == ".ico") {
+            if (end  == "png" || end == "jpg" || end == "jpeg" || end == "ico" || end == "woff") {
               Byte[] output = File.ReadAllBytes("resources/" + restr);
+              switch(end) {
+                case "ico": cont.Response.ContentType = "image/x-ico"; break;
+                case "woff": cont.Response.ContentType = "font/woff"; break;
+              }
               cont.Response.OutputStream.Write(output, 0, output.Length);
-              cont.Response.ContentType = "image/"+end;
               return;
             } else {
               String file = File.ReadAllText("resources/" + restr);
               if (this.requests.GetSections(false).Contains(restr)) {
                 Dictionary<String, String> vars = this.requests.GetSection(restr);
                 foreach (KeyValuePair<String, String> item in vars) {
-                  file = file.Replace("{%" + item.Key.ToUpper() + "%}", item.Value);
+                  file = file.Replace("\"{%" + item.Key.ToUpper() + "%}\"", item.Value);
                 }
               }
               file = file.Replace("{%REQUEST_URL_HOST%}", cont.Request.Url.Host);
               Byte[] buf = Encoding.UTF8.GetBytes(file);
               cont.Response.ContentLength64 = buf.Length;
+              switch(end) {
+                case "css": cont.Response.ContentType = "text/css"; break;
+              }
               cont.Response.OutputStream.Write(buf, 0, buf.Length);
               Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
               return;
@@ -88,6 +95,13 @@ namespace BlubbFish.Utils.IoT.Bots
       return;
     }
 
+    protected void SendJsonResponse(Object data, HttpListenerContext cont) {
+      Byte[] buf = Encoding.UTF8.GetBytes(JsonMapper.ToJson(data));
+      cont.Response.ContentLength64 = buf.Length;
+      cont.Response.OutputStream.Write(buf, 0, buf.Length);
+      Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
+    }
+
     public void Dispose() {
       this.httplistener.Stop();
       this.httplistener.Close();