Merge pull request #42 from GDKsoftware/41

41
GDKsoftware · Jul 10, 2017 · e6b8664 · e6b8664
2 parents ffee854 + 884c8c6
commit e6b8664
Show file tree

Hide file tree

Showing 16 changed files with 281 additions and 83 deletions.
diff --git a/GitBitter/Program.cs b/GitBitter/Program.cs
@@ -4,9 +4,9 @@
     using GitBitterLib;
     using Microsoft.Practices.Unity;
 
-    class Program
+    public class Program
     {
-        static void Main(string[] args)
+        public static void Main(string[] args)
         {
             GitBitterContainer.Default.RegisterType<ICloner, GitSharpCloner>();
 
@@ -19,7 +19,7 @@ static void Main(string[] args)
             GitBitterContainer.Default.RegisterType<ICredentialManager, CredentialManagerWindows>();
             GitBitterContainer.Default.RegisterType<IIniFile, IniFileWindows>();
             GitBitterContainer.Default.RegisterType<IGitFilesAndFolders, GitFilesAndFoldersWindows>();
-			GitBitterContainer.Default.RegisterType<IGitBitterLogging, GitBitterLoggingCommandLine>();
+            GitBitterContainer.Default.RegisterType<IGitBitterLogging, GitBitterLoggingCommandLine>();
 #endif
 
             try

diff --git a/GitBitterEdit/GitBitterEdit.csproj b/GitBitterEdit/GitBitterEdit.csproj
@@ -108,6 +108,10 @@
     <Compile Include="GitConfigEdit.xaml.cs">
       <DependentUpon>GitConfigEdit.xaml</DependentUpon>
     </Compile>
+    <Compile Include="LoggingForm.xaml.cs">
+      <DependentUpon>LoggingForm.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="LoggingUI.cs" />
     <Compile Include="LoginForm.xaml.cs">
       <DependentUpon>LoginForm.xaml</DependentUpon>
     </Compile>
@@ -122,6 +126,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="LoggingForm.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="LoginForm.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

diff --git a/GitBitterEdit/LoggingForm.xaml b/GitBitterEdit/LoggingForm.xaml
@@ -0,0 +1,12 @@
+<Window x:Name="FrmLogging" x:Class="GitBitterEdit.LoggingForm"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:GitBitterEdit"
+        mc:Ignorable="d"
+        Title="Logging" Height="300" Width="300">
+    <Grid>
+        <ListBox x:Name="listBox"/>
+    </Grid>
+</Window>
diff --git a/GitBitterEdit/LoggingForm.xaml.cs b/GitBitterEdit/LoggingForm.xaml.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace GitBitterEdit
+{
+    /// <summary>
+    /// Interaction logic for LoggingForm.xaml
+    /// </summary>
+    public partial class LoggingForm : Window
+    {
+        public LoggingForm()
+        {
+            InitializeComponent();
+        }
+
+        public void SetList(IEnumerable ASource)
+        {
+            listBox.ItemsSource = null;
+            listBox.ItemsSource = ASource;
+        }
+    }
+}
diff --git a/GitBitterEdit/LoggingUI.cs b/GitBitterEdit/LoggingUI.cs
@@ -0,0 +1,61 @@
+namespace GitBitterEdit
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text;
+    using System.Threading.Tasks;
+    using GitBitterLib;
+    using System.Threading;
+    using System.Windows;
+
+    public class LoggingUI : IGitBitterLogging
+    {
+        private LoggingForm form = null;
+        private List<string> collectedLogging = null;
+        private TaskScheduler mainThreadScheduler = null;
+
+        public LoggingUI(TaskScheduler AMainThreadScheduler)
+        {
+            collectedLogging = new List<string>();
+
+            mainThreadScheduler = AMainThreadScheduler;
+
+            form = new LoggingForm();
+
+            Application.Current.MainWindow.Closed += (object sender, EventArgs e) =>
+            {
+                if (form != null) form.Close();
+            };
+        }
+
+        private void ExecuteInMainContext(Action action)
+        {
+            Task task = new Task(action);
+            task.Start(mainThreadScheduler);
+        }
+
+        public void Add(string AMessage, LoggingLevel ALevel, string AModule)
+        {
+            collectedLogging.Add("[" + AModule + "] " + AMessage.Trim());
+
+            ExecuteInMainContext(() =>
+            {
+                if (!form.IsVisible)
+                {
+                    try
+                    {
+                        form.Show();
+                    }
+                    catch (Exception)
+                    {
+                        form = new LoggingForm();
+                        form.Show();
+                    }
+                }
+
+                form.SetList(collectedLogging);
+            });
+        }
+    }
+}
diff --git a/GitBitterEdit/MainWindow.xaml.cs b/GitBitterEdit/MainWindow.xaml.cs
@@ -42,7 +42,7 @@ public MainWindow()
             GitBitterContainer.Default.RegisterType<IIniFile, IniFileWindows>();
             GitBitterContainer.Default.RegisterType<IGitFilesAndFolders, GitFilesAndFoldersWindows>();
             GitBitterContainer.Default.RegisterType<ICredentialUI, CredentialUIWindows>();
-            GitBitterContainer.Default.RegisterType<IGitBitterLogging, GitBitterLoggingVoid>();
+            GitBitterContainer.Default.RegisterInstance<IGitBitterLogging>(new LoggingUI(TaskScheduler.FromCurrentSynchronizationContext()));    // use as singleton and create form in mainthread
 #endif
 
             settingsPath = Environment.CurrentDirectory;
@@ -71,15 +71,23 @@ private void btnUpdateAll_Click(object sender, RoutedEventArgs e)
             Cursor = Cursors.Wait;
             try
             {
-                var cloner = new PackageUnwrapper(config.Filename);
-                try
-                {
-                    cloner.StartAndWaitForUnwrapping();
-                }
-                catch (Exception ex)
+                var logging = GitBitterContainer.Default.Resolve<IGitBitterLogging>();
+                logging.Add("Updating", LoggingLevel.Info, "GitBitter");
+
+                new Task(() =>
                 {
-                    MessageBox.Show(ex.Message + "\n\n" + ex.InnerException.Message + "\n\n" + ex.InnerException.StackTrace);
-                }
+                    var cloner = new PackageUnwrapper(config.Filename);
+                    try
+                    {
+                        cloner.StartAndWaitForUnwrapping();
+                    }
+                    catch (Exception ex)
+                    {
+                        var errormessage = ex.Message + "\n\n" + ex.InnerException.Message + "\n\n" + ex.InnerException.StackTrace;
+                        logging.Add(errormessage, LoggingLevel.Info, "GitBitter");
+                        MessageBox.Show(errormessage);
+                    }
+                }).Start();
             }
             finally
             {
@@ -121,7 +129,7 @@ private void AddPackage(RepositoryDescription repo)
             var package = new Package();
             package.Repository = repo.URL;
             package.Folder = repo.Name;
-            if (!String.IsNullOrEmpty(repo.DefaultBranch))
+            if (!string.IsNullOrEmpty(repo.DefaultBranch))
             {
                 package.Branch = repo.DefaultBranch;
             }

diff --git a/GitBitterEdit/RepoSelect.xaml.cs b/GitBitterEdit/RepoSelect.xaml.cs
@@ -54,7 +54,7 @@ private void RefreshTeams()
 
             edTeam.ItemsSource = this.repoLister.GetTeams();
 
-            if (currentSelection != "")
+            if (currentSelection != string.Empty)
             {
                 var idx = edTeam.Items.IndexOf(currentSelection);
                 if (idx != -1)

diff --git a/GitBitterLib/GitBitterLoggingVoid.cs b/GitBitterLib/GitBitterLoggingVoid.cs
@@ -1,15 +1,13 @@
 namespace GitBitterLib
 {
-	using System;
+    public class GitBitterLoggingVoid : IGitBitterLogging
+    {
+        public GitBitterLoggingVoid()
+        {
+        }
 
-	public class GitBitterLoggingVoid : IGitBitterLogging
-	{
-		public GitBitterLoggingVoid()
-		{
-		}
-
-		public void Add(string AMessage, LoggingLevel ALevel)
-		{
-		}
-	}
+        public void Add(string message, LoggingLevel level, string module)
+        {
+        }
+    }
 }
diff --git a/GitBitterLib/Implementations/BitbucketLister.cs b/GitBitterLib/Implementations/BitbucketLister.cs
@@ -46,7 +46,7 @@ public List<string> GetTeams()
             sharpBucket = new SharpBucketV2();
             if (Login())
             {
-                var endpoint = sharpBucket.TeamsEndPoint("");
+                var endpoint = sharpBucket.TeamsEndPoint(string.Empty);
                 foreach (var team in endpoint.GetUserTeams())
                 {
                     teamnames.Add(team.username);

diff --git a/GitBitterLib/Implementations/CredentialManagerPlainText.cs b/GitBitterLib/Implementations/CredentialManagerPlainText.cs
@@ -20,7 +20,7 @@ public Credential ReadCredential(string applicationName)
             var username = ini.IniReadValue(applicationName, "username");
             var password = ini.IniReadValue(applicationName, "password");
 
-            if ((username == "") && (password == ""))
+            if ((username == string.Empty) && (password == string.Empty))
             {
                 return null;
             }

diff --git a/GitBitterLib/Implementations/GitBitterLoggingCommandLine.cs b/GitBitterLib/Implementations/GitBitterLoggingCommandLine.cs
@@ -8,11 +8,11 @@ public GitBitterLoggingCommandLine()
         {
         }
 
-        public void Add(string AMessage, LoggingLevel ALevel)
+        public void Add(string message, LoggingLevel level, string module)
         {
-            if (ALevel != LoggingLevel.Debugging)
+            if (level != LoggingLevel.Debugging)
             {
-                Console.WriteLine(AMessage);
+                Console.WriteLine("[" + module + "] " + message);
             }
         }
     }