6 Commits
7 changed files with 39 additions and 15 deletions
-1
View File
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
namespace BlubbFish.Utils {
public class UpdaterEventArgs : EventArgs {
+12 -2
View File
@@ -52,7 +52,7 @@ namespace BlubbFish.Utils
Dictionary<String, String> sub = new Dictionary<String, String>();
String cap = "";
foreach (String line in buf) {
Match match = Regex.Match(line, @"^\[[a-zA-Z0-9\-_ ]+\]\w*$", RegexOptions.IgnoreCase);
Match match = Regex.Match(line, @"^\[[a-zA-ZäöüÄÖÜ0-9\-_ ]+\]\w*$", RegexOptions.IgnoreCase);
if (match.Success) {
if (sub.Count != 0 && cap != "") {
this.cont.Add(cap, sub);
@@ -74,7 +74,17 @@ namespace BlubbFish.Utils
public List<String> GetSections()
{
return this.cont.Keys.ToList<String>();
return this.cont.Keys.ToList();
}
public Dictionary<String, String> GetSection(String section) {
if(this.cont.Keys.Contains(section)) {
return this.cont[section];
}
if(this.cont.Keys.Contains("["+section+"]")) {
return this.cont["[" + section + "]"];
}
return new Dictionary<String, String>();
}
public String GetValue(String section, String key)
-2
View File
@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BlubbFish.Utils
{
+2 -4
View File
@@ -7,9 +7,7 @@ using System.Threading.Tasks;
namespace BlubbFish.Utils {
public abstract class OwnView {
protected OwnView() {
this.Init();
}
protected OwnView() { }
/// <summary>
/// Called if the Oberver (Model) updates its View
/// </summary>
@@ -17,7 +15,7 @@ namespace BlubbFish.Utils {
/// <summary>
/// Called if view is viewed
/// </summary>
protected abstract void Init();
//protected abstract void Init();
/// <summary>
/// Called if Form is Disposed
/// </summary>
+3 -3
View File
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Utils")]
[assembly: AssemblyCopyright("Copyright © 2014 - 24.04.2017")]
[assembly: AssemblyCopyright("Copyright © 2014 - 24.09.2017")]
[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.3.2")]
[assembly: AssemblyFileVersion("1.0.3.2")]
[assembly: AssemblyVersion("1.0.5.1")]
[assembly: AssemblyFileVersion("1.0.5.1")]
+22 -3
View File
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Reflection;
@@ -55,8 +54,13 @@ namespace BlubbFish.Utils {
/// <summary>
/// Waits for the Result of the Updater thread.
/// </summary>
public void WaitForExit() {
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>
@@ -107,7 +111,7 @@ namespace BlubbFish.Utils {
}
private void Runner() {
Thread.Sleep(1);
Thread.Sleep(1000);
try {
Stream stream = WebRequest.Create(this.url + "version.xml").GetResponse().GetResponseStream();
String content = new StreamReader(stream).ReadToEnd();
@@ -156,6 +160,21 @@ namespace BlubbFish.Utils {
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) {
Binary file not shown.