Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
740b9152b5 | ||
|
|
fca2575ab6 | ||
|
|
0fe8437e0d | ||
|
|
a7ce209510 | ||
|
|
75dd6e8e5e | ||
|
|
80a3d4ae8f |
+14
-1
@@ -5,7 +5,7 @@ using System.Text;
|
|||||||
|
|
||||||
namespace BlubbFish.Utils
|
namespace BlubbFish.Utils
|
||||||
{
|
{
|
||||||
public class FileMutex
|
public class FileMutex : IDisposable
|
||||||
{
|
{
|
||||||
private static FileMutex instance;
|
private static FileMutex instance;
|
||||||
private String filename;
|
private String filename;
|
||||||
@@ -54,5 +54,18 @@ namespace BlubbFish.Utils
|
|||||||
File.Delete(this.filename);
|
File.Delete(this.filename);
|
||||||
return !File.Exists(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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-1
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace BlubbFish.Utils
|
namespace BlubbFish.Utils
|
||||||
{
|
{
|
||||||
public class InIReader
|
public class InIReader : IDisposable
|
||||||
{
|
{
|
||||||
private Dictionary<String, Dictionary<String, String>> cont;
|
private Dictionary<String, Dictionary<String, String>> cont;
|
||||||
private FileSystemWatcher k = new FileSystemWatcher(Directory.GetCurrentDirectory(), "*.ini");
|
private FileSystemWatcher k = new FileSystemWatcher(Directory.GetCurrentDirectory(), "*.ini");
|
||||||
@@ -171,5 +171,15 @@ namespace BlubbFish.Utils
|
|||||||
this.Changed();
|
this.Changed();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
protected virtual void Dispose(Boolean disposing) {
|
||||||
|
if (disposing) {
|
||||||
|
this.k.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose() {
|
||||||
|
Dispose(true);
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+23
-8
@@ -7,7 +7,7 @@ namespace BlubbFish.Utils
|
|||||||
{
|
{
|
||||||
abstract public class OwnObject
|
abstract public class OwnObject
|
||||||
{
|
{
|
||||||
public class LogObject {
|
public struct LogObject {
|
||||||
public LogObject(DateTime date, String location, String message, LogLevel level) {
|
public LogObject(DateTime date, String location, String message, LogLevel level) {
|
||||||
this.Date = date;
|
this.Date = date;
|
||||||
this.Location = location;
|
this.Location = location;
|
||||||
@@ -37,9 +37,23 @@ namespace BlubbFish.Utils
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class LogEventArgs : EventArgs {
|
||||||
|
public LogEventArgs(String location, String message, 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 LogLevel Level { get; private set; }
|
||||||
|
public DateTime Date { get; private set; }
|
||||||
|
}
|
||||||
|
|
||||||
private List<LogObject> loglist = new List<LogObject>();
|
private List<LogObject> loglist = new List<LogObject>();
|
||||||
|
|
||||||
public delegate void LogEvent(String location, String message, LogLevel level, DateTime date);
|
public delegate void LogEvent(Object sender, LogEventArgs e);
|
||||||
public enum LogLevel : Int32 {
|
public enum LogLevel : Int32 {
|
||||||
Debug = 1,
|
Debug = 1,
|
||||||
Notice = 2,
|
Notice = 2,
|
||||||
@@ -88,22 +102,23 @@ namespace BlubbFish.Utils
|
|||||||
/// <param name="date">Date of the message</param>
|
/// <param name="date">Date of the message</param>
|
||||||
protected void AddLog(String location, String message, LogLevel level, DateTime date)
|
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) {
|
if (EventDebug != null && level >= LogLevel.Debug) {
|
||||||
EventDebug(location, message, level, date);
|
EventDebug(this, e);
|
||||||
}
|
}
|
||||||
if (EventNotice != null && level >= LogLevel.Notice) {
|
if (EventNotice != null && level >= LogLevel.Notice) {
|
||||||
EventNotice(location, message, level, date);
|
EventNotice(this, e);
|
||||||
}
|
}
|
||||||
if (EventInfo != null && level >= LogLevel.Info) {
|
if (EventInfo != null && level >= LogLevel.Info) {
|
||||||
EventInfo(location, message, level, date);
|
EventInfo(this, e);
|
||||||
}
|
}
|
||||||
if (EventWarn != null && level >= LogLevel.Warn) {
|
if (EventWarn != null && level >= LogLevel.Warn) {
|
||||||
EventWarn(location, message, level, date);
|
EventWarn(this, e);
|
||||||
}
|
}
|
||||||
if (EventError != null && level >= LogLevel.Error) {
|
if (EventError != null && level >= LogLevel.Error) {
|
||||||
EventError(location, message, level, date);
|
EventError(this, e);
|
||||||
}
|
}
|
||||||
EventLog?.Invoke(location, message, level, date);
|
EventLog?.Invoke(this, e);
|
||||||
|
|
||||||
this.loglist.Add(new LogObject(date, location, message, level));
|
this.loglist.Add(new LogObject(date, location, message, level));
|
||||||
}
|
}
|
||||||
|
|||||||
+9
-7
@@ -4,21 +4,23 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace BlubbFish.Utils
|
namespace BlubbFish.Utils {
|
||||||
{
|
public abstract class OwnView {
|
||||||
public abstract class OwnView
|
|
||||||
{
|
protected OwnView() {
|
||||||
|
this.Init();
|
||||||
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Called if the Oberver (Model) updates its View
|
/// Called if the Oberver (Model) updates its View
|
||||||
/// </summary>
|
/// </summary>
|
||||||
abstract public void Update();
|
public abstract void Update();
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Called if view is viewed
|
/// Called if view is viewed
|
||||||
/// </summary>
|
/// </summary>
|
||||||
abstract protected void Init();
|
protected abstract void Init();
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Called if Form is Disposed
|
/// Called if Form is Disposed
|
||||||
/// </summary>
|
/// </summary>
|
||||||
abstract public void Dispose();
|
public abstract void Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
|
|||||||
[assembly: AssemblyConfiguration("")]
|
[assembly: AssemblyConfiguration("")]
|
||||||
[assembly: AssemblyCompany("")]
|
[assembly: AssemblyCompany("")]
|
||||||
[assembly: AssemblyProduct("Utils")]
|
[assembly: AssemblyProduct("Utils")]
|
||||||
[assembly: AssemblyCopyright("Copyright © 2014 - 16.04.2017")]
|
[assembly: AssemblyCopyright("Copyright © 2014 - 24.04.2017")]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
|||||||
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
|
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
|
||||||
// übernehmen, indem Sie "*" eingeben:
|
// übernehmen, indem Sie "*" eingeben:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("1.0.2.5")]
|
[assembly: AssemblyVersion("1.0.2.6")]
|
||||||
[assembly: AssemblyFileVersion("1.0.2.5")]
|
[assembly: AssemblyFileVersion("1.0.2.6")]
|
||||||
|
|||||||
+145
@@ -0,0 +1,145 @@
|
|||||||
|
|
||||||
|
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;
|
||||||
|
|
||||||
|
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 struct VersionInfo {
|
||||||
|
public VersionInfo(String name, String version, String filename, String guid) {
|
||||||
|
this.Name = name;
|
||||||
|
this.Version = version;
|
||||||
|
this.Filename = filename;
|
||||||
|
this.GUID = guid;
|
||||||
|
}
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
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 delegate void UpdateStatus(Object sender, UpdaterEventArgs e);
|
||||||
|
|
||||||
|
public event UpdateStatus UpdateResult;
|
||||||
|
|
||||||
|
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() {
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <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("You must set url first.");
|
||||||
|
}
|
||||||
|
if(this.versions.Length == 0) {
|
||||||
|
throw new ArgumentException("You must set a Version number first.");
|
||||||
|
}
|
||||||
|
if(this.UpdateResult == null) {
|
||||||
|
throw new ArgumentNullException("You must attach an event first.");
|
||||||
|
}
|
||||||
|
Thread t = new Thread(this.Runner);
|
||||||
|
t.Start();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Runner() {
|
||||||
|
Thread.Sleep(1000);
|
||||||
|
WebRequest request = WebRequest.Create(this.url + "version.xml");
|
||||||
|
WebResponse response = null;
|
||||||
|
try {
|
||||||
|
response = request.GetResponse();
|
||||||
|
} catch(WebException e) {
|
||||||
|
this.UpdateResult(this, new UpdaterEventArgs(false, e.Message));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Stream stream = response.GetResponseStream();
|
||||||
|
StreamReader reader = new StreamReader(stream);
|
||||||
|
String content = reader.ReadToEnd();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Update the file
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="filename">The filename of the targetfile</param>
|
||||||
|
/// <param name="url">The url of the sourcefile</param>
|
||||||
|
/// <param name="afterExit">Updates the Programm after it has been closed</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public Boolean Update(Boolean afterExit = true) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -49,6 +49,7 @@
|
|||||||
<Compile Include="OwnObject.cs" />
|
<Compile Include="OwnObject.cs" />
|
||||||
<Compile Include="OwnView.cs" />
|
<Compile Include="OwnView.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
|
<Compile Include="Updater.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user