21 Commits
Author SHA1 Message Date
BlubbFish c2385294ea Utils.csproj
[NF] Programmlogger added (v1.1.0)
[NF] Utils fixing tiny issues

Zway-Bot.csproj
[NF] changes Topics without beginning /
[NF] Using programmlogger (v1.4.0)
2018-05-15 18:49:03 +00:00
BlubbFish 55d743de9e [BF] Fixing Issue with Math.Abs(l) 2018-05-12 12:36:32 +00:00
BlubbFish d791571e4f [BF] Some sensors make wrong measurements near 0 not exactly 0, so ABS(value) >= 0.1 is alse false 2018-05-10 06:26:39 +00:00
BlubbFish 3d967459c8 [NF] Move litjson to its subdir 2018-05-08 18:10:47 +00:00
BlubbFish 83a88cea38 [NF] First usable Version (Trigger) 2018-05-08 18:07:48 +00:00
BlubbFish fa3ef6fd60 [NF] Cleaning up
[NF] Create Debian Package
2018-05-08 17:25:39 +00:00
BlubbFish d5831bf292 [BF] Fixing Senml
[NF] Senml now has a configure option to setup the guid
[NF] Zway-Bot now listen on /exit
[NF] Implment searchpath for Zway-Bot (/etc/zwaybot and %appdata%/zwaybot)
2018-05-07 16:52:24 +00:00
BlubbFish 3f1e03cd4d [NF] Create Senml Messages for Linksmart 2018-05-03 14:43:50 +00:00
BlubbFish 387301626a [NF] Create Senml Messages for Linksmart 2018-05-03 14:39:08 +00:00
BlubbFish 3a7cc65ba8 [NF] Create Senml Messages for Linksmart 2018-05-03 14:35:02 +00:00
BlubbFish c75464632c [NF] Creating with screen Session 2018-05-02 17:03:17 +00:00
BlubbFish 69d94cfc06 [NF] Creating with screen Session 2018-05-02 17:01:10 +00:00
BlubbFish 8bc6bd5824 [NF] Creating with screen Session 2018-05-02 16:55:56 +00:00
BlubbFish 1a6661326f [NF] Creating with screen Session 2018-05-02 16:51:07 +00:00
BlubbFish d2e28fa5b2 [NF] Utils-IoT nutzt nun die lokale json lib 2018-05-02 16:25:02 +00:00
BlubbFish ca3d6e62ee [NF] Hue-Lib fertig
[DW] Hue-Bot beginn Arbeit
2018-05-01 21:46:56 +00:00
BlubbFish 53ecb8908a [DW] Flex4Grid deleted
[NF] BosMon Mqtt Plugin created
2018-03-31 20:42:28 +00:00
BlubbFish 3a8f1a58bc [NF] v1.3.6.0 Better levelcheck and Alarmsensor added 2018-01-01 02:09:55 +00:00
BlubbFish d389b52d17 [BF] v1.3.5.3 Change Level to numeric and create State for Bollean values, because telegraf only parse numeric 2017-12-25 18:11:01 +00:00
BlubbFish c2e6db4f8a [[BF] v1.3.5.2 Check to avoid megapeaks in data now also for temperature 2017-12-24 10:43:58 +00:00
BlubbFish 436ecf01f8 [BF] v1.3.5.1 Check to avoid megapeaks in Data 2017-12-23 22:37:36 +00:00
6 changed files with 209 additions and 11 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ namespace BlubbFish.Utils
{
private static Dictionary<String, FileLogger> instances = new Dictionary<String, FileLogger>();
private static String logDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + Path.DirectorySeparatorChar;
private StreamWriter file;
private readonly StreamWriter file;
private FileLogger(String filename, Boolean append)
{
filename = logDir + filename;
+41 -7
View File
@@ -2,23 +2,57 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace BlubbFish.Utils
{
namespace BlubbFish.Utils {
public class InIReader : IDisposable
{
private Dictionary<String, Dictionary<String, String>> inifile;
private FileSystemWatcher k = new FileSystemWatcher(Directory.GetCurrentDirectory(), "*.ini");
private String filename;
private 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)
{
this.filename = 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();
}
+163
View File
@@ -0,0 +1,163 @@
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);
}
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 = "[" + DateTime.Now.ToString("o") + "]-" + type.ToString() + ": " + value;
origstream.WriteLine(text);
base.WriteLine(text);
this.newline = true;
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;
}
}
+3 -3
View File
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Utils")]
[assembly: AssemblyCopyright("Copyright © 2014 - 22.12.2017")]
[assembly: AssemblyCopyright("Copyright © 2014 - 15.05.2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.6.0")]
[assembly: AssemblyFileVersion("1.0.6.0")]
[assembly: AssemblyVersion("1.1.0")]
[assembly: AssemblyFileVersion("1.1.0")]
+1
View File
@@ -50,6 +50,7 @@
<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>
Binary file not shown.