@@ -16,8 +16,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SiphonService", "SiphonServ EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SiphonConsole", "SiphonConsole\SiphonConsole.vbproj", "{DFD27A39-C804-4589-9DDB-F2C0412B11A0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net", "..\LumiSoft.Net\Net\Net\Net.csproj", "{7AB36CCF-5FFD-4780-A54E-A102ECA028B5}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -40,10 +38,6 @@ Global {DFD27A39-C804-4589-9DDB-F2C0412B11A0}.Debug|Any CPU.Build.0 = Debug|Any CPU {DFD27A39-C804-4589-9DDB-F2C0412B11A0}.Release|Any CPU.ActiveCfg = Release|Any CPU {DFD27A39-C804-4589-9DDB-F2C0412B11A0}.Release|Any CPU.Build.0 = Release|Any CPU - {7AB36CCF-5FFD-4780-A54E-A102ECA028B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7AB36CCF-5FFD-4780-A54E-A102ECA028B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7AB36CCF-5FFD-4780-A54E-A102ECA028B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7AB36CCF-5FFD-4780-A54E-A102ECA028B5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Siphon.sln @@ -53,6 +53,25 @@ Public Class FtpDirectoryMonitor End Sub ''' <summary> + ''' Gets/sets the credentials to use to connect to the ftp server. + ''' </summary> + ''' <value></value> + ''' <returns>NetworkCredential</returns> + ''' <remarks>If no credentials are set in code or in config, the user "anonymous" will be sent.</remarks> + Public Overrides Property Credentials() As System.Net.NetworkCredential + Get + If MyBase.Credentials Is Nothing Then + Me.Credentials = New NetworkCredential("anonymous", "anonymous") + End If + + Return MyBase.Credentials + End Get + Set(ByVal value As System.Net.NetworkCredential) + MyBase.Credentials = value + End Set + End Property + + ''' <summary> ''' Create any missing folders during start. ''' </summary> ''' <remarks></remarks> Siphon/Monitors/FtpDirectoryMonitor.vb @@ -40,8 +40,11 @@ <ItemGroup> <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>bin\log4net.dll</HintPath> - <Private>True</Private> + <HintPath>..\bin\log4net.dll</HintPath> + </Reference> + <Reference Include="LumiSoft.Net, Version=2.0.3342.39610, Culture=neutral, PublicKeyToken=0576062738dd7ad9, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\bin\LumiSoft.Net.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.configuration" /> @@ -135,12 +138,6 @@ <LastGenOutput>Settings.Designer.vb</LastGenOutput> </None> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\LumiSoft.Net\Net\Net\Net.csproj"> - <Project>{7AB36CCF-5FFD-4780-A54E-A102ECA028B5}</Project> - <Name>Net</Name> - </ProjectReference> - </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. Siphon/Siphon.vbproj @@ -41,8 +41,7 @@ <ItemGroup> <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>bin\log4net.dll</HintPath> - <Private>True</Private> + <HintPath>..\bin\log4net.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.configuration" /> SiphonConsole/SiphonConsole.vbproj @@ -57,8 +57,7 @@ <ItemGroup> <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>bin\log4net.dll</HintPath> - <Private>True</Private> + <HintPath>..\bin\log4net.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.configuration" /> SiphonService/SiphonService.vbproj SiphonTests/Database/SiphonTests.sdf @@ -23,6 +23,32 @@ Imports ChrisLaco.Siphon Dim monitor As New FtpDirectoryMonitor(String.Empty, "C:\temp", New IntervalSchedule, New MockProcessor) End Sub + <Test(Description:="Test anonymous user")> _ + Public Sub AnonymousUser() + CreateSuccessFile() + + Using schedule = New DailySchedule(DateTime.Now.AddSeconds(2).TimeOfDay) + Using processor = New MockProcessor + Using monitor As FtpDirectoryMonitor = New FtpDirectoryMonitor("FtpMonitor", Uri.AbsoluteUri, schedule, processor) + AddHandler monitor.ProcessComplete, AddressOf Monitor_ProcessComplete + AddHandler monitor.ProcessFailure, AddressOf Monitor_ProcessFailure + + Assert.AreEqual("anonymous", monitor.Credentials.UserName) + Assert.AreEqual("anonymous", monitor.Credentials.Password) + + monitor.Filter = String.Empty + monitor.Start() + Threading.Thread.Sleep(5000) + monitor.Stop() + + Assert.AreEqual(1, processor.Count, "Has processed 1 file") + Assert.IsTrue(Me.ProcessComplete) + Assert.IsFalse(Me.ProcessFailure) + End Using + End Using + End Using + End Sub + <Test(Description:="Test successful directory monitor")> _ Public Sub DirectoryMonitor() CreateSuccessFile() @@ -384,26 +410,37 @@ Imports ChrisLaco.Siphon Dim newdir As String = Path.GetRandomFileName Dim tempdir As String = Path.Combine(TestDirectory.FullName, newdir) - Using schedule = New DailySchedule(DateTime.Now.AddSeconds(1).TimeOfDay) + Using schedule = New DailySchedule(DateTime.Now.AddSeconds(6).TimeOfDay) Using processor = New MockProcessor - Using monitor As FtpDirectoryMonitor = New FtpDirectoryMonitor("FtpMonitor", Path.Combine(Path.Combine(Uri.AbsoluteUri, TestDirectory.Name), newdir), schedule, processor) + Using monitor As FtpDirectoryMonitor = New FtpDirectoryMonitor("FtpMonitor", Path.Combine(Uri.AbsoluteUri, newdir), schedule, processor) AddHandler monitor.ProcessComplete, AddressOf Monitor_ProcessComplete AddHandler monitor.ProcessFailure, AddressOf Monitor_ProcessFailure monitor.CreateMissingFolders = True monitor.CompletePath = "../Processed" monitor.FailurePath = "../Failed" + monitor.ProcessFailureActions = DataActions.Move + monitor.Credentials = Me.Credentials monitor.Start() + CreateFailureFile(tempdir & "\FAILURE") + Threading.Thread.Sleep(10000) monitor.Stop() + Assert.AreEqual(1, processor.Count, "Has processed 1 file") + Assert.IsFalse(Me.ProcessComplete) + Assert.IsTrue(Me.ProcessFailure) + Dim temp As New DirectoryInfo(tempdir) Assert.IsTrue(Directory.Exists(tempdir), "Monitor path exista") Assert.IsTrue(Directory.Exists(Path.Combine(temp.Parent.FullName, "Processed")), "Processed child path exists") Assert.IsTrue(Directory.Exists(Path.Combine(temp.Parent.FullName, "Failed")), "Failed child path exists") Assert.IsTrue(Directory.Exists(tempdir), "Monitor path exista") - Assert.IsFalse(Me.ProcessComplete) - Assert.IsFalse(Me.ProcessFailure) + + Assert.IsFalse(File.Exists(Path.Combine(tempdir, "FAILURE"))) + Assert.IsTrue(File.Exists(Path.Combine(Path.Combine(tempdir, "..\Failed"), "FAILURE"))) + Assert.AreEqual(0, Directory.GetFiles(tempdir).Length) + Assert.AreEqual(1, Directory.GetFiles(Path.Combine(tempdir, "..\Failed")).Length) End Using End Using End Using @@ -416,13 +453,14 @@ Imports ChrisLaco.Siphon Using schedule = New DailySchedule(DateTime.Now.AddSeconds(2).TimeOfDay) Using processor = New MockProcessor - Using monitor As FtpDirectoryMonitor = New FtpDirectoryMonitor("FtpMonitor", Path.Combine(Uri.AbsoluteUri, TestDirectory.Name), schedule, processor) + Using monitor As FtpDirectoryMonitor = New FtpDirectoryMonitor("FtpMonitor", Uri.AbsoluteUri, schedule, processor) AddHandler monitor.ProcessComplete, AddressOf Monitor_ProcessComplete AddHandler monitor.ProcessFailure, AddressOf Monitor_ProcessFailure monitor.Filter = "*.csv" + monitor.Credentials = Me.Credentials monitor.Start() - Threading.Thread.Sleep(3000) + Threading.Thread.Sleep(5000) monitor.Stop() Assert.AreEqual(1, processor.Count, "Has processed 1 files") @@ -437,14 +475,15 @@ Imports ChrisLaco.Siphon Public Sub DirectoryMonitorStillProcessing() CreateSuccessFile() - Using schedule = New IntervalSchedule(2) + Using schedule = New DailySchedule(DateTime.Now.AddSeconds(2).TimeOfDay) Using processor = New MockProcessor - Using monitor As FtpDirectoryMonitor = New FtpDirectoryMonitor("FtpMonitor", Path.Combine(Uri.AbsoluteUri, TestDirectory.Name), schedule, processor) + Using monitor As FtpDirectoryMonitor = New FtpDirectoryMonitor("FtpMonitor", Uri.AbsoluteUri, schedule, processor) AddHandler monitor.ProcessComplete, AddressOf Monitor_ProcessComplete AddHandler monitor.ProcessFailure, AddressOf Monitor_ProcessFailure + monitor.Credentials = Me.Credentials processor.Delay = 10 monitor.Start() - Threading.Thread.Sleep(3000) + Threading.Thread.Sleep(5000) Assert.IsTrue(monitor.Processing, "Processing is true when a worker processor is still running") Dim pre As DateTime = DateTime.Now @@ -643,15 +682,16 @@ Imports ChrisLaco.Siphon Using schedule = New DailySchedule(DateTime.Now.AddSeconds(2).TimeOfDay) Using processor = New MockProcessor - Using monitor As FtpDirectoryMonitor = New FtpDirectoryMonitor("FtpMonitor", Path.Combine(Uri.AbsoluteUri, TestDirectory.Name), schedule, processor) + Using monitor As FtpDirectoryMonitor = New FtpDirectoryMonitor("FtpMonitor", Uri.AbsoluteUri, schedule, processor) AddHandler monitor.ProcessComplete, AddressOf Monitor_ProcessComplete AddHandler monitor.ProcessFailure, AddressOf Monitor_ProcessFailure monitor.DownloadPath = Path.Combine(TestDirectory.FullName, "Downloads") + monitor.Credentials = Me.Credentials monitor.CreateMissingFolders = True monitor.Filter = String.Empty monitor.Start() - Threading.Thread.Sleep(3000) + Threading.Thread.Sleep(5000) monitor.Stop() Assert.AreEqual(1, processor.Count, "Has processed 1 file") @@ -669,15 +709,16 @@ Imports ChrisLaco.Siphon Using schedule = New DailySchedule(DateTime.Now.AddSeconds(2).TimeOfDay) Using processor = New MockProcessor - Using monitor As FtpDirectoryMonitor = New FtpDirectoryMonitor("FtpMonitor", Path.Combine(Uri.AbsoluteUri, TestDirectory.Name), schedule, processor) + Using monitor As FtpDirectoryMonitor = New FtpDirectoryMonitor("FtpMonitor", Uri.AbsoluteUri, schedule, processor) AddHandler monitor.ProcessComplete, AddressOf Monitor_ProcessComplete AddHandler monitor.ProcessFailure, AddressOf Monitor_ProcessFailure monitor.DownloadPath = New Uri(Path.Combine(TestDirectory.FullName, "Downloads")).AbsoluteUri monitor.CreateMissingFolders = True + monitor.Credentials = Me.Credentials monitor.Filter = String.Empty monitor.Start() - Threading.Thread.Sleep(3000) + Threading.Thread.Sleep(5000) monitor.Stop() Assert.AreEqual(1, processor.Count, "Has processed 1 file") @@ -704,6 +745,7 @@ Imports ChrisLaco.Siphon monitorElement.Settings.Add(New NameValueConfigurationElement("Username", "FtpUser")) monitorElement.Settings.Add(New NameValueConfigurationElement("Password", "FtpPass")) monitorElement.Settings.Add(New NameValueConfigurationElement("Domain", "FtpDomain")) + monitorElement.Settings.Add(New NameValueConfigurationElement("Passive", "False")) Using monitor As FtpDirectoryMonitor = monitorElement.CreateInstance Assert.IsInstanceOfType(GetType(FtpDirectoryMonitor), monitor) @@ -718,6 +760,7 @@ Imports ChrisLaco.Siphon Assert.AreEqual("FtpPass", monitor.Credentials.Password) Assert.AreEqual("FtpDomain", monitor.Credentials.Domain) Assert.IsTrue(monitor.CreateMissingFolders) + Assert.IsFalse(monitor.Passive) End Using End Sub SiphonTests/Monitors/FtpDirectoryMonitorTests.vb @@ -53,8 +53,11 @@ <ItemGroup> <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>bin\log4net.dll</HintPath> - <Private>True</Private> + <HintPath>..\bin\log4net.dll</HintPath> + </Reference> + <Reference Include="LumiSoft.Net, Version=2.0.3342.39610, Culture=neutral, PublicKeyToken=0576062738dd7ad9, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\bin\LumiSoft.Net.dll</HintPath> </Reference> <Reference Include="nunit.framework, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77"> <SpecificVersion>False</SpecificVersion> @@ -142,10 +145,6 @@ </None> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\LumiSoft.Net\Net\Net\Net.csproj"> - <Project>{7AB36CCF-5FFD-4780-A54E-A102ECA028B5}</Project> - <Name>Net</Name> - </ProjectReference> <ProjectReference Include="..\SiphonConsole\SiphonConsole.vbproj"> <Project>{DFD27A39-C804-4589-9DDB-F2C0412B11A0}</Project> <Name>SiphonConsole</Name> SiphonTests/SiphonTests.vbproj @@ -1,5 +1,4 @@ - Add Monitor.IsRunning to fix double stop/dispose - Rename Monitor.Processing to IsProcessing to match IsRunning? - FTP Move to different server should delete source, upload to remote -- Add code to pull user/pass from uri into Credential -- Add active/passive mode config for FTP Monitor \ No newline at end of file +- Refactor remote monitors to use less connections per scan/download/process/move/delete \ No newline at end of file TODO 571fbe9eac6af5d3b00b0682be10edabb7d2fb04 Christopher H. Laco claco@chrislaco.com http://github.com/claco/siphon/commit/b8090642a4342155bdf6ba8ac1a2ccf80c157042 b8090642a4342155bdf6ba8ac1a2ccf80c157042 2009-02-26T20:23:52-08:00 2009-02-26T20:23:52-08:00 Finished reworking FTP Monitor tests 2887447767b25f3421cd08b18af336b4a7d8553e Christopher H. Laco claco@chrislaco.com