2 Commits
Author SHA1 Message Date
BlubbFish 031076b3ba [v1.1.5] add a function to send an object as json directly 2019-03-27 19:32:39 +01:00
BlubbFish 671388218e [1.1.4] add Woff as Binary type 2019-03-13 10:22:50 +01:00
2 changed files with 15 additions and 4 deletions
+5 -3
View File
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("BlubbFish")] [assembly: AssemblyCompany("BlubbFish")]
[assembly: AssemblyProduct("Bot-Utils")] [assembly: AssemblyProduct("Bot-Utils")]
[assembly: AssemblyCopyright("Copyright © 2018 - 09.03.2019")] [assembly: AssemblyCopyright("Copyright © 2018 - 12.03.2019")]
[assembly: AssemblyTrademark("© BlubbFish")] [assembly: AssemblyTrademark("© BlubbFish")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
@@ -32,12 +32,14 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben: // indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.3")] [assembly: AssemblyVersion("1.1.5")]
[assembly: AssemblyFileVersion("1.1.3")] [assembly: AssemblyFileVersion("1.1.5")]
/* /*
* 1.1.0 Remove Helper from Bot-Utils * 1.1.0 Remove Helper from Bot-Utils
* 1.1.1 Update to local librarys * 1.1.1 Update to local librarys
* 1.1.2 Fixing bug for Contenttype * 1.1.2 Fixing bug for Contenttype
* 1.1.3 Variables parsing now as a String * 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
*/ */
+10 -1
View File
@@ -1,5 +1,6 @@
using BlubbFish.Utils.IoT.Connector; using BlubbFish.Utils.IoT.Connector;
using BlubbFish.Utils.IoT.Events; using BlubbFish.Utils.IoT.Events;
using LitJson;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@@ -55,10 +56,11 @@ namespace BlubbFish.Utils.IoT.Bots
String end = restr.IndexOf('.') != -1 ? restr.Substring(restr.IndexOf('.')+1) : ""; String end = restr.IndexOf('.') != -1 ? restr.Substring(restr.IndexOf('.')+1) : "";
if (File.Exists("resources/"+ restr)) { if (File.Exists("resources/"+ restr)) {
try { 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); Byte[] output = File.ReadAllBytes("resources/" + restr);
switch(end) { switch(end) {
case "ico": cont.Response.ContentType = "image/x-ico"; break; 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.OutputStream.Write(output, 0, output.Length);
return; return;
@@ -93,6 +95,13 @@ namespace BlubbFish.Utils.IoT.Bots
return; 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() { public void Dispose() {
this.httplistener.Stop(); this.httplistener.Stop();
this.httplistener.Close(); this.httplistener.Close();