Merge pull request #11 from olangness/crawl

Crawl

Author: olangness

WebCrawler/App.config

@@ -4,7 +4,7 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
   </startup>
   <appSettings>
-    <add key="url" value="https://www.ndsu.edu/" />
+    <add key="url" value="" />
     <!-- What site do you want to crawl? -->
     <add key="logTextFileName" value="C:\Users\awick\OneDrive\Documents\GitHub\WebCrawler\WebCrawler\log.txt" />
     <!-- Point this to some location that exists on your machine -->

WebCrawler/MainWindow.xaml

@@ -13,8 +13,5 @@
         <TabItem Header="Website Tree" >
             <uc1:WebsiteTreeTabView></uc1:WebsiteTreeTabView>
         </TabItem>
-        <TabItem Header="Topics" >
-            <topicstree:TopicTreeTabView></topicstree:TopicTreeTabView>
-        </TabItem>
     </TabControl>
 </Window>

WebCrawler/MainWindow.xaml.cs

@@ -8,9 +8,8 @@ public partial class MainWindow : Window
     {
         public MainWindow()
         {
-            Crawler crawl = new Crawler(new ExternalUrlRepository(), new OtherUrlRepository(), new FailedUrlRepository(), new CurrentPageUrlRepository());
-            crawl.InitializeCrawl();
-            //InitializeComponent();
+            
+            InitializeComponent();
         }
 
         private void CrawlingTabView_Loaded(object sender, RoutedEventArgs e)

WebCrawler/Model/Crawler.cs

@@ -10,10 +10,12 @@
 using WebCrawler.Interfaces;
 using System.Text.RegularExpressions;
 using WebCrawler.Repositories;
+using System.Collections.ObjectModel;
+using WebCrawler.Model.Data_Storage;
 
 namespace WebCrawler.Model
 {
-    class Crawler
+    public class Crawler
     {
         private IRepos _externalUrlRepository;
         private IRepos _otherUrlRepository;
@@ -24,7 +26,41 @@ 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<Log> log = new List<Log>();
+        private static ObservableCollection<Log> log = new ObservableCollection<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; }
+        }
+
+        public List<Link> Links
+        {
+            get { return links; }
+            set { links = value; }
+        }
 
         //Constructor
         public Crawler(IRepos externalUrlRepository, IRepos otherUrlRepository, IRepos failedUrlRepository, IRepos currentPageUrlRepository)
@@ -39,12 +75,18 @@ public Crawler(IRepos externalUrlRepository, IRepos otherUrlRepository, IRepos f
         }
 
         //Initializing the crawling process.
-        public void InitializeCrawl()
+        public void InitializeCrawl(string key, string url)
         {
-            CrawlPage(ConfigurationManager.AppSettings["url"]);
+            //var crawlUrl = ConfigurationManager.AppSettings["url"];
+            Configuration configuration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+            configuration.AppSettings.Settings[key].Value = url;
+            configuration.Save();
+
+            ConfigurationManager.RefreshSection("appSettings");
+            //CrawlPage(ConfigurationManager.AppSettings["url"]);
         }
 
-        //Initialisting the reporting
+        /*//Initialisting the reporting
         public void InitilizeCreateReport()
         {
             //var stringBuilder = Reporting.CreateReport(_externalUrlRepository, _otherUrlRepository, _failedUrlRepository, _currentPageUrlRepository, _pages, _exceptions);
@@ -54,7 +96,7 @@ public void InitilizeCreateReport()
             //System.Diagnostics.Process.Start(ConfigurationManager.AppSettings["logTextFileName"].ToString());
 
             //Environment.Exit(0);
-        }
+        }*/
 
         private void CrawlPage(string url)
         {
@@ -69,11 +111,8 @@ private void CrawlPage(string url)
                 page.Url = url;
 
                 _pages.Add(page);
-                links.Add(url);
-                log.Add("New Log Entry: "+url);
-
-
-                //AddUrlToList(topic);
+                //links.Add(url);
+                log.Add(new Log($"New Entry: {url}", DateTime.Now));
 
                 linkParser.ParseLinks(page, url);
 

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/Link.cs

@@ -6,7 +6,7 @@
 
 namespace WebCrawler.Model
 {
-    class Link
+    public class Link
     {
         string name;
         string url;

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
 {
-    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/Model/Page.cs

@@ -11,20 +11,25 @@ public Page() { }
         private string _url;
         private int _viewstateSize;
 
-        public int Size { get; }
-
-        public string Text { get; set; }
+        public int Size
+        {
+            get { return _size; }
+        }
 
-        public string Url { get; set; }
+        public string Text
+        {
+            get { return _text; }
+            set
+            {
+                _text = value;
+                _size = value.Length;
+            }
+        }
 
-        public override bool Equals(object obj)
+        public string Url
         {
-            if (!(obj is Page))
-                return false;
-            Page other = (Page)obj;
-            return other.Url == Url;
+            get { return _url; }
+            set { _url = value; }
         }
     }
 }
-
-

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

@@ -30,5 +30,9 @@ public CrawlingTabView()
             // The DataContext serves as the starting point of Binding Paths
             DataContext = _viewModel;
         }
+
+        public void ListViewLogsSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+        }
     }
 }