Logging is now binded

Author: olangness

WebCrawler/Model/Crawler.cs

@@ -10,6 +10,8 @@
 using WebCrawler.Interfaces;
 using System.Text.RegularExpressions;
 using WebCrawler.Repositories;
+using System.Collections.ObjectModel;
+using WebCrawler.Model.Data_Storage;
 
 namespace WebCrawler.Model
 {
@@ -24,9 +26,31 @@ public class Crawler
         private bool isCurrentPage = true;
         private static List<string> urlsWithTopics = new List<string>();
         private static List<Link> links = new List<Link>();
-        private static List<string> log = new List<string>();
+        private static ObservableCollection<Log> log = new ObservableCollection<Log>();
 
-        public List<string> Log
+        private static Crawler instance = null;
+        private static readonly object padlock = new object();
+
+        Crawler()
+        {
+        }
+
+        public static Crawler Instance
+        {
+            get
+            {
+                lock (padlock)
+                {
+                    if (instance == null)
+                    {
+                        instance = new Crawler(new ExternalUrlRepository(), new OtherUrlRepository(), new FailedUrlRepository(), new CurrentPageUrlRepository());
+                    }
+                    return instance;
+                }
+            }
+        }
+
+        public ObservableCollection<Log> Log
         {
             get { return log; }
             set { log = value; }
@@ -82,7 +106,7 @@ private void CrawlPage(string url)
 
                 _pages.Add(page);
                 //links.Add(url);
-                log.Add("New Log Entry: "+url);
+                log.Add(new Log($"New Entry: {url}", DateTime.Now));
 
 
                 //AddUrlToList(topic);

WebCrawler/Model/Data Storage/ILog.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WebCrawler.Model.Data_Storage
+{
+    public interface ILog
+    {
+        string MessageText { get; set; }
+        DateTime MessageTime { get; set; }
+    }
+}

WebCrawler/Model/Data Storage/Log.cs

@@ -1,38 +1,59 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WebCrawler.Model.Data_Storage;
 
 namespace WebCrawler.Model
 {
-    public class Log
+    public class Log : ILog
     {
         string messageText;
         DateTime messageTime;
 
 
         public Log() { }
 
-        public Log(string message, DateTime time)
+        private DateTime _messageTime;
+        public DateTime MessageTime
         {
-            MessageText = message;
-            
-            MessageTime = time;
+            get { return _messageTime; }
+            set
+            {
+                _messageTime = value;
+                NotifyPropertyChanged("ProjectID");
+            }
         }
 
+        private string _messageText;
         public string MessageText
         {
-            get { return messageText; }
-
-            set { messageText = value; }
+            get { return _messageText; }
+            set
+            {
+                _messageText = value;
+                NotifyPropertyChanged("ProjectID");
+            }
         }
 
-        public DateTime MessageTime
+        public Log(string message, DateTime time)
         {
-            get { return messageTime; }
+            MessageTime = time;
+            MessageText = message;
+        }
 
-            set { messageTime = value; }
+
+        [field: NonSerialized]
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private void NotifyPropertyChanged(String info)
+        {
+            if (PropertyChanged != null)
+            {
+                PropertyChanged(this, new PropertyChangedEventArgs(info));
+            }
         }
     }
 }

WebCrawler/View/Crawling/CrawlingTabView.xaml

@@ -12,6 +12,15 @@
             <ColumnDefinition></ColumnDefinition>
         </Grid.ColumnDefinitions>
         <local:WebsiteCrawlerView Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-        <local:LogView Grid.Column="1"/>
+        <ListView Grid.Column="1" Name="ListViewProjects" Grid.RowSpan="3" SelectionChanged="ListViewLogsSelectionChanged" ItemsSource="{Binding Logs}" IsSynchronizedWithCurrentItem="True" MinWidth="100">
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <WrapPanel>
+                        <TextBlock Text="{Binding Path=MessageTime, StringFormat='yyyy-MM-dd HH:mm:ss' }"/>
+                        <TextBlock Text="{Binding Path=MessageText}"/>
+                    </WrapPanel>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
     </Grid>
 </UserControl>

WebCrawler/View/Crawling/CrawlingTabView.xaml.cs

@@ -25,11 +25,14 @@ public partial class CrawlingTabView : UserControl
 
         public CrawlingTabView()
         {
-            _viewModel = new CrawlingTabViewModel();
             InitializeComponent();
-            
+            _viewModel = new CrawlingTabViewModel();
             // The DataContext serves as the starting point of Binding Paths
             DataContext = _viewModel;
         }
+
+        public void ListViewLogsSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+        }
     }
 }

WebCrawler/View/Crawling/ListToTextConverter.cs

@@ -6,12 +6,7 @@
              xmlns:local="clr-namespace:WebCrawler.View.Crawling"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <UserControl.Resources>
-            <local:ListToTextConverter x:Key="converter1" />
-        </UserControl.Resources>
     <Grid>
-        <TextBox Name="tb_files"  
-                 Text="{Binding Path=LogModel, Converter={StaticResource converter1} }"
-                 />
+        
     </Grid>
 </UserControl>

WebCrawler/View/Crawling/LogView.xaml

@@ -24,12 +24,12 @@ public partial class LogView : UserControl
     {
         private readonly LogViewModel _viewModel;
 
-        public LogView(Crawler model)
+        public LogView()
         {
-            InitializeComponent();
-            _viewModel = new LogViewModel(model);
-            // The DataContext serves as the starting point of Binding Paths
-            DataContext = _viewModel;
+            //InitializeComponent();
+            //_viewModel = new LogViewModel();
+            //// The DataContext serves as the starting point of Binding Paths
+            //DataContext = _viewModel;
         }
     }
 }

WebCrawler/View/Crawling/LogView.xaml.cs

@@ -24,10 +24,10 @@ public partial class WebsiteCrawlerView : UserControl
     {
         private readonly WebsiteCrawlerViewModel _viewModel;
 
-        public WebsiteCrawlerView(Crawler model)
+        public WebsiteCrawlerView()
         {
             InitializeComponent();
-            _viewModel = new WebsiteCrawlerViewModel(model);
+            _viewModel = new WebsiteCrawlerViewModel();
             // The DataContext serves as the starting point of Binding Paths
             DataContext = _viewModel;
         }

WebCrawler/View/Crawling/WebsiteCrawlerView.xaml.cs

@@ -1,26 +1,27 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Controls;
 using WebCrawler.Model;
+using WebCrawler.Model.Data_Storage;
 using WebCrawler.Repositories;
 using WebCrawler.View.Crawling;
 
 namespace WebCrawler.ViewModel.Crawling
 {
     class CrawlingTabViewModel : INotifyPropertyChanged
     {
-        public WebsiteCrawlerView WebsiteCrawlerView { get; set; }
+        public WebsiteCrawlerViewModel WebsiteCrawlerViewModel { get; set; }
 
-        public LogView LogView { get; set; }
+        public ObservableCollection<Log> Logs { get; set; } = new ObservableCollection<Log>();
 
         public CrawlingTabViewModel()
         {
-            Crawler model = new Crawler(new ExternalUrlRepository(), new OtherUrlRepository(), new FailedUrlRepository(), new CurrentPageUrlRepository());
-            WebsiteCrawlerView = new WebsiteCrawlerView(model);
-            LogView = new LogView(model);
+            Logs = Crawler.Instance.Log;
         }
 
 
@@ -33,5 +34,7 @@ protected void OnPropertyChange(string propertyName)
                 PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
             }
         }
+
+        
     }
 }