Compare commits
36
Commits
d9c42999ff
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1512aaadd8 | ||
|
|
4da5d08d2e | ||
|
|
543a0ead60 | ||
|
|
0a8f8564f5 | ||
|
|
1219212726 | ||
|
|
cfbfd53015 | ||
|
|
eea28bb0fb | ||
|
|
cbf79b8ec9 | ||
|
|
02b04760ac | ||
|
|
1d8a1b93c9 | ||
|
|
a6a0da2b93 | ||
|
|
0f5e7b5c01 | ||
|
|
0c359fa896 | ||
|
|
e325e28bcb | ||
|
|
4a5d427835 | ||
|
|
8a19394d72 | ||
|
|
f3b87d9b38 | ||
|
|
3e791e2543 | ||
|
|
f100cf0965 | ||
|
|
d3cea9a5f5 | ||
|
|
d4fdefb04f | ||
|
|
e582ef551a | ||
|
|
6eca000f44 | ||
|
|
ec4e1b7992 | ||
|
|
d31d0dde2e | ||
|
|
56cc4c39d6 | ||
|
|
07a4464202 | ||
|
|
d53cfc4fb7 | ||
|
|
2cf80e31d4 | ||
|
|
033b187876 | ||
|
|
179e39110e | ||
|
|
4a57a0f2d2 | ||
|
|
2976e32ade | ||
|
|
885df8059c | ||
|
|
8c0a61cf03 | ||
|
|
475fd71652 |
+30
@@ -1,3 +1,33 @@
|
||||
[submodule "Bot-Utils"]
|
||||
path = Bot-Utils
|
||||
url = http://git.blubbfish.net/vs_utils/Bot-Utils.git
|
||||
[submodule "ConnectorDataMosquitto"]
|
||||
path = ConnectorDataMosquitto
|
||||
url = http://git.blubbfish.net/vs_utils/ConnectorDataMosquitto.git
|
||||
[submodule "ConnectorDataMqtt"]
|
||||
path = ConnectorDataMqtt
|
||||
url = http://git.blubbfish.net/vs_utils/ConnectorDataMqtt.git
|
||||
[submodule "ConnectorUserTelegram"]
|
||||
path = ConnectorUserTelegram
|
||||
url = http://git.blubbfish.net/vs_utils/ConnectorUserTelegram.git
|
||||
[submodule "Iot-Interfaces"]
|
||||
path = Iot-Interfaces
|
||||
url = http://git.blubbfish.net/vs_utils/Iot-Interfaces.git
|
||||
[submodule "Utils"]
|
||||
path = Utils
|
||||
url = http://git.blubbfish.net/vs_utils/Utils.git
|
||||
[submodule "Utils-IoT"]
|
||||
path = Utils-IoT
|
||||
url = http://git.blubbfish.net/vs_utils/Utils-IoT.git
|
||||
[submodule "ConnectorDataGpsd"]
|
||||
path = ConnectorDataGpsd
|
||||
url = https://git.blubbfish.net/vs_utils/ConnectorDataGpsd.git
|
||||
[submodule "ConnectorDbMysql"]
|
||||
path = ConnectorDbMysql
|
||||
url = https://git.blubbfish.net/vs_utils/ConnectorDbMysql.git
|
||||
[submodule "ConnectorStorageInflux"]
|
||||
path = ConnectorStorageInflux
|
||||
url = https://git.blubbfish.net/vs_utils/ConnectorStorageInflux.git
|
||||
[submodule "ConnectorStorageJson"]
|
||||
path = ConnectorStorageJson
|
||||
url = https://git.blubbfish.net/vs_utils/ConnectorStorageJson.git
|
||||
|
||||
+1
-1
Submodule Bot-Utils updated: 610b5e11b0...21662a367e
Submodule
+1
Submodule ConnectorDataGpsd added at 4dff73eb68
Submodule
+1
Submodule ConnectorDataMosquitto added at c29ea883a4
@@ -1,31 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.28307.136
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMosquitto", "ConnectorDataMosquitto\ConnectorDataMosquitto.csproj", "{39235FAD-BA9D-4B51-82FC-6969967BEAE9}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "..\Utils-IoT\Utils-IoT\Utils-IoT.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {07F7B20A-51A7-4AB2-B202-8DDDF1397EFA}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@@ -1,54 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{39235FAD-BA9D-4B51-82FC-6969967BEAE9}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>BlubbFish.Utils.IoT.Connector.Data</RootNamespace>
|
||||
<AssemblyName>ConnectorDataMosquitto</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Mosquitto.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Utils-IoT.csproj">
|
||||
<Project>{b870e4d5-6806-4a0b-b233-8907eedc5afc}</Project>
|
||||
<Name>Utils-IoT</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
@@ -1,125 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Connector.Data {
|
||||
public class Mosquitto : ADataBackend, IDisposable {
|
||||
private Process p;
|
||||
private String message;
|
||||
|
||||
public override event MqttMessage MessageIncomming;
|
||||
public override event MqttMessage MessageSending;
|
||||
|
||||
public Mosquitto(Dictionary<String, String> mqtt_settings) {
|
||||
this.settings = mqtt_settings;
|
||||
//mosquitto_sub --cafile ca.pem --cert cert.pem --key cert.key -h swb.broker.flex4grid.eu -p 8883 -t "#" -v -d
|
||||
this.message = "";
|
||||
this.p = new Process();
|
||||
this.p.StartInfo.FileName = "mosquitto_sub";
|
||||
String topic = "#";
|
||||
String args = "-h " + this.settings["server"]+" ";
|
||||
if(this.settings.ContainsKey("port")) {
|
||||
args += "-p "+ this.settings["port"]+" ";
|
||||
}
|
||||
if (this.settings.ContainsKey("cafile")) {
|
||||
args += "--cafile " + this.settings["cafile"] + " ";
|
||||
}
|
||||
if (this.settings.ContainsKey("cert")) {
|
||||
args += "--cert " + this.settings["cert"] + " ";
|
||||
}
|
||||
if (this.settings.ContainsKey("key")) {
|
||||
args += "--key " + this.settings["key"] + " ";
|
||||
}
|
||||
if(this.settings.ContainsKey("topic")) {
|
||||
topic = this.settings["topic"];
|
||||
}
|
||||
this.p.StartInfo.Arguments = args+"-t \""+ topic + "\" -v -d";
|
||||
this.p.StartInfo.CreateNoWindow = true;
|
||||
this.p.StartInfo.UseShellExecute = false;
|
||||
this.p.StartInfo.RedirectStandardOutput = true;
|
||||
this.p.StartInfo.RedirectStandardError = true;
|
||||
this.p.OutputDataReceived += this.P_OutputDataReceived;
|
||||
this.p.ErrorDataReceived += this.P_ErrorDataReceived;
|
||||
this.p.Start();
|
||||
this.p.BeginOutputReadLine();
|
||||
|
||||
}
|
||||
|
||||
public override void Send(String topic, String data) {
|
||||
Process send = new Process();
|
||||
send.StartInfo.FileName = "mosquitto_pub";
|
||||
String args = "-h " + this.settings["server"] + " ";
|
||||
if (this.settings.ContainsKey("port")) {
|
||||
args += "-p " + this.settings["port"] + " ";
|
||||
}
|
||||
if (this.settings.ContainsKey("cafile")) {
|
||||
args += "--cafile " + this.settings["cafile"] + " ";
|
||||
}
|
||||
if (this.settings.ContainsKey("cert")) {
|
||||
args += "--cert " + this.settings["cert"] + " ";
|
||||
}
|
||||
if (this.settings.ContainsKey("key")) {
|
||||
args += "--key " + this.settings["key"] + " ";
|
||||
}
|
||||
send.StartInfo.Arguments = args + "-m \""+data.Replace("\"","\\\"")+"\" -t \""+topic+"\" -d";
|
||||
send.StartInfo.CreateNoWindow = true;
|
||||
send.StartInfo.UseShellExecute = false;
|
||||
send.StartInfo.RedirectStandardOutput = true;
|
||||
send.StartInfo.RedirectStandardError = true;
|
||||
send.Start();
|
||||
send.WaitForExit();
|
||||
MessageSending?.Invoke(this, new MqttEventArgs(data, topic));
|
||||
}
|
||||
|
||||
private void P_ErrorDataReceived(Object sender, DataReceivedEventArgs e) {
|
||||
if (e.Data != null) {
|
||||
throw new NotImplementedException(e.Data);
|
||||
}
|
||||
}
|
||||
|
||||
private void P_OutputDataReceived(Object sender, DataReceivedEventArgs e) {
|
||||
if (e.Data != null) {
|
||||
if (e.Data.StartsWith("Client mosqsub")) {
|
||||
if (this.message != "" && this.message.IndexOf(" received PUBLISH ") > 0) {
|
||||
MatchCollection matches = (new Regex("^Client mosqsub[\\|/].*received PUBLISH \\(.*,.*,.*,.*, '(.*)'.*\\)\\)\n[^ ]* (.*)$", RegexOptions.IgnoreCase | RegexOptions.Singleline)).Matches(this.message);
|
||||
String topic = matches[0].Groups[1].Value;
|
||||
String message = matches[0].Groups[2].Value.Trim();
|
||||
this.MessageIncomming?.Invoke(this, new MqttEventArgs(message, topic));
|
||||
}
|
||||
this.message = e.Data + "\n";
|
||||
} else {
|
||||
this.message += e.Data + "\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#region IDisposable Support
|
||||
private Boolean disposedValue = false; // Dient zur Erkennung redundanter Aufrufe.
|
||||
private readonly Dictionary<String, String> settings;
|
||||
|
||||
protected virtual void Dispose(Boolean disposing) {
|
||||
if (!this.disposedValue) {
|
||||
if (disposing) {
|
||||
this.p.CancelOutputRead();
|
||||
if (!this.p.HasExited) {
|
||||
this.p.Kill();
|
||||
}
|
||||
this.p.Close();
|
||||
}
|
||||
this.p = null;
|
||||
this.disposedValue = true;
|
||||
}
|
||||
}
|
||||
|
||||
~Mosquitto() {
|
||||
Dispose(false);
|
||||
}
|
||||
|
||||
public override void Dispose() {
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// Allgemeine Informationen über eine Assembly werden über die folgenden
|
||||
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
|
||||
// die einer Assembly zugeordnet sind.
|
||||
[assembly: AssemblyTitle("ConnectorDataMosquitto")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("ConnectorDataMosquitto")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2017")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
|
||||
// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von
|
||||
// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
|
||||
[assembly: Guid("39235fad-ba9d-4b51-82fc-6969967beae9")]
|
||||
|
||||
// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
|
||||
//
|
||||
// Hauptversion
|
||||
// Nebenversion
|
||||
// Buildnummer
|
||||
// Revision
|
||||
//
|
||||
// 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.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
Submodule
+1
Submodule ConnectorDataMqtt added at 5357b57489
@@ -1,37 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.28307.136
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMqtt", "ConnectorDataMqtt\ConnectorDataMqtt.csproj", "{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "..\Utils-IoT\Utils-IoT\Utils-IoT.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt_4.7.1", "..\..\Librarys\mqtt\M2Mqtt\M2Mqtt_4.7.1.csproj", "{A11AEF5A-B246-4FE8-8330-06DB73CC8074}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {B90F7B1F-FDD8-4B59-AAA5-218655C2716C}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@@ -1,51 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>BlubbFish.Utils.IoT.Connector.Data</RootNamespace>
|
||||
<AssemblyName>ConnectorDataMqtt</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Mqtt.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\..\..\Librarys\mqtt\M2Mqtt\M2Mqtt_4.7.1.csproj">
|
||||
<Project>{a11aef5a-b246-4fe8-8330-06db73cc8074}</Project>
|
||||
<Name>M2Mqtt_4.7.1</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\Utils-IoT.csproj">
|
||||
<Project>{b870e4d5-6806-4a0b-b233-8907eedc5afc}</Project>
|
||||
<Name>Utils-IoT</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
@@ -1,83 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
using uPLibrary.Networking.M2Mqtt;
|
||||
using uPLibrary.Networking.M2Mqtt.Messages;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Connector.Data {
|
||||
public class Mqtt : ADataBackend, IDisposable {
|
||||
private MqttClient client;
|
||||
|
||||
public Mqtt(Dictionary<String, String> settings) : base(settings) {
|
||||
Int32 port = 1883;
|
||||
if(this.settings.ContainsKey("port")) {
|
||||
port = Int32.Parse(this.settings["port"]);
|
||||
}
|
||||
this.client = new MqttClient(this.settings["server"], port, false, null, null, MqttSslProtocols.None);
|
||||
Connect();
|
||||
}
|
||||
|
||||
private void Connect() {
|
||||
this.client.MqttMsgPublishReceived += this.Client_MqttMsgPublishReceived;
|
||||
if (this.settings.ContainsKey("user") && this.settings.ContainsKey("pass")) {
|
||||
this.client.Connect(Guid.NewGuid().ToString(), this.settings["user"], this.settings["pass"]);
|
||||
} else {
|
||||
this.client.Connect(Guid.NewGuid().ToString());
|
||||
}
|
||||
if (this.settings.ContainsKey("topic")) {
|
||||
Int32 l = this.settings["topic"].Split(';').Length;
|
||||
Byte[] qos = new Byte[l];
|
||||
for (Int32 i = 0; i < qos.Length; i++) {
|
||||
qos[i] = MqttMsgBase.QOS_LEVEL_AT_LEAST_ONCE;
|
||||
}
|
||||
this.client.Subscribe(this.settings["topic"].Split(';'), qos);
|
||||
} else {
|
||||
this.client.Subscribe(new String[] { "#" }, new Byte[] { MqttMsgBase.QOS_LEVEL_AT_LEAST_ONCE });
|
||||
}
|
||||
}
|
||||
|
||||
private void Client_MqttMsgPublishReceived(Object sender, MqttMsgPublishEventArgs e) {
|
||||
this.NotifyClientIncomming(new DataEvent(Encoding.UTF8.GetString(e.Message), e.Topic, DateTime.Now));
|
||||
}
|
||||
|
||||
public override void Send(String topic, String data) {
|
||||
this.client.Publish(topic, Encoding.UTF8.GetBytes(data));
|
||||
this.NotifyClientSending(new DataEvent(data, topic, DateTime.Now));
|
||||
}
|
||||
|
||||
#region IDisposable Support
|
||||
private Boolean disposedValue = false;
|
||||
|
||||
public override Boolean IsConnected {
|
||||
get {
|
||||
if(this.client != null) {
|
||||
return this.client.IsConnected;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void Dispose(Boolean disposing) {
|
||||
if(!this.disposedValue) {
|
||||
if(disposing) {try {
|
||||
this.client.MqttMsgPublishReceived -= this.Client_MqttMsgPublishReceived;
|
||||
this.client.Unsubscribe(new String[] { "#" });
|
||||
this.client.Disconnect();
|
||||
} catch (Exception) { }
|
||||
}
|
||||
|
||||
this.client = null;
|
||||
|
||||
this.disposedValue = true;
|
||||
}
|
||||
}
|
||||
|
||||
public override void Dispose() {
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// Allgemeine Informationen über eine Assembly werden über die folgenden
|
||||
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
|
||||
// die einer Assembly zugeordnet sind.
|
||||
[assembly: AssemblyTitle("ConnectorDataMqtt")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("ConnectorDataMqtt")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2017")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
|
||||
// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von
|
||||
// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
|
||||
[assembly: Guid("ee6c8f68-ed46-4c1c-abdd-cfcdf75104f2")]
|
||||
|
||||
// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
|
||||
//
|
||||
// Hauptversion
|
||||
// Nebenversion
|
||||
// Buildnummer
|
||||
// Revision
|
||||
//
|
||||
// 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.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
Submodule
+1
Submodule ConnectorDbMysql added at dde495e2ff
Submodule
+1
Submodule ConnectorStorageInflux added at a890cbae9b
Submodule
+1
Submodule ConnectorStorageJson added at da0d3614a3
Submodule
+1
Submodule ConnectorUserTelegram added at 75f53ca419
@@ -1,31 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.28307.136
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorUserTelegram", "ConnectorUserTelegram\ConnectorUserTelegram.csproj", "{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "..\Utils-IoT\Utils-IoT\Utils-IoT.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {7C826771-09A9-44C6-BC5F-E7E8BABFD2A3}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@@ -1,120 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>BlubbFish.Utils.IoT.Connector.User</RootNamespace>
|
||||
<AssemblyName>ConnectorUserTelegram</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.ComponentModel.Composition" />
|
||||
<Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.Compression.FileSystem" />
|
||||
<Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Numerics" />
|
||||
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Telegram.Bot, Version=13.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\Telegram.Bot.13.2.1\lib\netstandard1.1\Telegram.Bot.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="Telegram.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Utils-IoT.csproj">
|
||||
<Project>{b870e4d5-6806-4a0b-b233-8907eedc5afc}</Project>
|
||||
<Name>Utils-IoT</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="app.config" />
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
@@ -1,36 +0,0 @@
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// Allgemeine Informationen über eine Assembly werden über die folgenden
|
||||
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
|
||||
// die einer Assembly zugeordnet sind.
|
||||
[assembly: AssemblyTitle("ConnectorUserTelegram")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("ConnectorUserTelegram")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2017")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
|
||||
// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von
|
||||
// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
|
||||
[assembly: Guid("e66a57dd-858a-40e4-8a2f-bea5129c31f7")]
|
||||
|
||||
// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
|
||||
//
|
||||
// Hauptversion
|
||||
// Nebenversion
|
||||
// Buildnummer
|
||||
// Revision
|
||||
//
|
||||
// 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.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
@@ -1,69 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Telegram.Bot;
|
||||
using Telegram.Bot.Args;
|
||||
using Telegram.Bot.Exceptions;
|
||||
using Telegram.Bot.Types;
|
||||
using Telegram.Bot.Types.Enums;
|
||||
using Telegram.Bot.Types.ReplyMarkups;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Connector.User {
|
||||
public class Telegram : AUserBackend {
|
||||
private TelegramBotClient bot;
|
||||
private ChatId chat;
|
||||
|
||||
public override event TelegramMessage MessageIncomming;
|
||||
public override event TelegramMessage MessageSending;
|
||||
|
||||
public Telegram(Dictionary<String, String> settings) : base(settings) {
|
||||
this.bot = new TelegramBotClient(settings["telegram-key"]);
|
||||
this.bot.OnMessage += this.Bot_OnMessage;
|
||||
this.Connect();
|
||||
}
|
||||
|
||||
private void Bot_OnMessage(Object sender, MessageEventArgs e) {
|
||||
this.MessageIncomming?.Invoke(this, new UserMessageEventArgs(e.Message.Text, e.Message.Chat.Id, e.Message.Date));
|
||||
}
|
||||
|
||||
private void Connect() {
|
||||
this.bot.StartReceiving();
|
||||
this.chat = new ChatId(this.settings["chatid"]);
|
||||
}
|
||||
|
||||
public async override void Send(String message) {
|
||||
try {
|
||||
Message x = await this.bot.SendTextMessageAsync(this.chat, message, ParseMode.Default, false, false, 0, new ReplyKeyboardRemove());
|
||||
this.MessageSending?.Invoke(this, new UserMessageEventArgs(x.Text, x.Chat.Id, x.Date));
|
||||
} catch(ApiRequestException e) {
|
||||
Console.ForegroundColor = ConsoleColor.Red;
|
||||
Console.WriteLine(e.Message+" "+e.ErrorCode+" "+e.Parameters);
|
||||
Console.ForegroundColor = ConsoleColor.White;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public override void Dispose() {
|
||||
this.bot.StopReceiving();
|
||||
this.bot = null;
|
||||
}
|
||||
|
||||
public async override void Send(String message, String[] buttons) {
|
||||
try {
|
||||
KeyboardButton[][] button = new KeyboardButton[(Int32)Math.Ceiling(((Double)buttons.Length)/2)][];
|
||||
for(Int32 i = 0; i < buttons.Length; i++) {
|
||||
Int32 j = (Int32)Math.Floor(((Double)i) / 2);
|
||||
if (i % 2 == 0) {
|
||||
button[j] = new KeyboardButton[(j == button.Length - 1) ? ((buttons.Length % 2 == 0) ? 2 : buttons.Length % 2) : 2];
|
||||
}
|
||||
button[j][i % 2] = new KeyboardButton(buttons[i]);
|
||||
}
|
||||
Message x = await this.bot.SendTextMessageAsync(this.chat, message, ParseMode.Default, false, false, 0, new ReplyKeyboardMarkup(button,true,true));
|
||||
this.MessageSending?.Invoke(this, new UserMessageEventArgs(x.Text, x.Chat.Id, x.Date));
|
||||
} catch (ApiRequestException e) {
|
||||
Console.ForegroundColor = ConsoleColor.Red;
|
||||
Console.WriteLine(e.Message + " " + e.ErrorCode + " " + e.Parameters);
|
||||
Console.ForegroundColor = ConsoleColor.White;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/></startup></configuration>
|
||||
@@ -1,51 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net461" />
|
||||
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
|
||||
<package id="NETStandard.Library" version="1.6.1" targetFramework="net461" />
|
||||
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
|
||||
<package id="System.AppContext" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
|
||||
<package id="System.Collections" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Console" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
|
||||
<package id="System.Globalization" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.IO" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
|
||||
<package id="System.IO.Compression" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Linq" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
|
||||
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
|
||||
<package id="System.Net.Http" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.ObjectModel" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Reflection" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
|
||||
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Runtime" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
|
||||
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
|
||||
<package id="System.Runtime.Handles" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
|
||||
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
|
||||
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
|
||||
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
|
||||
<package id="Telegram.Bot" version="13.2.1" targetFramework="net461" />
|
||||
</packages>
|
||||
Submodule
+1
Submodule Iot-Interfaces added at 39525791cb
@@ -1,25 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.28307.136
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Iot-Interfaces", "Iot-Interfaces\Iot-Interfaces.csproj", "{4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {6B5D61A4-D0B6-4C5C-8C8D-76EBD5ED55CE}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@@ -1,20 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Interfaces {
|
||||
public interface IMqtt {
|
||||
/// <summary>
|
||||
/// Gibt einen JSON-String der Eigenschaften eines Objekts zurück
|
||||
/// </summary>
|
||||
/// <returns>JSON-String</returns>
|
||||
String ToJson();
|
||||
/// <summary>
|
||||
/// Gibt das MQTT-Topic als String zurück unter dem die Daten des Objekts Publiziert werden sollen
|
||||
/// </summary>
|
||||
/// <returns>MQTT-Topic</returns>
|
||||
String MqttTopic();
|
||||
}
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Interfaces {
|
||||
public interface ISenml {
|
||||
/// <summary>
|
||||
/// Gibt einen Senml-JSON-String der Eigenschaften eines Objekts zurück
|
||||
/// </summary>
|
||||
/// <returns>Senml-JSON-String</returns>
|
||||
String ToSenml();
|
||||
/// <summary>
|
||||
/// Gibt das Senml-Topic als String zurück unter dem die Daten des Objekts Publiziert werden sollen
|
||||
/// </summary>
|
||||
/// <returns>Senml-Topic</returns>
|
||||
String SenmlTopic();
|
||||
}
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>BlubbFish.Utils.IoT.Interfaces</RootNamespace>
|
||||
<AssemblyName>Iot-Interfaces</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="ISenml.cs" />
|
||||
<Compile Include="IMqtt.cs" />
|
||||
<Compile Include="Language\Senml.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
@@ -1,62 +0,0 @@
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Reflection;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Interfaces.Language {
|
||||
public abstract class Senml {
|
||||
#pragma warning disable IDE1006 // Benennungsstile
|
||||
public String n { get; }
|
||||
public String u { get; }
|
||||
public Int32 t { get; }
|
||||
#pragma warning restore IDE1006 // Benennungsstile
|
||||
|
||||
public enum Units {
|
||||
[Description("%")]
|
||||
Percent,
|
||||
[Description("count")]
|
||||
CounterValue,
|
||||
[Description("W")]
|
||||
Watt,
|
||||
[Description("J")]
|
||||
Joule,
|
||||
[Description("Cel")]
|
||||
Celsius,
|
||||
[Description("lx")]
|
||||
Lux
|
||||
}
|
||||
|
||||
public Senml(String name, Units unit) {
|
||||
this.n = name;
|
||||
this.u = this.GetEnumDescription(unit);
|
||||
this.t = 0;
|
||||
}
|
||||
|
||||
private String GetEnumDescription(Enum value) {
|
||||
FieldInfo fi = value.GetType().GetField(value.ToString());
|
||||
|
||||
DescriptionAttribute[] attributes = (DescriptionAttribute[])fi.GetCustomAttributes(typeof(DescriptionAttribute), false);
|
||||
|
||||
if (attributes != null && attributes.Length > 0) {
|
||||
return attributes[0].Description;
|
||||
} else {
|
||||
return value.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
public class SenmlBool : Senml {
|
||||
#pragma warning disable IDE1006 // Benennungsstile
|
||||
public Boolean bv { get; }
|
||||
#pragma warning restore IDE1006 // Benennungsstile
|
||||
public SenmlBool(String name, Units unit, Boolean level) : base(name, unit) {
|
||||
this.bv = level;
|
||||
}
|
||||
}
|
||||
public class SenmlDouble : Senml {
|
||||
#pragma warning disable IDE1006 // Benennungsstile
|
||||
public Double v { get; }
|
||||
#pragma warning restore IDE1006 // Benennungsstile
|
||||
public SenmlDouble(String name, Units unit, Double level) : base(name, unit) {
|
||||
this.v = level;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// Allgemeine Informationen über eine Assembly werden über die folgenden
|
||||
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
|
||||
// die einer Assembly zugeordnet sind.
|
||||
[assembly: AssemblyTitle("Iot-Interfaces")]
|
||||
[assembly: AssemblyDescription("Interfaces for IoT-Stuff")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("BlubbFish")]
|
||||
[assembly: AssemblyProduct("Iot-Interfaces")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2018 - 02.05.2018")]
|
||||
[assembly: AssemblyTrademark("BlubbFish")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
|
||||
// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von
|
||||
// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
|
||||
[assembly: Guid("4daada29-c600-4cf3-8ad3-9c97c8d7f632")]
|
||||
|
||||
// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
|
||||
//
|
||||
// Hauptversion
|
||||
// Nebenversion
|
||||
// Buildnummer
|
||||
// Revision
|
||||
//
|
||||
// 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.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
Submodule
+1
Submodule Utils added at 7f3f3a7b89
Submodule
+1
Submodule Utils-IoT added at 8348185272
@@ -1,55 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.27004.2010
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "IoT\Utils-IoT.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMosquitto", "IoT\Connector\Data\Mosquitto\ConnectorDataMosquitto.csproj", "{39235FAD-BA9D-4B51-82FC-6969967BEAE9}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMqtt", "IoT\Connector\Data\Mqtt\ConnectorDataMqtt.csproj", "{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorUserTelegram", "IoT\Connector\User\Telegram\ConnectorUserTelegram.csproj", "{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "litjson_4.7.1", "..\Librarys\litjson\litjson\litjson_4.7.1.csproj", "{91A14CD2-2940-4500-8193-56D37EDDDBAA}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt", "..\Librarys\mqtt\M2Mqtt\M2Mqtt.csproj", "{A11AEF5A-B246-4FE8-8330-06DB73CC8074}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {844D8F60-6DE1-4C48-976D-F71450E9707B}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@@ -1,54 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Connector {
|
||||
public abstract class ABackend {
|
||||
public enum BackendType {
|
||||
Data,
|
||||
User
|
||||
}
|
||||
public event BackendMessage MessageIncomming;
|
||||
public event BackendMessage MessageSending;
|
||||
public delegate void BackendMessage(Object sender, BackendEvent e);
|
||||
|
||||
protected Dictionary<String, String> settings;
|
||||
|
||||
public abstract Boolean IsConnected { get; }
|
||||
|
||||
public ABackend(Dictionary<String, String> settings) {
|
||||
this.settings = settings;
|
||||
}
|
||||
|
||||
public static ABackend GetInstance(Dictionary<String, String> settings, BackendType ty) {
|
||||
if (settings.Count == 0) {
|
||||
return null;
|
||||
}
|
||||
String object_sensor = "BlubbFish.Utils.IoT.Connector." + ty.ToString() + "." + settings["type"].ToUpperLower() + ", " + "Connector" + ty.ToString() + settings["type"].ToUpperLower();
|
||||
Type t = null;
|
||||
try {
|
||||
t = Type.GetType(object_sensor, true);
|
||||
} catch (TypeLoadException) {
|
||||
Console.Error.WriteLine("Configuration: " + settings["type"] + " is not a " + ty.ToString() + "Backend");
|
||||
return null;
|
||||
} catch (System.IO.FileNotFoundException) {
|
||||
Console.Error.WriteLine("Driver " + object_sensor + " could not load!");
|
||||
return null;
|
||||
}
|
||||
return (ABackend)t.GetConstructor(new Type[] { typeof(Dictionary<String, String>) }).Invoke(new Object[] { settings });
|
||||
}
|
||||
|
||||
protected void NotifyClientIncomming(BackendEvent value) {
|
||||
this.MessageIncomming?.Invoke(this, value);
|
||||
}
|
||||
|
||||
protected void NotifyClientSending(BackendEvent value) {
|
||||
this.MessageSending?.Invoke(this, value);
|
||||
}
|
||||
|
||||
public abstract void Dispose();
|
||||
}
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Connector {
|
||||
public abstract class ADataBackend : ABackend {
|
||||
public ADataBackend(Dictionary<String, String> settings) : base(settings) { }
|
||||
public abstract void Send(String topic, String data);
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Connector {
|
||||
public abstract class AUserBackend : ABackend {
|
||||
public AUserBackend(Dictionary<String, String> settings) : base(settings) {}
|
||||
public abstract void Send(String message);
|
||||
public abstract void Send(String message, String[] buttons);
|
||||
}
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
using System;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Connector {
|
||||
public class UserMessageEventArgs : EventArgs {
|
||||
public UserMessageEventArgs() : base() { }
|
||||
public UserMessageEventArgs(String message, Int64 UserId, DateTime date) {
|
||||
this.UserId = UserId;
|
||||
this.Message = message;
|
||||
this.Date = date;
|
||||
}
|
||||
public Int64 UserId { get; private set; }
|
||||
public String Message { get; private set; }
|
||||
public DateTime Date { get; private set; }
|
||||
}
|
||||
public class MqttEventArgs : EventArgs {
|
||||
public MqttEventArgs() : base() { }
|
||||
public MqttEventArgs(String message, String topic) {
|
||||
this.Topic = topic;
|
||||
this.Message = message;
|
||||
this.Date = DateTime.Now;
|
||||
}
|
||||
public String Topic { get; private set; }
|
||||
public String Message { get; private set; }
|
||||
public DateTime Date { get; private set; }
|
||||
}
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Events {
|
||||
public class BackendEvent : EventArgs {
|
||||
public BackendEvent() : base() { }
|
||||
public BackendEvent(String message, Object from, DateTime date, String label) {
|
||||
this.From = from;
|
||||
this.Message = message;
|
||||
this.Date = date;
|
||||
this.Label = label;
|
||||
}
|
||||
|
||||
public Object From { get; private set; }
|
||||
public String Message { get; private set; }
|
||||
public DateTime Date { get; private set; }
|
||||
public String Label { get; private set; }
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Events {
|
||||
public class DataEvent : BackendEvent {
|
||||
public DataEvent(String data) : base() { }
|
||||
public DataEvent(String message, String topic, DateTime date) : base(message, topic, date, "Data") { }
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Events {
|
||||
public class UserEvent : BackendEvent {
|
||||
public UserEvent() : base() { }
|
||||
public UserEvent(String message, Int64 UserId, DateTime date) : base(message, UserId, date, "User") { }
|
||||
}
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BlubbFish.Utils.IoT {
|
||||
static class Helper {
|
||||
internal static String ToUpperLower(this String s) {
|
||||
if (s.Length == 0) {
|
||||
return "";
|
||||
}
|
||||
if (s.Length == 1) {
|
||||
return s.ToUpper();
|
||||
}
|
||||
return s[0].ToString().ToUpper() + s.Substring(1).ToLower();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,129 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading;
|
||||
using BlubbFish.Utils.IoT.Connector;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.JsonSensor {
|
||||
public abstract class AJsonSensor : IDisposable {
|
||||
protected String topic;
|
||||
protected Int32 pollcount;
|
||||
protected Dictionary<String, String> settings;
|
||||
protected ABackend backend;
|
||||
private Thread pollingThread;
|
||||
private Boolean pollEnabled = false;
|
||||
|
||||
public AJsonSensor(Dictionary<String, String> settings, String name, ABackend backend) {
|
||||
this.GetBool = true;
|
||||
this.GetFloat = 0.0f;
|
||||
this.GetInt = 0;
|
||||
this.topic = (settings.Keys.Contains("topic")) ? settings["topic"] : "";
|
||||
this.settings = settings;
|
||||
this.Title = (settings.Keys.Contains("title")) ? settings["title"] : "";
|
||||
this.Name = name;
|
||||
this.backend = backend;
|
||||
this.backend.MessageIncomming += this.IncommingMqttMessage;
|
||||
if (settings.Keys.Contains("polling")) {
|
||||
this.pollEnabled = true;
|
||||
this.Polling = Int32.Parse(settings["polling"]);
|
||||
this.pollcount = this.Polling;
|
||||
this.pollingThread = new Thread(this.SensorPolling);
|
||||
this.pollingThread.Start();
|
||||
}
|
||||
}
|
||||
|
||||
private void SensorPolling() {
|
||||
while(this.pollEnabled) {
|
||||
Thread.Sleep(1000);
|
||||
this.Poll();
|
||||
}
|
||||
}
|
||||
|
||||
private void IncommingMqttMessage(Object sender, BackendEvent e) {
|
||||
if(Regex.Match(e.From.ToString(), this.topic).Success) {
|
||||
if (this.UpdateValue(e)) {
|
||||
this.Timestamp = DateTime.Now;
|
||||
this.Update?.Invoke(this, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static AJsonSensor GetInstance(Dictionary<String, ABackend> backends, Dictionary<String, String> settings, String name) {
|
||||
String object_sensor = "BlubbFish.Utils.IoT.JsonSensor." + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower();
|
||||
Type t = null;
|
||||
try {
|
||||
t = Type.GetType(object_sensor, true);
|
||||
} catch(TypeLoadException) {
|
||||
throw new ArgumentException("Sensor: " + object_sensor + " is not a Sensor");
|
||||
}
|
||||
if(!settings.ContainsKey("backend") || !backends.ContainsKey(settings["backend"])) {
|
||||
throw new ArgumentException("Backend not specified!");
|
||||
}
|
||||
return (AJsonSensor)t.GetConstructor(new Type[] { typeof(Dictionary<String, String>), typeof(String), typeof(ABackend) }).Invoke(new Object[] { settings, name, backends[settings["backend"]] });
|
||||
}
|
||||
|
||||
protected virtual void Poll() {
|
||||
if(this.pollcount++ >= this.Polling) {
|
||||
this.pollcount = 1;
|
||||
if (this.backend is ADataBackend) {
|
||||
((ADataBackend)this.backend).Send(this.topic + "/get", "");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void SetBool(Boolean v) {
|
||||
if (this.backend is ADataBackend) {
|
||||
((ADataBackend)this.backend).Send(this.topic + "/set", v ? "on" : "off");
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract Boolean UpdateValue(BackendEvent e);
|
||||
|
||||
public Single GetFloat { get; protected set; }
|
||||
public Boolean GetBool { get; protected set; }
|
||||
public Int32 GetInt { get; protected set; }
|
||||
public Types Datatypes { get; protected set; }
|
||||
public DateTime Timestamp { get; protected set; }
|
||||
public Int32 Polling { get; private set; }
|
||||
public String Title { get; protected set; }
|
||||
public String Name { get; internal set; }
|
||||
|
||||
public enum Types {
|
||||
Bool,
|
||||
Int,
|
||||
Float
|
||||
}
|
||||
public delegate void UpdatedValue(Object sender, EventArgs e);
|
||||
public event UpdatedValue Update;
|
||||
|
||||
#region IDisposable Support
|
||||
private Boolean disposedValue = false;
|
||||
|
||||
|
||||
protected virtual void Dispose(Boolean disposing) {
|
||||
if(!this.disposedValue) {
|
||||
if(disposing) {
|
||||
this.pollEnabled = false;
|
||||
if (this.pollingThread != null && this.pollingThread.ThreadState == ThreadState.Running) {
|
||||
this.pollingThread.Abort();
|
||||
while (this.pollingThread.ThreadState != ThreadState.Aborted) { }
|
||||
}
|
||||
this.backend.MessageIncomming -= this.IncommingMqttMessage;
|
||||
}
|
||||
this.settings = null;
|
||||
this.pollingThread = null;
|
||||
this.disposedValue = true;
|
||||
}
|
||||
}
|
||||
~AJsonSensor() {
|
||||
Dispose(false);
|
||||
}
|
||||
public void Dispose() {
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using BlubbFish.Utils.IoT.Connector;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
using LitJson;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.JsonSensor {
|
||||
class Bosmon : AJsonSensor {
|
||||
public Bosmon(Dictionary<String, String> settings, String name, ABackend backend) : base(settings, name, backend) {
|
||||
}
|
||||
|
||||
public String Ric { get; private set; }
|
||||
public String Message { get; private set; }
|
||||
public String Func { get; private set; }
|
||||
public DateTime Time { get; private set; }
|
||||
|
||||
protected override Boolean UpdateValue(BackendEvent e) {
|
||||
try {
|
||||
JsonData json = JsonMapper.ToObject(e.Message);
|
||||
if(json.ContainsKey("TYPE_POCSAG")) {
|
||||
if(this.settings["rics"].Split(';').ToList().Contains(json["Address"].ToString())) {
|
||||
this.Ric = json["Address"].ToString();
|
||||
this.Message = json["Msg"].ToString();
|
||||
this.Func = json["Func"].ToString();
|
||||
this.Time = new DateTime(Int64.Parse(json["Timestamp"].ToString()));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
} catch(Exception) { }
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using BlubbFish.Utils.IoT.Connector;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.JsonSensor {
|
||||
class Luminanz : AJsonSensor {
|
||||
public Luminanz(Dictionary<String, String> settings, String name, ADataBackend backend) : base(settings, name, backend) {
|
||||
this.GetBool = true;
|
||||
this.GetFloat = 0.0f;
|
||||
this.GetInt = 0;
|
||||
this.Datatypes = Types.Int;
|
||||
}
|
||||
|
||||
protected override Boolean UpdateValue(BackendEvent e) {
|
||||
this.GetInt = Int32.Parse(e.Message, new CultureInfo("en-US"));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using BlubbFish.Utils.IoT.Connector;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.JsonSensor {
|
||||
class Pir : AJsonSensor {
|
||||
public Pir(Dictionary<String, String> settings, String name, ADataBackend backend) : base(settings, name, backend) {
|
||||
this.Datatypes = Types.Bool;
|
||||
}
|
||||
|
||||
protected override Boolean UpdateValue(BackendEvent e) {
|
||||
this.GetBool = (e.Message.ToLower() == "on") ? true : false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using BlubbFish.Utils.IoT.Connector;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.JsonSensor {
|
||||
class Power : AJsonSensor {
|
||||
public Power(Dictionary<String, String> settings, String name, ADataBackend backend) : base(settings, name, backend) {
|
||||
this.GetBool = true;
|
||||
this.GetFloat = 0.0f;
|
||||
this.GetInt = 0;
|
||||
this.Datatypes = Types.Float;
|
||||
}
|
||||
|
||||
protected override Boolean UpdateValue(BackendEvent e) {
|
||||
this.GetFloat = Single.Parse(e.Message, new CultureInfo("en-US"));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using BlubbFish.Utils.IoT.Connector;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.JsonSensor {
|
||||
class Switch : AJsonSensor {
|
||||
public Switch(Dictionary<System.String, System.String> settings, String name, ADataBackend backend) : base(settings, name, backend) {
|
||||
this.Datatypes = Types.Bool;
|
||||
}
|
||||
|
||||
protected override Boolean UpdateValue(BackendEvent e) {
|
||||
this.GetBool = (e.Message.ToLower() == "on") ? true : false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using BlubbFish.Utils.IoT.Connector;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.JsonSensor {
|
||||
class Temperatur : AJsonSensor {
|
||||
public Temperatur(Dictionary<String, String> settings, String name, ADataBackend backend) : base(settings, name, backend) {
|
||||
this.GetBool = true;
|
||||
this.GetFloat = 0.0f;
|
||||
this.GetInt = 0;
|
||||
this.Datatypes = Types.Float;
|
||||
}
|
||||
|
||||
protected override Boolean UpdateValue(BackendEvent e) {
|
||||
this.GetFloat = Single.Parse(e.Message, new CultureInfo("en-US"));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// Allgemeine Informationen über eine Assembly werden über die folgenden
|
||||
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
|
||||
// die einer Assembly zugeordnet sind.
|
||||
[assembly: AssemblyTitle("IoT")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("IoT")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2017")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
|
||||
// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von
|
||||
// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
|
||||
[assembly: Guid("b870e4d5-6806-4a0b-b233-8907eedc5afc")]
|
||||
|
||||
// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
|
||||
//
|
||||
// Hauptversion
|
||||
// Nebenversion
|
||||
// Buildnummer
|
||||
// Revision
|
||||
//
|
||||
// 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.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
@@ -1,60 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>BlubbFish.Utils.IoT</RootNamespace>
|
||||
<AssemblyName>Utils-IoT</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Connector\ABackend.cs" />
|
||||
<Compile Include="Connector\ADataBackend.cs" />
|
||||
<Compile Include="Connector\AUserBackend.cs" />
|
||||
<Compile Include="Events\BackendEvent.cs" />
|
||||
<Compile Include="Events\DataEvent.cs" />
|
||||
<Compile Include="Events\UserEvent.cs" />
|
||||
<Compile Include="Helper.cs" />
|
||||
<Compile Include="JsonSensor\Bosmon.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="JsonSensor\AJsonSensor.cs" />
|
||||
<Compile Include="JsonSensor\Luminanz.cs" />
|
||||
<Compile Include="JsonSensor\Pir.cs" />
|
||||
<Compile Include="JsonSensor\Power.cs" />
|
||||
<Compile Include="JsonSensor\Switch.cs" />
|
||||
<Compile Include="JsonSensor\Temperatur.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj">
|
||||
<Project>{91a14cd2-2940-4500-8193-56d37edddbaa}</Project>
|
||||
<Name>litjson_4.7.1</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
@@ -1,20 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 2012
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "Utils\Utils.csproj", "{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{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
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@@ -1,185 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace BlubbFish.Utils
|
||||
{
|
||||
public class CmdArgs
|
||||
{
|
||||
public enum ArgLength
|
||||
{
|
||||
Single,
|
||||
Touple
|
||||
}
|
||||
#region Classes
|
||||
public struct VaildArguments
|
||||
{
|
||||
public VaildArguments(ArgLength length, Boolean required)
|
||||
{
|
||||
this.Required = required;
|
||||
this.Length = length;
|
||||
}
|
||||
public VaildArguments(ArgLength length)
|
||||
{
|
||||
this.Required = false;
|
||||
this.Length = length;
|
||||
}
|
||||
|
||||
public ArgLength Length { get; private set; }
|
||||
public Boolean Required { get; private set; }
|
||||
}
|
||||
private struct ArgTouple
|
||||
{
|
||||
public ArgTouple(String type, String data)
|
||||
{
|
||||
this.Type = type;
|
||||
this.Data = data;
|
||||
}
|
||||
public ArgTouple(String type)
|
||||
{
|
||||
this.Type = type;
|
||||
this.Data = null;
|
||||
}
|
||||
public String Type { get; private set; }
|
||||
public String Data { get; private set; }
|
||||
|
||||
internal void SetData(String data)
|
||||
{
|
||||
if (data != "") {
|
||||
this.Data = data;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
private String[] args;
|
||||
private List<ArgTouple> argList;
|
||||
private Dictionary<String, VaildArguments> argsPosible = new Dictionary<String, VaildArguments>();
|
||||
private static CmdArgs instances = null;
|
||||
private Boolean isSetArguments = false;
|
||||
|
||||
private CmdArgs()
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gibt eine Instanz der Klasse zurück
|
||||
/// </summary>
|
||||
/// <returns>Klasse</returns>
|
||||
public static CmdArgs Instance
|
||||
{
|
||||
get {
|
||||
if (instances == null) {
|
||||
instances = new CmdArgs();
|
||||
}
|
||||
return instances;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Übernimmt die Argumente für die Klasse
|
||||
/// </summary>
|
||||
/// <param name="arguments">Mögliche Komandozeilenargumente</param>
|
||||
/// <param name="args">Tatsächliche Komandozeilenargumente</param>
|
||||
public void SetArguments(Dictionary<String, VaildArguments> arguments, String[] args)
|
||||
{
|
||||
this.args = args;
|
||||
if (!this.isSetArguments) {
|
||||
this.isSetArguments = true;
|
||||
this.argsPosible = arguments;
|
||||
this.Init();
|
||||
}
|
||||
}
|
||||
|
||||
private void Init()
|
||||
{
|
||||
this.argList = new List<ArgTouple>();
|
||||
for (Int32 i = 0; i < this.args.Length; i++) {
|
||||
if (this.argsPosible.Keys.Contains(this.args[i])) {
|
||||
ArgTouple arg = new ArgTouple(this.args[i]);
|
||||
if (this.argsPosible[this.args[i]].Length == ArgLength.Touple) {
|
||||
if (this.args.Length > i + 1) {
|
||||
arg.SetData(this.args[++i]);
|
||||
} else {
|
||||
Console.WriteLine(this.GetUsageList(""));
|
||||
throw new ArgumentException("Argument: "+this.args[i]+" missing second argument.");
|
||||
}
|
||||
}
|
||||
this.argList.Add(arg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Menge der angegebenen Komandozeilen-Argumente
|
||||
/// </summary>
|
||||
/// <returns>Menge</returns>
|
||||
public Int32 GetArgsLength()
|
||||
{
|
||||
return this.argList.Count;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gibt zurück ob ein Argument angegeben wurde
|
||||
/// </summary>
|
||||
/// <param name="name">Name des Arguments</param>
|
||||
/// <returns>true wenn angegeben</returns>
|
||||
public Boolean HasArgumentType(String name)
|
||||
{
|
||||
foreach (ArgTouple t in this.argList) {
|
||||
if (t.Type == name) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gibt den Inhalt des angegeben Arguments zurück, nur bei zweiteiligen Argumenten möglich
|
||||
/// </summary>
|
||||
/// <param name="name">Name des Arguments</param>
|
||||
/// <returns>Inhalt des Arguments oder ArgumentNullException</returns>
|
||||
public String GetArgumentData(String name)
|
||||
{
|
||||
foreach (ArgTouple t in this.argList) {
|
||||
if (t.Type == name && t.Data != null) {
|
||||
return t.Data;
|
||||
}
|
||||
}
|
||||
throw new ArgumentNullException();
|
||||
}
|
||||
|
||||
public Boolean HasAllRequiredArguments()
|
||||
{
|
||||
foreach (KeyValuePair<String, VaildArguments> item in this.argsPosible) {
|
||||
if (item.Value.Required && !this.HasArgumentType(item.Key)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public String GetUsageList(String name)
|
||||
{
|
||||
String ret = "Usage: " + name + " Parameter\nParameter:\n";
|
||||
String req = "";
|
||||
String opt = "";
|
||||
foreach (KeyValuePair<String, VaildArguments> item in this.argsPosible) {
|
||||
if (item.Value.Required) {
|
||||
req += item.Key + " " + ((item.Value.Length == ArgLength.Touple) ? " [data]\n" : "\n");
|
||||
}
|
||||
}
|
||||
if (req != "") {
|
||||
ret += "Benötigte Parameter:\n" + req;
|
||||
}
|
||||
foreach (KeyValuePair<String, VaildArguments> item in this.argsPosible) {
|
||||
if (!item.Value.Required) {
|
||||
opt += item.Key + " " + ((item.Value.Length == ArgLength.Touple) ? " [data]\n" : "\n");
|
||||
}
|
||||
}
|
||||
if (opt != "") {
|
||||
ret += "Optionale Parameter:\n" + opt;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
using System;
|
||||
|
||||
namespace BlubbFish.Utils {
|
||||
public class UpdaterEventArgs : EventArgs {
|
||||
public UpdaterEventArgs(Boolean hasUpdates, String message) {
|
||||
this.HasUpdates = hasUpdates;
|
||||
this.Message = message;
|
||||
}
|
||||
public String Message { get; private set; }
|
||||
public Boolean HasUpdates { get; private set; }
|
||||
}
|
||||
|
||||
public class UpdaterFailEventArgs : EventArgs {
|
||||
public UpdaterFailEventArgs(Exception e) {
|
||||
this.Except = e;
|
||||
}
|
||||
|
||||
public Exception Except { get; private set; }
|
||||
}
|
||||
|
||||
public class LogEventArgs : EventArgs {
|
||||
public LogEventArgs(String location, String message, OwnObject.LogLevel level, DateTime date) {
|
||||
this.Location = location;
|
||||
this.Message = message;
|
||||
this.Level = level;
|
||||
this.Date = date;
|
||||
}
|
||||
|
||||
public String Location { get; private set; }
|
||||
public String Message { get; private set; }
|
||||
public OwnObject.LogLevel Level { get; private set; }
|
||||
public DateTime Date { get; private set; }
|
||||
}
|
||||
}
|
||||
@@ -1,67 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
|
||||
namespace BlubbFish.Utils
|
||||
{
|
||||
public class FileLogger
|
||||
{
|
||||
private static Dictionary<String, FileLogger> instances = new Dictionary<String, FileLogger>();
|
||||
private static String logDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + Path.DirectorySeparatorChar;
|
||||
private readonly StreamWriter file;
|
||||
private FileLogger(String filename, Boolean append)
|
||||
{
|
||||
filename = logDir + filename;
|
||||
if (!File.Exists(filename)) {
|
||||
String folder = Path.GetDirectoryName(Path.GetFullPath(filename));
|
||||
if (!Directory.Exists(folder)) {
|
||||
Directory.CreateDirectory(folder);
|
||||
}
|
||||
}
|
||||
this.file = new StreamWriter(filename, append, Encoding.UTF8) {
|
||||
AutoFlush = true
|
||||
};
|
||||
}
|
||||
public static FileLogger GetInstance(String filename, Boolean append)
|
||||
{
|
||||
if (!instances.Keys.Contains(filename)) {
|
||||
instances.Add(filename, new FileLogger(filename, append));
|
||||
}
|
||||
return instances[filename];
|
||||
}
|
||||
|
||||
public static void SetLogDir(String v)
|
||||
{
|
||||
v = v.Replace("..", "");
|
||||
v = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + Path.DirectorySeparatorChar + v;
|
||||
if (Directory.Exists(v)) {
|
||||
logDir = v;
|
||||
} else {
|
||||
Directory.CreateDirectory(v);
|
||||
logDir = v;
|
||||
}
|
||||
if (logDir.Substring(logDir.Length - 1) != Path.DirectorySeparatorChar.ToString()) {
|
||||
logDir = logDir + Path.DirectorySeparatorChar;
|
||||
}
|
||||
}
|
||||
|
||||
public void SetArray(String[] text)
|
||||
{
|
||||
this.file.Write(String.Join(this.file.NewLine, text) + this.file.NewLine);
|
||||
this.file.Flush();
|
||||
}
|
||||
|
||||
public void SetLine(String text)
|
||||
{
|
||||
this.file.WriteLine(text);
|
||||
this.file.Flush();
|
||||
}
|
||||
public void SetLine(String text, DateTime d)
|
||||
{
|
||||
this.SetLine(d.ToString("[yyyy-MM-dd HH:mm:ss.ffff] ") + text);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,71 +0,0 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
|
||||
namespace BlubbFish.Utils
|
||||
{
|
||||
public class FileMutex : IDisposable
|
||||
{
|
||||
private static FileMutex instance;
|
||||
private String filename;
|
||||
private StreamWriter file;
|
||||
private FileMutex() { }
|
||||
|
||||
public static FileMutex Instance
|
||||
{
|
||||
get {
|
||||
if (instance == null) {
|
||||
instance = new FileMutex();
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
}
|
||||
|
||||
public void SetName(String name)
|
||||
{
|
||||
String path = AppDomain.CurrentDomain.BaseDirectory;
|
||||
this.filename = path + String.Join(String.Empty, Array.ConvertAll(new SHA512Managed().ComputeHash(Encoding.UTF8.GetBytes(name)), b => b.ToString("X2"))) + ".lock.txt";
|
||||
}
|
||||
|
||||
public Boolean Create()
|
||||
{
|
||||
if (File.Exists(this.filename)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
this.file = new StreamWriter(this.filename);
|
||||
InitFile();
|
||||
return File.Exists(this.filename) && this.file != null;
|
||||
}
|
||||
|
||||
private void InitFile()
|
||||
{
|
||||
this.file.Write("Created: " + DateTime.Now.ToUniversalTime() + "\n");
|
||||
this.file.Flush();
|
||||
}
|
||||
|
||||
public Boolean Delete()
|
||||
{
|
||||
if(this.file != null) {
|
||||
this.file.Close();
|
||||
}
|
||||
|
||||
File.Delete(this.filename);
|
||||
return !File.Exists(this.filename);
|
||||
}
|
||||
|
||||
protected virtual void Dispose(Boolean disposing) {
|
||||
if (disposing) {
|
||||
if(this.file != null) {
|
||||
this.file.Close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void Dispose() {
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,98 +0,0 @@
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Reflection;
|
||||
|
||||
namespace BlubbFish.Utils {
|
||||
public static class Helper {
|
||||
#region PropertyHelper
|
||||
public static Boolean HasProperty(this Object o, String type) {
|
||||
Type t = o.GetType();
|
||||
foreach (PropertyInfo item in t.GetProperties()) {
|
||||
if (item.Name == type) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static Object GetProperty(this Object o, String name) {
|
||||
PropertyInfo prop = o.GetType().GetProperty(name);
|
||||
if (prop.CanRead) {
|
||||
return prop.GetValue(o);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static void SetProperty(this Object o, String name, String value) {
|
||||
PropertyInfo prop = o.GetType().GetProperty(name);
|
||||
if (prop.CanWrite) {
|
||||
if (prop.PropertyType == typeof(Boolean) && Boolean.TryParse(value, out Boolean vb)) {
|
||||
prop.SetValue(o, vb);
|
||||
} else if (prop.PropertyType == typeof(Byte) && Byte.TryParse(value, out Byte v8)) {
|
||||
prop.SetValue(o, v8);
|
||||
} else if (prop.PropertyType == typeof(Int32) && Int32.TryParse(value, out Int32 v32)) {
|
||||
prop.SetValue(o, v32);
|
||||
} else if (prop.PropertyType == typeof(Single) && Single.TryParse(value, out Single vs)) {
|
||||
prop.SetValue(o, vs);
|
||||
} else if (prop.PropertyType == typeof(Double) && Double.TryParse(value, out Double vd)) {
|
||||
prop.SetValue(o, vd);
|
||||
} else if (prop.PropertyType == typeof(Int64) && Int64.TryParse(value, out Int64 v64)) {
|
||||
prop.SetValue(o, v64);
|
||||
} else if (prop.PropertyType.BaseType == typeof(Enum)) {
|
||||
try {
|
||||
prop.SetValue(o, Enum.Parse(prop.PropertyType, value));
|
||||
} catch (Exception) { }
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region InterfaceHelper
|
||||
public static Boolean HasInterface(this Type o, Type interf) {
|
||||
foreach (Type item in o.GetInterfaces()) {
|
||||
if (item == interf) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static Boolean HasAbstract(this Type o, Type type) {
|
||||
if (o.BaseType == type) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region StringHelper
|
||||
public static String GetEnumDescription(Enum value) {
|
||||
FieldInfo fi = value.GetType().GetField(value.ToString());
|
||||
|
||||
DescriptionAttribute[] attributes = (DescriptionAttribute[])fi.GetCustomAttributes(typeof(DescriptionAttribute), false);
|
||||
|
||||
if (attributes != null && attributes.Length > 0) {
|
||||
return attributes[0].Description;
|
||||
} else {
|
||||
return value.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
public static String ToUpperLower(this String s) {
|
||||
if (s.Length == 0) {
|
||||
return "";
|
||||
}
|
||||
if (s.Length == 1) {
|
||||
return s.ToUpper();
|
||||
}
|
||||
return s[0].ToString().ToUpper() + s.Substring(1).ToLower();
|
||||
}
|
||||
|
||||
public static void WriteError(String text) {
|
||||
Console.ForegroundColor = ConsoleColor.Red;
|
||||
Console.Error.WriteLine("ERROR: " + text);
|
||||
Console.ResetColor();
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -1,276 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace BlubbFish.Utils {
|
||||
public class InIReader : IDisposable
|
||||
{
|
||||
private Dictionary<String, Dictionary<String, String>> inifile;
|
||||
private readonly FileSystemWatcher k;
|
||||
private readonly String filename;
|
||||
private static List<String> search_path = new List<String>() {
|
||||
Directory.GetCurrentDirectory()
|
||||
};
|
||||
|
||||
private static Dictionary<String, InIReader> instances = new Dictionary<String, InIReader>();
|
||||
|
||||
public static void SetSearchPath(List<String> directorys) {
|
||||
search_path.AddRange(directorys);
|
||||
}
|
||||
|
||||
public static Boolean ConfigExist(String filename) {
|
||||
foreach (String path in search_path) {
|
||||
if (File.Exists(path + Path.DirectorySeparatorChar + filename)) {
|
||||
return true;
|
||||
} else if (File.Exists(path + Path.DirectorySeparatorChar + filename + ".ini")) {
|
||||
return true;
|
||||
} else if (File.Exists(path + Path.DirectorySeparatorChar + filename + ".conf")) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private InIReader(String filename)
|
||||
{
|
||||
foreach (String path in search_path) {
|
||||
if (File.Exists(path + Path.DirectorySeparatorChar + filename)) {
|
||||
this.filename = path + Path.DirectorySeparatorChar + filename;
|
||||
this.k = new FileSystemWatcher(path, filename);
|
||||
break;
|
||||
} else if (File.Exists(path + Path.DirectorySeparatorChar + filename + ".ini")) {
|
||||
this.filename = path + Path.DirectorySeparatorChar + filename + ".ini";
|
||||
this.k = new FileSystemWatcher(path, filename + ".ini");
|
||||
break;
|
||||
} else if(File.Exists(path + Path.DirectorySeparatorChar + filename + ".conf")) {
|
||||
this.filename = path + Path.DirectorySeparatorChar + filename + ".conf";
|
||||
this.k = new FileSystemWatcher(path, filename + ".conf");
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(this.filename == null) {
|
||||
throw new ArgumentException(filename + " not found!");
|
||||
}
|
||||
this.k.Changed += new FileSystemEventHandler(this.ReadAgain);
|
||||
LoadFile();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gibt eine InIReader-Instanz zu einer Datei zurück
|
||||
/// </summary>
|
||||
/// <param name="filename">Dateiname</param>
|
||||
/// <returns></returns>
|
||||
public static InIReader GetInstance(String filename)
|
||||
{
|
||||
if (!instances.Keys.Contains(filename)) {
|
||||
instances.Add(filename, new InIReader(filename));
|
||||
}
|
||||
return instances[filename];
|
||||
}
|
||||
|
||||
private void ReadAgain(Object sender, EventArgs e)
|
||||
{
|
||||
this.LoadFile();
|
||||
}
|
||||
|
||||
private void LoadFile()
|
||||
{
|
||||
this.inifile = new Dictionary<String, Dictionary<String, String>>();
|
||||
StreamReader file = new StreamReader(this.filename);
|
||||
List<String> buf = new List<String>();
|
||||
String fline = "";
|
||||
while (fline != null) {
|
||||
fline = file.ReadLine();
|
||||
if (fline != null && fline.Length > 0 && fline.Substring(0, 1) != ";") {
|
||||
buf.Add(fline);
|
||||
}
|
||||
}
|
||||
file.Close();
|
||||
Dictionary<String, String> sub = new Dictionary<String, String>();
|
||||
String cap = "";
|
||||
foreach (String line in buf) {
|
||||
Match match = Regex.Match(line, @"^\[[a-zA-ZäöüÄÖÜ0-9\-\._/ ]+\]\w*$", RegexOptions.IgnoreCase);
|
||||
if (match.Success) {
|
||||
if (sub.Count != 0 && cap != "") {
|
||||
this.inifile.Add(cap, sub);
|
||||
}
|
||||
cap = line;
|
||||
sub = new Dictionary<String, String>();
|
||||
} else {
|
||||
if (line != "" && cap != "") {
|
||||
String key = line.Substring(0, line.IndexOf('='));
|
||||
String value = line.Substring(line.IndexOf('=') + 1);
|
||||
sub.Add(key, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (sub.Count != 0 && cap != "") {
|
||||
this.inifile.Add(cap, sub);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gibt eine Liste an Sektionen zurück
|
||||
/// </summary>
|
||||
/// <param name="withBrackets">Default = true; false, wenn die Liste ohne Klammern sein soll.</param>
|
||||
/// <returns></returns>
|
||||
public List<String> GetSections(Boolean withBrackets = true)
|
||||
{
|
||||
if(withBrackets) {
|
||||
return this.inifile.Keys.ToList();
|
||||
} else {
|
||||
List<String> ret = new List<String>();
|
||||
foreach (String item in this.inifile.Keys) {
|
||||
ret.Add(item.Substring(1, item.Length - 2));
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Überschreibt eine InI-Datei mit der Kompletten neuen Configuration
|
||||
/// </summary>
|
||||
/// <param name="config">Neue Konfiguration</param>
|
||||
public void SetSections(Dictionary<String, Dictionary<String, String>> config) {
|
||||
this.inifile.Clear();
|
||||
foreach (KeyValuePair<String, Dictionary<String, String>> item in config) {
|
||||
String key = item.Key;
|
||||
if(!key.StartsWith("[")) {
|
||||
key = "[" + key + "]";
|
||||
}
|
||||
if (Regex.Match(key, @"^\[[a-zA-ZäöüÄÖÜ0-9\-\._/ ]+\]\w*$", RegexOptions.IgnoreCase).Success) {
|
||||
this.inifile.Add(key, item.Value);
|
||||
}
|
||||
}
|
||||
this.Changed();
|
||||
}
|
||||
|
||||
public Dictionary<String, String> GetSection(String section) {
|
||||
if(this.inifile.Keys.Contains(section)) {
|
||||
return this.inifile[section];
|
||||
}
|
||||
if(this.inifile.Keys.Contains("["+section+"]")) {
|
||||
return this.inifile["[" + section + "]"];
|
||||
}
|
||||
return new Dictionary<String, String>();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gibt einen einzelnen Wert zurück
|
||||
/// </summary>
|
||||
/// <param name="section">Name der Sektion</param>
|
||||
/// <param name="key">Name des Wertes</param>
|
||||
/// <returns></returns>
|
||||
public String GetValue(String section, String key)
|
||||
{
|
||||
if (!section.StartsWith("[")) {
|
||||
section = "[" + section + "]";
|
||||
}
|
||||
if (this.inifile.Keys.Contains(section)) {
|
||||
if (this.inifile[section].Keys.Contains(key)) {
|
||||
return this.inifile[section][key];
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Setzt einen Wert in einer Sektion
|
||||
/// </summary>
|
||||
/// <param name="section">Name der Sektion</param>
|
||||
/// <param name="key">Name des Wertes</param>
|
||||
/// <param name="value">Wert</param>
|
||||
public void SetValue(String section, String key, String value)
|
||||
{
|
||||
if (!section.StartsWith("[")) {
|
||||
section = "[" + section + "]";
|
||||
}
|
||||
if (this.inifile.Keys.Contains(section)) {
|
||||
if (this.inifile[section].Keys.Contains(key)) {
|
||||
this.inifile[section][key] = value;
|
||||
} else {
|
||||
this.inifile[section].Add(key, value);
|
||||
}
|
||||
} else {
|
||||
Dictionary<String, String> sub = new Dictionary<String, String> {
|
||||
{ key, value }
|
||||
};
|
||||
this.inifile.Add(section, sub);
|
||||
}
|
||||
this.Changed();
|
||||
}
|
||||
|
||||
private void Changed()
|
||||
{
|
||||
this.k.Changed -= null;
|
||||
SaveSettings();
|
||||
LoadFile();
|
||||
this.k.Changed += new FileSystemEventHandler(this.ReadAgain);
|
||||
}
|
||||
|
||||
private void SaveSettings()
|
||||
{
|
||||
StreamWriter file = new StreamWriter(this.filename);
|
||||
file.BaseStream.SetLength(0);
|
||||
file.BaseStream.Flush();
|
||||
file.BaseStream.Seek(0, SeekOrigin.Begin);
|
||||
foreach (KeyValuePair<String, Dictionary<String, String>> cap in this.inifile) {
|
||||
file.WriteLine(cap.Key);
|
||||
foreach (KeyValuePair<String, String> sub in cap.Value) {
|
||||
file.WriteLine(sub.Key + "=" + sub.Value);
|
||||
}
|
||||
file.WriteLine();
|
||||
}
|
||||
file.Flush();
|
||||
file.Close();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Fügt eine neue Sektion in der Ini-Datei ein.
|
||||
/// </summary>
|
||||
/// <param name="name">Sektionsname</param>
|
||||
/// <returns>true if added, false if error</returns>
|
||||
public Boolean AddSection(String name)
|
||||
{
|
||||
if (!name.StartsWith("[")) {
|
||||
name = "[" + name + "]";
|
||||
}
|
||||
if (this.inifile.Keys.Contains(name)) {
|
||||
return false;
|
||||
}
|
||||
this.inifile.Add(name, new Dictionary<String, String>());
|
||||
this.Changed();
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Löscht eine Sektion inklusive Unterpunkte aus der Ini-Datei.
|
||||
/// </summary>
|
||||
/// <param name="name">Sektionsname</param>
|
||||
/// <returns>true if removed, false if error</returns>
|
||||
public Boolean RemoveSection(String name)
|
||||
{
|
||||
if (!name.StartsWith("[")) {
|
||||
name = "[" + name + "]";
|
||||
}
|
||||
if (!this.inifile.Keys.Contains(name)) {
|
||||
return false;
|
||||
}
|
||||
this.inifile.Remove(name);
|
||||
this.Changed();
|
||||
return false;
|
||||
}
|
||||
protected virtual void Dispose(Boolean disposing) {
|
||||
if (disposing) {
|
||||
this.k.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
public void Dispose() {
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace BlubbFish.Utils
|
||||
{
|
||||
public abstract class OwnController
|
||||
{
|
||||
/// <summary>
|
||||
/// Führt den Controller aus.
|
||||
/// </summary>
|
||||
public void Execute()
|
||||
{
|
||||
this.Init();
|
||||
}
|
||||
abstract protected void Init();
|
||||
abstract public void Dispose();
|
||||
}
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BlubbFish.Utils
|
||||
{
|
||||
public abstract class OwnModel<T> where T : class
|
||||
{
|
||||
private static readonly Lazy<T> _instance = new Lazy<T>(() => CreateInstanceOfT());
|
||||
private readonly List<OwnView> observer = new List<OwnView>();
|
||||
public static T Instance
|
||||
{
|
||||
get {
|
||||
return _instance.Value;
|
||||
}
|
||||
}
|
||||
private static T CreateInstanceOfT()
|
||||
{
|
||||
return Activator.CreateInstance(typeof(T), true) as T;
|
||||
}
|
||||
|
||||
public void SetObserver(OwnView view)
|
||||
{
|
||||
this.observer.Add(view);
|
||||
view.Update();
|
||||
}
|
||||
|
||||
public void RemoveObserver(OwnView view) {
|
||||
this.observer.Remove(view);
|
||||
}
|
||||
protected void Update()
|
||||
{
|
||||
this.observer.ForEach(delegate (OwnView view) { view.Update(); });
|
||||
}
|
||||
abstract protected void Init();
|
||||
abstract public void Dispose();
|
||||
}
|
||||
}
|
||||
@@ -1,110 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace BlubbFish.Utils
|
||||
{
|
||||
abstract public class OwnObject
|
||||
{
|
||||
public struct LogObject {
|
||||
public LogObject(DateTime date, String location, String message, LogLevel level) {
|
||||
this.Date = date;
|
||||
this.Location = location;
|
||||
this.Message = message;
|
||||
this.Level = level;
|
||||
}
|
||||
|
||||
public DateTime Date { get; set; }
|
||||
public String Location { get; set; }
|
||||
public String Message { get; set; }
|
||||
public LogLevel Level { get; set; }
|
||||
/// <summary>
|
||||
/// Formates a LogMessage to a String
|
||||
/// </summary>
|
||||
/// <returns>Formated String</returns>
|
||||
public override String ToString() {
|
||||
return "[" + this.Date.ToString("R") + "]: " + this.Level.ToString() + " "+ this.Location + ", " + this.Message;
|
||||
}
|
||||
/// <summary>
|
||||
/// Formates a LogMessage to a String
|
||||
/// </summary>
|
||||
/// <param name="classNames">Enables the output of the location</param>
|
||||
/// <param name="timeStamps">Enables the output of the date</param>
|
||||
/// <returns>Formated String</returns>
|
||||
public String ToString(Boolean classNames, Boolean timeStamps) {
|
||||
return (timeStamps ? "[" + this.Date.ToString("R") + "]: " + this.Level.ToString() + " " : "") + (classNames ? this.Location + ", " : "") + this.Message;
|
||||
}
|
||||
}
|
||||
|
||||
private List<LogObject> loglist = new List<LogObject>();
|
||||
|
||||
public delegate void LogEvent(Object sender, LogEventArgs e);
|
||||
public enum LogLevel : Int32 {
|
||||
Debug = 1,
|
||||
Notice = 2,
|
||||
Info = 4,
|
||||
Warn = 8,
|
||||
Error = 16
|
||||
}
|
||||
|
||||
public event LogEvent EventDebug;
|
||||
public event LogEvent EventNotice;
|
||||
public event LogEvent EventInfo;
|
||||
public event LogEvent EventWarn;
|
||||
public event LogEvent EventError;
|
||||
public event LogEvent EventLog;
|
||||
|
||||
/// <summary>
|
||||
/// Get the Complete Log
|
||||
/// </summary>
|
||||
public List<String> GetLog(LogLevel level, Boolean classNames, Boolean timeStamps) {
|
||||
List<String> ret = new List<String>();
|
||||
foreach (LogObject t in this.loglist) {
|
||||
if (t.Level >= level) {
|
||||
ret.Add(t.ToString(classNames, timeStamps));
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Put a message in the log
|
||||
/// </summary>
|
||||
/// <param name="location">Where the event arrives</param>
|
||||
/// <param name="message">The logmessage itselfs</param>
|
||||
/// <param name="level">Level of the message</param>
|
||||
protected void AddLog(String location, String message, LogLevel level)
|
||||
{
|
||||
this.AddLog(location, message, level, DateTime.Now);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Put a message in the log
|
||||
/// </summary>
|
||||
/// <param name="location">Where the event arrives</param>
|
||||
/// <param name="message">The logmessage itselfs</param>
|
||||
/// <param name="level">Level of the message</param>
|
||||
/// <param name="date">Date of the message</param>
|
||||
protected void AddLog(String location, String message, LogLevel level, DateTime date)
|
||||
{
|
||||
LogEventArgs e = new LogEventArgs(location, message, level, date);
|
||||
if (EventDebug != null && level >= LogLevel.Debug) {
|
||||
EventDebug(this, e);
|
||||
}
|
||||
if (EventNotice != null && level >= LogLevel.Notice) {
|
||||
EventNotice(this, e);
|
||||
}
|
||||
if (EventInfo != null && level >= LogLevel.Info) {
|
||||
EventInfo(this, e);
|
||||
}
|
||||
if (EventWarn != null && level >= LogLevel.Warn) {
|
||||
EventWarn(this, e);
|
||||
}
|
||||
if (EventError != null && level >= LogLevel.Error) {
|
||||
EventError(this, e);
|
||||
}
|
||||
EventLog?.Invoke(this, e);
|
||||
|
||||
this.loglist.Add(new LogObject(date, location, message, level));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BlubbFish.Utils {
|
||||
public abstract class OwnView {
|
||||
|
||||
protected OwnView() { }
|
||||
/// <summary>
|
||||
/// Called if the Oberver (Model) updates its View
|
||||
/// </summary>
|
||||
public abstract void Update();
|
||||
/// <summary>
|
||||
/// Called if view is viewed
|
||||
/// </summary>
|
||||
//protected abstract void Init();
|
||||
/// <summary>
|
||||
/// Called if Form is Disposed
|
||||
/// </summary>
|
||||
public abstract void Dispose();
|
||||
}
|
||||
}
|
||||
@@ -1,170 +0,0 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using System.Security;
|
||||
using System.Security.Permissions;
|
||||
using System.Text;
|
||||
|
||||
namespace BlubbFish.Utils {
|
||||
public class ProgramLogger {
|
||||
private FileWriter fw;
|
||||
private ConsoleWriter stdout;
|
||||
private ConsoleWriter errout;
|
||||
private String loggerfile;
|
||||
|
||||
public ProgramLogger() {
|
||||
this.loggerfile = Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar + "output.log";
|
||||
this.Init(this.loggerfile);
|
||||
this.AttachToFw();
|
||||
this.SetOutputs();
|
||||
}
|
||||
|
||||
private void SetOutputs() {
|
||||
Console.SetOut(this.stdout);
|
||||
Console.SetError(this.errout);
|
||||
}
|
||||
|
||||
private void Init(String file) {
|
||||
if(!this.IsWritable(file)) {
|
||||
Console.Error.WriteLine("Cannot write to " + file);
|
||||
throw new ArgumentException("Cannot write to " + file);
|
||||
}
|
||||
this.fw = new FileWriter(file);
|
||||
this.stdout = new ConsoleWriter(Console.Out, ConsoleWriterEventArgs.ConsoleType.Info);
|
||||
this.errout = new ConsoleWriter(Console.Error, ConsoleWriterEventArgs.ConsoleType.Error);
|
||||
}
|
||||
|
||||
private Boolean IsWritable(String filename) {
|
||||
FileIOPermission writePermission = new FileIOPermission(FileIOPermissionAccess.Write, filename);
|
||||
PermissionSet p = new PermissionSet(PermissionState.None);
|
||||
p.AddPermission(writePermission);
|
||||
if (!p.IsSubsetOf(AppDomain.CurrentDomain.PermissionSet)) {
|
||||
return false;
|
||||
}
|
||||
try {
|
||||
using (FileStream fstream = new FileStream(filename, FileMode.Append))
|
||||
using (TextWriter writer = new StreamWriter(fstream)) {
|
||||
writer.Write("");
|
||||
}
|
||||
} catch (UnauthorizedAccessException) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public void SetPath(String file) {
|
||||
if(file == null) {
|
||||
return;
|
||||
}
|
||||
if (!this.IsWritable(file)) {
|
||||
Console.Error.WriteLine("Cannot write to " + file);
|
||||
throw new ArgumentException("Cannot write to " + file);
|
||||
}
|
||||
this.DisattachToFw();
|
||||
this.fw.Close();
|
||||
if(new FileInfo(this.loggerfile).Length > 0) {
|
||||
File.Move(this.loggerfile, file);
|
||||
} else {
|
||||
File.Delete(this.loggerfile);
|
||||
}
|
||||
this.loggerfile = file;
|
||||
this.fw = new FileWriter(this.loggerfile);
|
||||
this.AttachToFw();
|
||||
}
|
||||
|
||||
private void DisattachToFw() {
|
||||
this.stdout.WriteEvent -= this.fw.Write;
|
||||
this.stdout.WriteLineEvent -= this.fw.WriteLine;
|
||||
this.errout.WriteEvent -= this.fw.WriteLine;
|
||||
this.errout.WriteLineEvent -= this.fw.WriteLine;
|
||||
}
|
||||
private void AttachToFw() {
|
||||
this.stdout.WriteEvent += this.fw.Write;
|
||||
this.stdout.WriteLineEvent += this.fw.WriteLine;
|
||||
this.errout.WriteEvent += this.fw.WriteLine;
|
||||
this.errout.WriteLineEvent += this.fw.WriteLine;
|
||||
}
|
||||
}
|
||||
|
||||
internal class FileWriter : StreamWriter {
|
||||
private Boolean newline = true;
|
||||
public FileWriter(String path) : base(path) {
|
||||
}
|
||||
|
||||
public override Encoding Encoding { get { return Encoding.UTF8; } }
|
||||
public override Boolean AutoFlush { get { return true; } set { base.AutoFlush = value; } }
|
||||
|
||||
private void Write(String value, TextWriter origstream, ConsoleWriterEventArgs.ConsoleType type) {
|
||||
String text = "";
|
||||
if (this.newline) {
|
||||
text = "[" + DateTime.Now.ToString("o") + "]-" + type.ToString() + ": " + value;
|
||||
this.newline = false;
|
||||
} else {
|
||||
text = value;
|
||||
}
|
||||
origstream.Write(text);
|
||||
base.Write(text);
|
||||
base.Flush();
|
||||
}
|
||||
|
||||
private void WriteLine(String value, TextWriter origstream, ConsoleWriterEventArgs.ConsoleType type) {
|
||||
String text = "";
|
||||
if (this.newline) {
|
||||
text = "[" + DateTime.Now.ToString("o") + "]-" + type.ToString() + ": " + value;
|
||||
} else {
|
||||
text = value;
|
||||
}
|
||||
this.newline = true;
|
||||
origstream.WriteLine(text);
|
||||
base.WriteLine(text);
|
||||
base.Flush();
|
||||
}
|
||||
|
||||
internal void Write(Object sender, ConsoleWriterEventArgs e) {
|
||||
this.Write(e.Value, e.Writer, e.StreamType);
|
||||
}
|
||||
|
||||
internal void WriteLine(Object sender, ConsoleWriterEventArgs e) {
|
||||
this.WriteLine(e.Value, e.Writer, e.StreamType);
|
||||
}
|
||||
}
|
||||
|
||||
internal class ConsoleWriterEventArgs : EventArgs {
|
||||
public String Value { get; private set; }
|
||||
public TextWriter Writer { get; private set; }
|
||||
public ConsoleType StreamType { get; private set; }
|
||||
|
||||
public enum ConsoleType {
|
||||
Info,
|
||||
Error
|
||||
}
|
||||
|
||||
public ConsoleWriterEventArgs(String value, TextWriter writer, ConsoleType type) {
|
||||
this.Value = value;
|
||||
this.Writer = writer;
|
||||
this.StreamType = type;
|
||||
}
|
||||
}
|
||||
|
||||
internal class ConsoleWriter : TextWriter {
|
||||
private readonly TextWriter stream;
|
||||
private readonly ConsoleWriterEventArgs.ConsoleType streamtype;
|
||||
|
||||
public ConsoleWriter(TextWriter writer, ConsoleWriterEventArgs.ConsoleType type) {
|
||||
this.stream = writer;
|
||||
this.streamtype = type;
|
||||
}
|
||||
|
||||
public override Encoding Encoding { get { return Encoding.UTF8; } }
|
||||
public override void Write(String value) {
|
||||
this.WriteEvent?.Invoke(this, new ConsoleWriterEventArgs(value, this.stream, this.streamtype));
|
||||
base.Write(value);
|
||||
}
|
||||
public override void WriteLine(String value) {
|
||||
this.WriteLineEvent?.Invoke(this, new ConsoleWriterEventArgs(value, this.stream, this.streamtype));
|
||||
base.WriteLine(value);
|
||||
}
|
||||
public event EventHandler<ConsoleWriterEventArgs> WriteEvent;
|
||||
public event EventHandler<ConsoleWriterEventArgs> WriteLineEvent;
|
||||
}
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// Allgemeine Informationen über eine Assembly werden über die folgenden
|
||||
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
|
||||
// die mit einer Assembly verknüpft sind.
|
||||
[assembly: AssemblyTitle("Utils")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("Utils")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2014 - 02.10.2018")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar
|
||||
// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von
|
||||
// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
|
||||
[assembly: Guid("6f20376a-5c71-4979-9932-13c105d1c6e6")]
|
||||
|
||||
// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
|
||||
//
|
||||
// Hauptversion
|
||||
// Nebenversion
|
||||
// Buildnummer
|
||||
// Revision
|
||||
//
|
||||
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
|
||||
// übernehmen, indem Sie "*" eingeben:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.4.0")]
|
||||
[assembly: AssemblyFileVersion("1.4.0")]
|
||||
|
||||
/**
|
||||
* 1.4.0 Add Helper to Utils
|
||||
*/
|
||||
@@ -1,192 +0,0 @@
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Xml;
|
||||
|
||||
namespace BlubbFish.Utils {
|
||||
public class Updater : OwnObject {
|
||||
private static Updater instances;
|
||||
private String url;
|
||||
private VersionInfo[] versions;
|
||||
private Thread t;
|
||||
|
||||
public struct VersionInfo {
|
||||
public VersionInfo(Type type) {
|
||||
this.Name = type.Assembly.GetName().Name;
|
||||
this.Version = type.Assembly.GetName().Version.ToString();
|
||||
this.Filename = type.Assembly.ManifestModule.Name;
|
||||
this.GUID = ((GuidAttribute)type.Assembly.GetCustomAttribute(typeof(GuidAttribute))).Value;
|
||||
this.HasUpdate = false;
|
||||
}
|
||||
|
||||
public String Name { get; private set; }
|
||||
public String Version { get; private set; }
|
||||
public String Filename { get; private set; }
|
||||
public String GUID { get; private set; }
|
||||
public Boolean HasUpdate { get; set; }
|
||||
}
|
||||
|
||||
public delegate void UpdateStatus(Object sender, UpdaterEventArgs e);
|
||||
public delegate void UpdateFail(Object sender, UpdaterFailEventArgs e);
|
||||
|
||||
public event UpdateStatus UpdateResult;
|
||||
public event UpdateFail ErrorRaised;
|
||||
|
||||
private Updater() { }
|
||||
|
||||
/// <summary>
|
||||
/// Get Instance of Updater
|
||||
/// </summary>
|
||||
public static Updater Instance {
|
||||
get {
|
||||
if(instances == null) {
|
||||
instances = new Updater();
|
||||
}
|
||||
return instances;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Waits for the Result of the Updater thread.
|
||||
/// </summary>
|
||||
public void WaitForExit(Boolean exceuteUpdate = true) {
|
||||
while (this.t.ThreadState == ThreadState.Running) { }
|
||||
if(exceuteUpdate) {
|
||||
if(File.Exists("update.bat")) {
|
||||
System.Diagnostics.Process.Start("update.bat");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Set Path to check for Updates
|
||||
/// </summary>
|
||||
/// <param name="url">HTTP URI</param>
|
||||
public void SetUpdateInfo(String url, VersionInfo[] versions) {
|
||||
this.url = url;
|
||||
this.versions = versions;
|
||||
FileStream file = new FileStream("version.xml",FileMode.Create);
|
||||
XmlTextWriter xml = new XmlTextWriter(file, Encoding.UTF8);
|
||||
xml.WriteStartDocument();
|
||||
xml.WriteWhitespace("\n");
|
||||
xml.WriteStartElement("filelist");
|
||||
xml.WriteWhitespace("\n");
|
||||
foreach (VersionInfo version in versions) {
|
||||
xml.WriteWhitespace("\t");
|
||||
xml.WriteStartElement("file");
|
||||
xml.WriteAttributeString("Version", version.Version);
|
||||
xml.WriteAttributeString("Filename", version.Filename);
|
||||
xml.WriteAttributeString("GUID", version.GUID);
|
||||
xml.WriteString(version.Name);
|
||||
xml.WriteEndElement();
|
||||
xml.WriteWhitespace("\n");
|
||||
}
|
||||
xml.WriteEndElement();
|
||||
xml.Flush();
|
||||
file.Flush();
|
||||
file.Close();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Check for Updates
|
||||
/// </summary>
|
||||
/// <exception cref="ArgumentException"></exception>
|
||||
public void Check() {
|
||||
if(this.url == "") {
|
||||
throw new ArgumentException("Zuerst eine URL setzen!");
|
||||
}
|
||||
if(this.versions.Length == 0) {
|
||||
throw new ArgumentException("Zuerst Dateien registrieren!");
|
||||
}
|
||||
if(this.UpdateResult == null) {
|
||||
throw new ArgumentNullException("Zuerst das Update Event anhängen.");
|
||||
}
|
||||
this.t = new Thread(this.Runner);
|
||||
this.t.Start();
|
||||
}
|
||||
|
||||
private void Runner() {
|
||||
Thread.Sleep(1000);
|
||||
try {
|
||||
Stream stream = WebRequest.Create(this.url + "version.xml").GetResponse().GetResponseStream();
|
||||
String content = new StreamReader(stream).ReadToEnd();
|
||||
Boolean update = false;
|
||||
XmlDocument doc = new XmlDocument();
|
||||
doc.LoadXml(content);
|
||||
foreach (XmlNode node in doc.DocumentElement.ChildNodes) {
|
||||
String guid = node.Attributes["GUID"].Value;
|
||||
String version = node.Attributes["Version"].Value;
|
||||
for(Int32 i=0;i<this.versions.Length;i++) {
|
||||
if (this.versions[i].GUID == guid && this.versions[i].Version != version) {
|
||||
this.versions[i].HasUpdate = true;
|
||||
update = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (update) {
|
||||
this.UpdateResult(this, new UpdaterEventArgs(true, "Update verfügbar"));
|
||||
return;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
this.ErrorRaised?.Invoke(this, new UpdaterFailEventArgs(e));
|
||||
return;
|
||||
}
|
||||
this.UpdateResult(this, new UpdaterEventArgs(false, "Kein Update verfügbar"));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Update the file
|
||||
/// </summary>
|
||||
/// <param name="afterExit">Updates the Programm after it has been closed</param>
|
||||
/// <returns></returns>
|
||||
public Boolean Update(Boolean afterExit = true) {
|
||||
try {
|
||||
if (afterExit) {
|
||||
this.UpdateAfter();
|
||||
} else {
|
||||
this.UpdateNow();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
this.ErrorRaised?.Invoke(this, new UpdaterFailEventArgs(e));
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private void UpdateAfter() {
|
||||
this.UpdateNow(true);
|
||||
StreamWriter update = new StreamWriter("update.bat", false);
|
||||
update.WriteLine("echo off");
|
||||
update.WriteLine("echo \"Warte 10s\"");
|
||||
update.WriteLine("ping 127.0.0.1 -n 10");
|
||||
update.WriteLine("echo \"Kopiere Dateien....\"");
|
||||
foreach (VersionInfo file in this.versions) {
|
||||
if (file.HasUpdate) {
|
||||
update.WriteLine("echo \"Kopiere " + file.Filename + "\"");
|
||||
update.WriteLine("del " + file.Filename);
|
||||
update.WriteLine("move " + file.Filename + "_ " + file.Filename);
|
||||
}
|
||||
}
|
||||
update.WriteLine("start cmd /C ping 127.0.0.1 -n 10 & del update.bat");
|
||||
update.Flush();
|
||||
update.Close();
|
||||
}
|
||||
|
||||
private void UpdateNow(Boolean forAfter = false) {
|
||||
foreach (VersionInfo file in this.versions) {
|
||||
if (file.HasUpdate) {
|
||||
Stream stream = WebRequest.Create(this.url + file.Filename).GetResponse().GetResponseStream();
|
||||
FileStream target = new FileStream(file.Filename + (forAfter ? "_" : ""), FileMode.Create);
|
||||
stream.CopyTo(target);
|
||||
target.Flush();
|
||||
target.Close();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>BlubbFish.Utils</RootNamespace>
|
||||
<AssemblyName>Utils</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="CmdArgs.cs" />
|
||||
<Compile Include="EventArgsHelper.cs" />
|
||||
<Compile Include="FileLogger.cs" />
|
||||
<Compile Include="FileMutex.cs" />
|
||||
<Compile Include="Helper.cs" />
|
||||
<Compile Include="InIReader.cs" />
|
||||
<Compile Include="OwnController.cs" />
|
||||
<Compile Include="OwnModel.cs" />
|
||||
<Compile Include="OwnObject.cs" />
|
||||
<Compile Include="OwnView.cs" />
|
||||
<Compile Include="ProgramLogger.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="Updater.cs" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
@@ -0,0 +1,39 @@
|
||||
#!/bin/bash
|
||||
|
||||
function look_for_update() {
|
||||
if [[ $1 == ./.git ]] || [[ $1 == "." ]]; then
|
||||
echo "Ignore $1"
|
||||
return
|
||||
fi
|
||||
WithoutPrefix=$(echo -n $1 | cut -c 2-)
|
||||
if grep -qx "$WithoutPrefix" .gitignore; then
|
||||
echo "Ignore $1, because it's in .gitignore"
|
||||
return
|
||||
fi
|
||||
printf -v FolderNameEscaped '%q' "$1"
|
||||
if [[ -f $1/update.sh ]]; then
|
||||
echo "Switch to subdir $1 and run update.sh"
|
||||
cd "$1"
|
||||
git pull
|
||||
bash -c "./update.sh nobreak"
|
||||
else
|
||||
if [[ -f $1/.git ]]
|
||||
then
|
||||
echo "Pull $1"
|
||||
cd "$1"
|
||||
git pull
|
||||
else
|
||||
echo "Checkout master for $1"
|
||||
git submodule update --init -- "$1"
|
||||
cd "$1"
|
||||
git checkout master
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
export -f look_for_update
|
||||
find . -maxdepth 1 -type d -exec bash -c 'look_for_update "$0"' {} \;
|
||||
|
||||
if [ -z $1 ]; then
|
||||
read -p "Press return"
|
||||
fi
|
||||
Reference in New Issue
Block a user