Merge pull request #16 from MatthiWare/development

[UI] Update Generator

UpdateLib/TestApp/Form1.cs

@@ -71,7 +71,7 @@ private void button2_Click(object sender, EventArgs e)
 
         private void button3_Click(object sender, EventArgs e)
         {
-            UpdateFile file = UpdateFile.Load("../../../UpdateLib.Generator/bin/Debug/Output/updatefile.xml");
+            UpdateFile file = UpdateFile.Load("../../../MatthiWare.UpdateLib.Generator/bin/Debug/Output/updatefile.xml");
             UpdaterForm updaterForm = new UpdaterForm(file);
             updaterForm.ShowDialog(this);
         }
@@ -87,7 +87,7 @@ private void Form1_Load(object sender, EventArgs e)
 
             Func<int, bool> test2 = new Func<int, bool>((i) => { return i%2==0; });
 
-            AsyncTaskBase<bool> task =  AsyncTaskFactory.StartNew<bool>(test2, 2);
+            AsyncTask<bool> task =  AsyncTaskFactory.StartNew<bool>(test2, 2);
             Console.WriteLine(task.GetType().FullName);
 
         }

UpdateLib/TestApp/Program.cs

@@ -1,4 +1,7 @@
-using System;
+using MatthiWare.UpdateLib;
+using MatthiWare.UpdateLib.Logging;
+using MatthiWare.UpdateLib.Logging.Writers;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
@@ -13,9 +16,23 @@ static class Program
         [STAThread]
         static void Main()
         {
+            SetupLogging();
+            InitializeUpdater();
+
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             Application.Run(new Form1());
         }
+
+        private static void InitializeUpdater()
+        {
+            Updater.Instance.Initialize();
+        }
+
+        private static void SetupLogging()
+        {
+            Logger.Writers.Add(new ConsoleLogWriter());
+            Logger.Writers.Add(new FileLogWriter());
+        }
     }
 }

UpdateLib/UpdateLib.Generator/Data/FilesPage/GenFile.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace MatthiWare.UpdateLib.Generator.Data.FilesPage
+{
+    public class GenFile
+    {
+        private FileInfo m_file;
+
+        public string Name { get { return m_file.Name; } }
+        public string RealPath { get { return m_file.FullName; } }
+        public string Extension { get { return m_file.Extension; } }
+        public string Size { get { return ConvertBytesToSizeString(m_file.Length); } }
+
+        public GenFolder ParentFolder { get; set; }
+
+        public ListViewItemFile FileListView { get; set; }
+
+        public GenFile(FileInfo file)
+        {
+            m_file = file;
+
+            FileListView = new ListViewItemFile(file);
+        }
+
+        private static string ConvertBytesToSizeString(long size)
+        {
+            size = Math.Max(0, size);
+
+            double kb = Math.Ceiling(size / 1024.0);
+
+            return $"{kb.ToString("N0")} kB";
+        }
+    }
+}

UpdateLib/UpdateLib.Generator/Data/FilesPage/GenFolder.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace MatthiWare.UpdateLib.Generator.Data.FilesPage
+{
+    public class GenFolder
+    {
+        public string Name { get; set; }
+        public List<GenFile> Files { get; private set; } = new List<GenFile>();
+        public List<GenFolder> Directories { get; private set; } = new List<GenFolder>();
+        public GenFolder ParentFolder { get; set; }
+        public bool IsRoot { get { return ParentFolder == null; } }
+
+
+        public ListViewItemFolder FolderListView { get; set; }
+        public TreeViewFolderNode FolderTreeView { get; set; }
+
+
+        public GenFolder(string name)
+        {
+            Name = name;
+        }
+
+    }
+}

UpdateLib/UpdateLib.Generator/Data/ListViewItemFile.cs

@@ -0,0 +1,33 @@
+using MatthiWare.UpdateLib.Generator.Data.FilesPage;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace MatthiWare.UpdateLib.Generator.Data
+{
+    public class ListViewItemFile : ListViewItem
+    {
+        public GenFile File { get; set; }
+
+        private ListViewItemFile(string[] items, string imageKey)
+            : base(items, imageKey)
+        { }
+
+        public ListViewItemFile(FileInfo file)
+            : this(new string[] { "", file.Name, file.LastWriteTime.ToString(), "File", ConvertBytesToSizeString(file.Length)}, file.Extension)
+        {
+        }
+
+        private static string ConvertBytesToSizeString(long size)
+        {
+            size = Math.Max(0, size);
+
+            double kb = Math.Ceiling(size / 1024.0);
+
+            return $"{kb.ToString("N0")} kB";
+        }
+    }
+}

UpdateLib/UpdateLib.Generator/Data/ListViewItemFolder.cs

@@ -0,0 +1,26 @@
+using MatthiWare.UpdateLib.Generator.Data.FilesPage;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace MatthiWare.UpdateLib.Generator.Data
+{
+    public class ListViewItemFolder : ListViewItem
+    {
+        internal const string FOLDER_KEY = "folderimagekey";
+
+        public GenFolder Folder { get; set; }
+
+        private ListViewItemFolder(string[] items, string imageKey)
+            : base(items, imageKey)
+        { }
+
+        public ListViewItemFolder(string folderName, GenFolder folder)
+            : this(new string[] { "", folderName, "", "Folder", "" }, FOLDER_KEY)
+        {
+            Folder = folder;
+        }
+    }
+}

UpdateLib/UpdateLib.Generator/Data/TreeViewFolderNode.cs

@@ -0,0 +1,25 @@
+using MatthiWare.UpdateLib.Generator.Data.FilesPage;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace MatthiWare.UpdateLib.Generator.Data
+{
+    public class TreeViewFolderNode : TreeNode
+    {
+        internal const string FOLDER_KEY = "folderimagekey";
+
+        public GenFolder Folder { get; set; }
+
+        public TreeViewFolderNode(string folderName, GenFolder folder)
+        {
+            Text = folderName;
+            ImageKey = FOLDER_KEY;
+            SelectedImageKey = FOLDER_KEY;
+            Folder = folder;
+        }
+
+    }
+}

UpdateLib/UpdateLib.Generator/Files/ProjectFile.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace MatthiWare.UpdateLib.Generator.Files
+{
+    [Serializable]
+    public class ProjectFile
+    {
+
+        #region General Info
+        #endregion
+
+        #region Files
+        #endregion
+
+        #region Registry
+        #endregion
+
+    }
+}