Fixing issues with tracking last scan

AndMu · AndMu · commit 9a4b7046ba59 · 2018-02-20T19:21:40.000Z
diff --git a/src/Wikiled.YiScanner.Tests/Client/VideoHeaderExtensionsTests.cs b/src/Wikiled.YiScanner.Tests/Client/VideoHeaderExtensionsTests.cs
@@ -14,7 +14,7 @@ public class VideoHeaderExtensionsTests
         [TestCase(@"c:\Dir2\Dir\file", @"c:\out\Camera\Dir\file")]
         public void GetPath(string fileName, string expected)
         {
-            VideoHeader header = new VideoHeader(new HostInformation("Camera", IPAddress.Any), fileName);
+            VideoHeader header = new VideoHeader(new Host("Camera", IPAddress.Any), fileName);
             var result = header.GetPath(@"c:\out");
             Assert.AreEqual(expected, result);
         }
diff --git a/src/Wikiled.YiScanner.Tests/Client/VideoHeaderTests.cs b/src/Wikiled.YiScanner.Tests/Client/VideoHeaderTests.cs
@@ -9,14 +9,14 @@ namespace Wikiled.YiScanner.Tests.Client
     [TestFixture]
     public class VideoHeaderTests
     {
-        private HostInformation cameraDescription;
+        private Host cameraDescription;
 
         private VideoHeader instance;
 
         [SetUp]
         public void Setup()
         {
-            cameraDescription = new HostInformation("Test", IPAddress.None);
+            cameraDescription = new Host("Test", IPAddress.None);
             instance = CreateVideoHeader();
         }
 
diff --git a/src/Wikiled.YiScanner.Tests/Destinations/ChainedActionDestinationTests.cs b/src/Wikiled.YiScanner.Tests/Destinations/ChainedActionDestinationTests.cs
@@ -26,7 +26,7 @@ public class ChainedActionDestinationTests
         [SetUp]
         public void SetUp()
         {
-            header = new VideoHeader(new HostInformation("Camera", IPAddress.Any), "test.mov");
+            header = new VideoHeader(new Host("Camera", IPAddress.Any), "test.mov");
             mockDestination = new Mock<IDestination>();
             mockAction = new Mock<IPriorAction>();
             stream = new Mock<Stream>();
diff --git a/src/Wikiled.YiScanner.Tests/Destinations/ChainedPostActionDestinationTests.cs b/src/Wikiled.YiScanner.Tests/Destinations/ChainedPostActionDestinationTests.cs
@@ -26,7 +26,7 @@ public class ChainedPostActionDestinationTests
         [SetUp]
         public void SetUp()
         {
-            header = new VideoHeader(new HostInformation("Camera", IPAddress.Any), "test.mov");
+            header = new VideoHeader(new Host("Camera", IPAddress.Any), "test.mov");
             stream = new Mock<Stream>();
             mockDestination = new Mock<IDestination>();
             mockPostAction = new Mock<IPostAction>();
diff --git a/src/Wikiled.YiScanner.Tests/Destinations/CompressedDestinationTests.cs b/src/Wikiled.YiScanner.Tests/Destinations/CompressedDestinationTests.cs
@@ -34,7 +34,7 @@ public void Setup()
         public async Task Transfer()
         {
             Assert.IsFalse(File.Exists(outFile));
-            VideoHeader header = new VideoHeader(new HostInformation("Camera", IPAddress.Any), "test.txt");
+            VideoHeader header = new VideoHeader(new Host("Camera", IPAddress.Any), "test.txt");
             using (StreamReader reader = new StreamReader(Path.Combine(TestContext.CurrentContext.TestDirectory, "Data", "Test.txt")))
             {
                 await instance.Transfer(header, reader.BaseStream).ConfigureAwait(false);
diff --git a/src/Wikiled.YiScanner.Tests/Destinations/FileDestinationTests.cs b/src/Wikiled.YiScanner.Tests/Destinations/FileDestinationTests.cs
@@ -23,7 +23,7 @@ public class FileDestinationTests
         [SetUp]
         public void SetUp()
         {
-            header = new VideoHeader(new HostInformation("Camera", IPAddress.Any), "test.mov");
+            header = new VideoHeader(new Host("Camera", IPAddress.Any), "test.mov");
             outPath = Path.Combine(TestContext.CurrentContext.TestDirectory, "Out");
             if (Directory.Exists(outPath))
             {
diff --git a/src/Wikiled.YiScanner.Tests/Destinations/PictureFileDestinationTests.cs b/src/Wikiled.YiScanner.Tests/Destinations/PictureFileDestinationTests.cs
@@ -29,7 +29,7 @@ public void SetUp()
                 Directory.Delete(outPath, true);
             }
 
-            header = new VideoHeader(new HostInformation("Camera", IPAddress.Any), "test.mov");
+            header = new VideoHeader(new Host("Camera", IPAddress.Any), "test.mov");
             instance = CreatePictureFileDestination();
             stream = File.OpenRead(Path.Combine(TestContext.CurrentContext.TestDirectory, "data", "centaur_1.mpg"));
         }
diff --git a/src/Wikiled.YiScanner.Tests/Destinations/TransformedDestinationTests.cs b/src/Wikiled.YiScanner.Tests/Destinations/TransformedDestinationTests.cs
@@ -26,7 +26,7 @@ public class TransformedDestinationTests
         [SetUp]
         public void SetUp()
         {
-            header = new VideoHeader(new HostInformation("Test", IPAddress.Any), "test.mov");
+            header = new VideoHeader(new Host("Test", IPAddress.Any), "test.mov");
             mockDestination = new Mock<IDestination>();
             renameFunc = name => "test";
             stream = new Mock<Stream>();
diff --git a/src/YiScanner/Client/FtpDownloader.cs b/src/YiScanner/Client/FtpDownloader.cs
@@ -16,52 +16,44 @@ public class FtpDownloader : IFtpDownloader
     {
         private static readonly Logger log = LogManager.GetCurrentClassLogger();
 
-        private readonly HostInformation camera;
-
-        private readonly FtpConfig config;
+        private readonly HostTracking tracking;
 
         private readonly IDestination destination;
 
         private readonly Regex maskRegex;
 
         private readonly IPredicate predicate;
 
-        private DateTime? lastScan;
-
         public FtpDownloader(
-            FtpConfig config,
-            HostInformation camera,
+            HostTracking tracking,
             IDestination destination,
             IPredicate predicate)
         {
-            Guard.NotNull(() => config, config);
-            Guard.NotNull(() => camera, camera);
+            Guard.NotNull(() => tracking, tracking);
             Guard.NotNull(() => destination, destination);
             Guard.NotNull(() => predicate, predicate);
-            maskRegex = FileMask.GenerateFitMask(config.FileMask);
+            maskRegex = FileMask.GenerateFitMask(tracking.Config.FileMask);
             log.Debug("Generated mask: {0}", maskRegex);
-            this.camera = camera;
+            this.tracking = tracking;
             this.destination = destination;
             this.predicate = predicate;
-            this.config = config;
         }
 
         public async Task<DateTime> Download()
         {
             // Get the object used to communicate with the server.  
-            using (var client = new FtpClient(camera.Address.ToString()))
+            using (var client = new FtpClient(tracking.Host.Address.ToString()))
             {
-                log.Info("Connecting: {0}", camera.Address);
+                log.Info("Connecting: {0}", tracking.Host.Address);
                 client.Credentials = new NetworkCredential(
-                    config.Login,
-                    config.Password);
+                    tracking.Config.Login,
+                    tracking.Config.Password);
                 client.Connect();
-                log.Info("Connected: {0}!", camera.Address);
-                await Retrieve(client, config.Path).ConfigureAwait(false);
+                log.Info("Connected: {0}!", tracking.Host.Address);
+                await Retrieve(client, tracking.Config.Path).ConfigureAwait(false);
             }
 
-            var now = DateTime.Now;
-            lastScan = now;
+            var now = tracking.Scanned();
             return now;
         }
 
@@ -70,10 +62,10 @@ private async Task ProcessFile(FtpClient client, FtpListItem item)
             Stream stream = null;
             try
             {
-                var header = new VideoHeader(camera, item.FullName);
+                var header = new VideoHeader(tracking.Host, item.FullName);
                 if (!destination.IsDownloaded(header))
                 {
-                    log.Info("Downloading <{0}> from [{1}]", item.FullName, camera.Name);
+                    log.Info("Downloading <{0}> from [{1}]", item.FullName, tracking.Host.Name);
                     stream = await client.OpenReadAsync(item.FullName).ConfigureAwait(false);
                     await destination.Transfer(header, stream).ConfigureAwait(false);
                     var reply = await client.GetReplyAsync().ConfigureAwait(false);
@@ -85,7 +77,7 @@ private async Task ProcessFile(FtpClient client, FtpListItem item)
                             reply.Message,
                             reply.Type,
                             reply.Code,
-                            camera.Name);
+                            tracking.Host.Name);
                     }
                     else
                     {
@@ -94,12 +86,12 @@ private async Task ProcessFile(FtpClient client, FtpListItem item)
                             reply.ErrorMessage,
                             reply.Type,
                             reply.Code,
-                            camera.Name);
+                            tracking.Host.Name);
                     }
                 }
                 else
                 {
-                    log.Info("File is already downloaded - <{0}> {1}", item.FullName, camera.Name);
+                    log.Info("File is already downloaded - <{0}> {1}", item.FullName, tracking.Host.Name);
                 }
             }
             catch (Exception ex)
@@ -119,7 +111,7 @@ private async Task Retrieve(FtpClient client, string path)
                 if (item.Type == FtpFileSystemObjectType.File)
                 {
                     if (maskRegex.IsMatch(item.FullName) &&
-                        predicate.CanDownload(lastScan, item.FullName, item.Modified))
+                        predicate.CanDownload(tracking.LastScanned, item.FullName, item.Modified))
                     {
                         if (item.Modified < DateTime.Now.AddMinutes(1))
                         {
diff --git a/src/YiScanner/Client/VideoHeader.cs b/src/YiScanner/Client/VideoHeader.cs
@@ -5,15 +5,15 @@ namespace Wikiled.YiScanner.Client
 {
     public class VideoHeader
     {
-        public VideoHeader(HostInformation camera, string fileName)
+        public VideoHeader(Host camera, string fileName)
         {
             Guard.NotNull(() => camera, camera);
             Guard.NotNullOrEmpty(() => fileName, fileName);
             Camera = camera;
             FileName = fileName;
         }
 
-        public HostInformation Camera { get; }
+        public Host Camera { get; }
 
         public string FileName { get; }
     }
diff --git a/src/YiScanner/Monitoring/Source/DynamicHostManager.cs b/src/YiScanner/Monitoring/Source/DynamicHostManager.cs
@@ -16,7 +16,7 @@ public class DynamicHostManager : IHostManager
     {
         private static readonly Logger log = LogManager.GetCurrentClassLogger();
 
-        private readonly ConcurrentDictionary<IPAddress, HostInformation> result = new ConcurrentDictionary<IPAddress, HostInformation>();
+        private readonly ConcurrentDictionary<IPAddress, Host> result = new ConcurrentDictionary<IPAddress, Host>();
 
         private readonly IDisposable subscription;
 
@@ -40,15 +40,15 @@ public void Dispose()
             subscription.Dispose();
         }
 
-        public IEnumerable<HostInformation> GetHosts()
+        public IEnumerable<Host> GetHosts()
         {
             return result.Values;
         }
 
         private async Task<bool> ScanFtp()
         {
             log.Debug("ScanFtp");
-            ConcurrentDictionary<IPAddress, HostInformation> thisCycle = new ConcurrentDictionary<IPAddress, HostInformation>();
+            ConcurrentDictionary<IPAddress, Host> thisCycle = new ConcurrentDictionary<IPAddress, Host>();
             await scanner.FindAddresses(config.NetworkMask, 21)
                          .ForEachAsync(
                              item =>
diff --git a/src/YiScanner/Monitoring/Source/Host.cs b/src/YiScanner/Monitoring/Source/Host.cs
@@ -2,9 +2,9 @@
 
 namespace Wikiled.YiScanner.Monitoring.Source
 {
-    public class HostInformation
+    public class Host
     {
-        public HostInformation(string name, IPAddress address, int port = 21)
+        public Host(string name, IPAddress address, int port = 21)
         {
             Name = name;
             Address = address;
diff --git a/src/YiScanner/Monitoring/Source/HostTracking.cs b/src/YiScanner/Monitoring/Source/HostTracking.cs
@@ -0,0 +1,31 @@
+﻿using System;
+using Wikiled.Common.Arguments;
+using Wikiled.YiScanner.Client;
+
+namespace Wikiled.YiScanner.Monitoring.Source
+{
+    public class HostTracking
+    {
+        public HostTracking(FtpConfig config, Host host)
+        {
+            Guard.NotNull(() => config, config);
+            Guard.NotNull(() => host, host);
+            Config = config;
+            Host = host;
+            LastScanned = null;
+        }
+
+        public FtpConfig Config { get; }
+
+        public Host Host { get; }
+
+        public DateTime? LastScanned { get; private set; }
+
+        public DateTime Scanned()
+        {
+            var now = DateTime.Now;
+            LastScanned = now;
+            return now;
+        }
+    }
+}
diff --git a/src/YiScanner/Monitoring/Source/IHostManager.cs b/src/YiScanner/Monitoring/Source/IHostManager.cs
@@ -5,6 +5,6 @@ namespace Wikiled.YiScanner.Monitoring.Source
 {
     public interface IHostManager : IDisposable
     {
-        IEnumerable<HostInformation> GetHosts();
+        IEnumerable<Host> GetHosts();
     }
 }
diff --git a/src/YiScanner/Monitoring/Source/SourceFactory.cs b/src/YiScanner/Monitoring/Source/SourceFactory.cs
@@ -1,5 +1,7 @@
-﻿using System.Collections.Generic;
+﻿using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using NLog;
 using Wikiled.Common.Arguments;
 using Wikiled.YiScanner.Client;
@@ -16,6 +18,8 @@ public class SourceFactory : ISourceFactory
 
         private readonly FtpConfig ftpConfig;
 
+        private readonly ConcurrentDictionary<IPAddress, HostTracking> trackingInformation = new ConcurrentDictionary<IPAddress, HostTracking>();
+
         public SourceFactory(FtpConfig ftpConfig, IScanConfig config, IPredicate filePredicate)
         {
             Guard.NotNull(() => ftpConfig, ftpConfig);
@@ -51,11 +55,16 @@ private IDestination ConstructDestination()
             return destination;
         }
 
-        private IFtpDownloader ConstructDownloader(HostInformation host, IDestination destination)
+        private IFtpDownloader ConstructDownloader(Host host, IDestination destination)
         {
+            if (!trackingInformation.TryGetValue(host.Address, out var tracking))
+            {
+                tracking = new HostTracking(ftpConfig, host);
+                trackingInformation[host.Address] = tracking;
+            }
+
             return new FtpDownloader(
-                ftpConfig,
-                host,
+                tracking,
                 destination,
                 filePredicate);
         }
diff --git a/src/YiScanner/Monitoring/Source/StaticHostManager.cs b/src/YiScanner/Monitoring/Source/StaticHostManager.cs
@@ -19,7 +19,7 @@ public StaticHostManager(IScanConfig config)
             this.config = config;
         }
 
-        public IEnumerable<HostInformation> GetHosts()
+        public IEnumerable<Host> GetHosts()
         {
             return GetHostsInternal();
         }
@@ -28,7 +28,7 @@ public void Dispose()
         {
         }
 
-        private IEnumerable<HostInformation> GetHostsInternal()
+        private IEnumerable<Host> GetHostsInternal()
         {
             if (string.IsNullOrEmpty(config.Cameras))
             {
@@ -52,7 +52,7 @@ private IEnumerable<HostInformation> GetHostsInternal()
 
             for (int i = 0; i < listOfCameras.Length; i++)
             {
-                yield return new HostInformation(listOfCameras[i], IPAddress.Parse(listOfHosts[i]));
+                yield return new Host(listOfCameras[i], IPAddress.Parse(listOfHosts[i]));
             }
         }
     }
diff --git a/src/YiScanner/Network/INetworkScanner.cs b/src/YiScanner/Network/INetworkScanner.cs
@@ -7,7 +7,7 @@ namespace Wikiled.YiScanner.Network
 {
     public interface INetworkScanner
     {
-        IObservable<HostInformation> FindAddresses(string network, int port);
+        IObservable<Host> FindAddresses(string network, int port);
 
         Task<bool> ScanPort(IPAddress address, int port);
     }
diff --git a/src/YiScanner/Network/NetworkScanner.cs b/src/YiScanner/Network/NetworkScanner.cs
@@ -19,15 +19,15 @@ public NetworkScanner(IScheduler scheduler)
             this.scheduler = scheduler;
         }
 
-        public IObservable<HostInformation> FindAddresses(string network, int port)
+        public IObservable<Host> FindAddresses(string network, int port)
         {
             IPNetwork ipNetwork = IPNetwork.Parse(network);
             return ipNetwork.ListIPAddress()
                    .ToObservable()
                    .SelectMany(item => Observable.Start(async () => (await ScanPort(item, port).ConfigureAwait(false), item), scheduler)
                                                  .Merge()
                                                  .Where(pair => pair.Item1)
-                                                 .Select(pair => new HostInformation(GetHostName(pair.Item2), pair.Item2)));
+                                                 .Select(pair => new Host(GetHostName(pair.Item2), pair.Item2)));
         }
 
         public async Task<bool> ScanPort(IPAddress address, int port)

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class VideoHeaderExtensionsTests`
`14`	`14`	`[TestCase(@"c:\Dir2\Dir\file", @"c:\out\Camera\Dir\file")]`
`15`	`15`	`public void GetPath(string fileName, string expected)`
`16`	`16`	`{`
`17`		`- VideoHeader header = new VideoHeader(new HostInformation("Camera", IPAddress.Any), fileName);`
	`17`	`+ VideoHeader header = new VideoHeader(new Host("Camera", IPAddress.Any), fileName);`
`18`	`18`	`var result = header.GetPath(@"c:\out");`
`19`	`19`	`Assert.AreEqual(expected, result);`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@ namespace Wikiled.YiScanner.Tests.Client`
`9`	`9`	`[TestFixture]`
`10`	`10`	`public class VideoHeaderTests`
`11`	`11`	`{`
`12`		`- private HostInformation cameraDescription;`
	`12`	`+ private Host cameraDescription;`
`13`	`13`
`14`	`14`	`private VideoHeader instance;`
`15`	`15`
`16`	`16`	`[SetUp]`
`17`	`17`	`public void Setup()`
`18`	`18`	`{`
`19`		`- cameraDescription = new HostInformation("Test", IPAddress.None);`
	`19`	`+ cameraDescription = new Host("Test", IPAddress.None);`
`20`	`20`	`instance = CreateVideoHeader();`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public class ChainedActionDestinationTests`
`26`	`26`	`[SetUp]`
`27`	`27`	`public void SetUp()`
`28`	`28`	`{`
`29`		`- header = new VideoHeader(new HostInformation("Camera", IPAddress.Any), "test.mov");`
	`29`	`+ header = new VideoHeader(new Host("Camera", IPAddress.Any), "test.mov");`
`30`	`30`	`mockDestination = new Mock<IDestination>();`
`31`	`31`	`mockAction = new Mock<IPriorAction>();`
`32`	`32`	`stream = new Mock<Stream>();`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public class ChainedPostActionDestinationTests`
`26`	`26`	`[SetUp]`
`27`	`27`	`public void SetUp()`
`28`	`28`	`{`
`29`		`- header = new VideoHeader(new HostInformation("Camera", IPAddress.Any), "test.mov");`
	`29`	`+ header = new VideoHeader(new Host("Camera", IPAddress.Any), "test.mov");`
`30`	`30`	`stream = new Mock<Stream>();`
`31`	`31`	`mockDestination = new Mock<IDestination>();`
`32`	`32`	`mockPostAction = new Mock<IPostAction>();`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void Setup()`
`34`	`34`	`public async Task Transfer()`
`35`	`35`	`{`
`36`	`36`	`Assert.IsFalse(File.Exists(outFile));`
`37`		`- VideoHeader header = new VideoHeader(new HostInformation("Camera", IPAddress.Any), "test.txt");`
	`37`	`+ VideoHeader header = new VideoHeader(new Host("Camera", IPAddress.Any), "test.txt");`
`38`	`38`	`using (StreamReader reader = new StreamReader(Path.Combine(TestContext.CurrentContext.TestDirectory, "Data", "Test.txt")))`
`39`	`39`	`{`
`40`	`40`	`await instance.Transfer(header, reader.BaseStream).ConfigureAwait(false);`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class FileDestinationTests`
`23`	`23`	`[SetUp]`
`24`	`24`	`public void SetUp()`
`25`	`25`	`{`
`26`		`- header = new VideoHeader(new HostInformation("Camera", IPAddress.Any), "test.mov");`
	`26`	`+ header = new VideoHeader(new Host("Camera", IPAddress.Any), "test.mov");`
`27`	`27`	`outPath = Path.Combine(TestContext.CurrentContext.TestDirectory, "Out");`
`28`	`28`	`if (Directory.Exists(outPath))`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void SetUp()`
`29`	`29`	`Directory.Delete(outPath, true);`
`30`	`30`	`}`
`31`	`31`
`32`		`- header = new VideoHeader(new HostInformation("Camera", IPAddress.Any), "test.mov");`
	`32`	`+ header = new VideoHeader(new Host("Camera", IPAddress.Any), "test.mov");`
`33`	`33`	`instance = CreatePictureFileDestination();`
`34`	`34`	`stream = File.OpenRead(Path.Combine(TestContext.CurrentContext.TestDirectory, "data", "centaur_1.mpg"));`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public class TransformedDestinationTests`
`26`	`26`	`[SetUp]`
`27`	`27`	`public void SetUp()`
`28`	`28`	`{`
`29`		`- header = new VideoHeader(new HostInformation("Test", IPAddress.Any), "test.mov");`
	`29`	`+ header = new VideoHeader(new Host("Test", IPAddress.Any), "test.mov");`
`30`	`30`	`mockDestination = new Mock<IDestination>();`
`31`	`31`	`renameFunc = name => "test";`
`32`	`32`	`stream = new Mock<Stream>();`
Original file line number	Diff line number	Diff line change
`@@ -16,52 +16,44 @@ public class FtpDownloader : IFtpDownloader`
`16`	`16`	`{`
`17`	`17`	`private static readonly Logger log = LogManager.GetCurrentClassLogger();`
`18`	`18`
`19`		`- private readonly HostInformation camera;`
`20`		`-`
`21`		`- private readonly FtpConfig config;`
	`19`	`+ private readonly HostTracking tracking;`
`22`	`20`
`23`	`21`	`private readonly IDestination destination;`
`24`	`22`
`25`	`23`	`private readonly Regex maskRegex;`
`26`	`24`
`27`	`25`	`private readonly IPredicate predicate;`
`28`	`26`
`29`		`- private DateTime? lastScan;`
`30`		`-`
`31`	`27`	`public FtpDownloader(`
`32`		`- FtpConfig config,`
`33`		`- HostInformation camera,`
	`28`	`+ HostTracking tracking,`
`34`	`29`	`IDestination destination,`
`35`	`30`	`IPredicate predicate)`
`36`	`31`	`{`
`37`		`- Guard.NotNull(() => config, config);`
`38`		`- Guard.NotNull(() => camera, camera);`
	`32`	`+ Guard.NotNull(() => tracking, tracking);`
`39`	`33`	`Guard.NotNull(() => destination, destination);`
`40`	`34`	`Guard.NotNull(() => predicate, predicate);`
`41`		`- maskRegex = FileMask.GenerateFitMask(config.FileMask);`
	`35`	`+ maskRegex = FileMask.GenerateFitMask(tracking.Config.FileMask);`
`42`	`36`	`log.Debug("Generated mask: {0}", maskRegex);`
`43`		`- this.camera = camera;`
	`37`	`+ this.tracking = tracking;`
`44`	`38`	`this.destination = destination;`
`45`	`39`	`this.predicate = predicate;`
`46`		`- this.config = config;`
`47`	`40`	`}`
`48`	`41`
`49`	`42`	`public async Task<DateTime> Download()`
`50`	`43`	`{`
`51`	`44`	`// Get the object used to communicate with the server.`
`52`		`- using (var client = new FtpClient(camera.Address.ToString()))`
	`45`	`+ using (var client = new FtpClient(tracking.Host.Address.ToString()))`
`53`	`46`	`{`
`54`		`- log.Info("Connecting: {0}", camera.Address);`
	`47`	`+ log.Info("Connecting: {0}", tracking.Host.Address);`
`55`	`48`	`client.Credentials = new NetworkCredential(`
`56`		`- config.Login,`
`57`		`- config.Password);`
	`49`	`+ tracking.Config.Login,`
	`50`	`+ tracking.Config.Password);`
`58`	`51`	`client.Connect();`
`59`		`- log.Info("Connected: {0}!", camera.Address);`
`60`		`- await Retrieve(client, config.Path).ConfigureAwait(false);`
	`52`	`+ log.Info("Connected: {0}!", tracking.Host.Address);`
	`53`	`+ await Retrieve(client, tracking.Config.Path).ConfigureAwait(false);`
`61`	`54`	`}`
`62`	`55`
`63`		`- var now = DateTime.Now;`
`64`		`- lastScan = now;`
	`56`	`+ var now = tracking.Scanned();`
`65`	`57`	`return now;`
`66`	`58`	`}`
`67`	`59`
`@@ -70,10 +62,10 @@ private async Task ProcessFile(FtpClient client, FtpListItem item)`
`70`	`62`	`Stream stream = null;`
`71`	`63`	`try`
`72`	`64`	`{`
`73`		`- var header = new VideoHeader(camera, item.FullName);`
	`65`	`+ var header = new VideoHeader(tracking.Host, item.FullName);`
`74`	`66`	`if (!destination.IsDownloaded(header))`
`75`	`67`	`{`
`76`		`- log.Info("Downloading <{0}> from [{1}]", item.FullName, camera.Name);`
	`68`	`+ log.Info("Downloading <{0}> from [{1}]", item.FullName, tracking.Host.Name);`
`77`	`69`	`stream = await client.OpenReadAsync(item.FullName).ConfigureAwait(false);`
`78`	`70`	`await destination.Transfer(header, stream).ConfigureAwait(false);`
`79`	`71`	`var reply = await client.GetReplyAsync().ConfigureAwait(false);`
`@@ -85,7 +77,7 @@ private async Task ProcessFile(FtpClient client, FtpListItem item)`
`85`	`77`	`reply.Message,`
`86`	`78`	`reply.Type,`
`87`	`79`	`reply.Code,`
`88`		`- camera.Name);`
	`80`	`+ tracking.Host.Name);`
`89`	`81`	`}`
`90`	`82`	`else`
`91`	`83`	`{`
`@@ -94,12 +86,12 @@ private async Task ProcessFile(FtpClient client, FtpListItem item)`
`94`	`86`	`reply.ErrorMessage,`
`95`	`87`	`reply.Type,`
`96`	`88`	`reply.Code,`
`97`		`- camera.Name);`
	`89`	`+ tracking.Host.Name);`
`98`	`90`	`}`
`99`	`91`	`}`
`100`	`92`	`else`
`101`	`93`	`{`
`102`		`- log.Info("File is already downloaded - <{0}> {1}", item.FullName, camera.Name);`
	`94`	`+ log.Info("File is already downloaded - <{0}> {1}", item.FullName, tracking.Host.Name);`
`103`	`95`	`}`
`104`	`96`	`}`
`105`	`97`	`catch (Exception ex)`
`@@ -119,7 +111,7 @@ private async Task Retrieve(FtpClient client, string path)`
`119`	`111`	`if (item.Type == FtpFileSystemObjectType.File)`
`120`	`112`	`{`
`121`	`113`	`if (maskRegex.IsMatch(item.FullName) &&`
`122`		`- predicate.CanDownload(lastScan, item.FullName, item.Modified))`
	`114`	`+ predicate.CanDownload(tracking.LastScanned, item.FullName, item.Modified))`
`123`	`115`	`{`
`124`	`116`	`if (item.Modified < DateTime.Now.AddMinutes(1))`
`125`	`117`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,15 @@ namespace Wikiled.YiScanner.Client`
`5`	`5`	`{`
`6`	`6`	`public class VideoHeader`
`7`	`7`	`{`
`8`		`- public VideoHeader(HostInformation camera, string fileName)`
	`8`	`+ public VideoHeader(Host camera, string fileName)`
`9`	`9`	`{`
`10`	`10`	`Guard.NotNull(() => camera, camera);`
`11`	`11`	`Guard.NotNullOrEmpty(() => fileName, fileName);`
`12`	`12`	`Camera = camera;`
`13`	`13`	`FileName = fileName;`
`14`	`14`	`}`
`15`	`15`
`16`		`- public HostInformation Camera { get; }`
	`16`	`+ public Host Camera { get; }`
`17`	`17`
`18`	`18`	`public string FileName { get; }`
`19`	`19`	`}`