6 Commits
5 changed files with 282 additions and 262 deletions
+3
View File
@@ -0,0 +1,3 @@
/.vs
/Bot-Utils/obj
/Bot-Utils/bin
+6
View File
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "..\Utils-IoT\U
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "..\Utils\Utils\Utils.csproj", "{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Posix", "..\..\Librarys\Mono.Posix\Mono.Posix\Mono.Posix.csproj", "{E2CA132E-E85C-40AD-BE94-B138AA68772B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.Build.0 = Release|Any CPU
{E2CA132E-E85C-40AD-BE94-B138AA68772B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E2CA132E-E85C-40AD-BE94-B138AA68772B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E2CA132E-E85C-40AD-BE94-B138AA68772B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E2CA132E-E85C-40AD-BE94-B138AA68772B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
+4 -3
View File
@@ -35,9 +35,6 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Posix">
<HintPath>..\..\Zway-Bot\packages\Mono.Posix.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -69,6 +66,10 @@
<Project>{91a14cd2-2940-4500-8193-56d37edddbaa}</Project>
<Name>litjson_4.7.1</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Librarys\Mono.Posix\Mono.Posix\Mono.Posix.csproj">
<Project>{e2ca132e-e85c-40ad-be94-b138aa68772b}</Project>
<Name>Mono.Posix</Name>
</ProjectReference>
<ProjectReference Include="..\..\Utils-IoT\Utils-IoT\Utils-IoT.csproj">
<Project>{b870e4d5-6806-4a0b-b233-8907eedc5afc}</Project>
<Name>Utils-IoT</Name>
+10 -6
View File
@@ -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 - 02.10.2018")]
[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,9 +32,13 @@ 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.0")]
[assembly: AssemblyFileVersion("1.1.0")]
[assembly: AssemblyVersion("1.1.4")]
[assembly: AssemblyFileVersion("1.1.4")]
/*
* 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
*/
+9 -3
View File
@@ -55,22 +55,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;