Merge branch 'release/v1.2'

Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Services/Store/IFileStoreService.cs

@@ -11,6 +11,7 @@ public interface IFileStoreService
  Task<FileInfo> GetFileInfoAsync(string fileName);
  //Task<FileInfo> GetLastWrittenFileInfoAsync(string directory);
  Task<IList<FileInfo>> GetAllDirectoryFilesInfoAsync(string directory);
+ Task<bool> RemoveDirectoryRecursiveAsync(string directory);
  Task<Tuple<FileInfo, byte[]>> GetLastChangedFileAsync(string directory);
  Task<byte[]> ReadAsync(string fileName);
  }

Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Managers/SpectrumManager.cs

@@ -124,9 +124,11 @@ private async Task<byte[]> ReadSpectrumFile(SpectrumEntity spectrum, string samp
  // we should get from FTP, temporarily we can't do (FTP was not configured properly and we still in DEBUG)
  using AsyncFtpClient ftp = new AsyncFtpClient(_config.FtpArchSettings.FtpSettings.Host, _config.FtpArchSettings.FtpSettings.Username,
  _config.FtpArchSettings.FtpSettings.Password, _config.FtpArchSettings.FtpSettings.Port);
- await ftp.SetWorkingDirectory(spectrum.Location);
+ await ftp.Connect();
+ //await ftp.SetWorkingDirectory(spectrum.Location);
  byte[] spectrumSampleContent = await ftp.DownloadBytes(sampleFile, new CancellationToken());
- return null;
+ await ftp.Disconnect();
+ return spectrumSampleContent;
  }
  }
 

Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Services/Jobs/FTPArchiveFilesJob.cs

@@ -81,6 +81,7 @@ private async Task<int> TransferSpectrumFiles(SpectrumEntity spectrum)
  {
  // todo (UMV): define roper PATH ....
  string spectrumShareRootDir = GetSpectrumShareRootDir();
+ string spectrumPrevDir = spectrum.Location;
  IList<FileInfo> spectrumSamples = await _storeService.GetAllDirectoryFilesInfoAsync(spectrum.Location);
  //IList<string> spectrumSamples = await _storeService.GetChildrenAsync(spectrumN, spectrumShareRootDir);
  string ftpSpectrumDir = Path.Combine(@$"{_config.FtpArchSettings.FtpArchRootDir}", spectrum.Name);
@@ -113,10 +114,10 @@ private async Task<int> TransferSpectrumFiles(SpectrumEntity spectrum)
  else
  {
  spectrum.Location = ftpSpectrumDir;
- // TODO(UMV): could safely remove file from share (temporarily, off)
-
  }
  }
+
+ await _storeService.RemoveDirectoryRecursiveAsync(spectrumPrevDir);
  // going to ROOT dir 
  await ftp.SetWorkingDirectory("/");
 

Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Services/Store/Smb1Service.cs

@@ -106,6 +106,11 @@ public Task<IList<FileInfo>> GetAllDirectoryFilesInfoAsync(string directory)
  throw new NotImplementedException();
  }
 
+ public Task<bool> RemoveDirectoryRecursiveAsync(string directory)
+ {
+ throw new NotImplementedException();
+ }
+
  public Task<Tuple<FileInfo, byte[]>> GetLastChangedFileAsync(string directory)
  {
  throw new NotImplementedException();

Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Services/Store/WindowsShareStoreService.cs

@@ -90,6 +90,21 @@ public async Task<IList<FileInfo>> GetAllDirectoryFilesInfoAsync(string director
  }
  }
 
+ public async Task<bool> RemoveDirectoryRecursiveAsync(string directory)
+ {
+ try
+ {
+ Directory.Delete(directory, true);
+ return true;
+
+ }
+ catch (Exception e)
+ {
+ _logger.LogError($"An error occurred during removing folder files: {e.Message}");
+ return false;
+ }
+ }
+
  public async Task<Tuple<FileInfo, byte[]>> GetLastChangedFileAsync(string directory)
  {
  try

Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Startup.cs

@@ -144,8 +144,8 @@ private void ConfigureRegularJobs(IServiceCollection services)
  .WithCronSchedule(_config.DefaultJobsSettings.DefaultSpectraNotifySchedule));
  quartz.AddJob<FtpArchiveFilesJob>(job => job.WithIdentity(nameof(FtpArchiveFilesJob)));
  quartz.AddTrigger(trigger => trigger.ForJob(nameof(FtpArchiveFilesJob))
- .WithSimpleSchedule(SimpleScheduleBuilder.RepeatMinutelyForever(5)));
- //.WithCronSchedule(_config.DefaultJobsSettings.DefaultFileArchSchedule));
+  //.WithSimpleSchedule(SimpleScheduleBuilder.RepeatMinutelyForever(5)));
+  .WithCronSchedule(_config.DefaultJobsSettings.DefaultFileArchSchedule));
  });
 
  services.AddQuartzHostedService(options =>

Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/appsettings.Development.json

@@ -76,7 +76,7 @@
  "DefaultEventWatchSchedule": "",
  "DefaultSpectraIndexerSchedule": "30/30 * * ? * * *",
  "DefaultSpectraNotifySchedule": "0 0 10,17,22 ? * * *",
- "DefaultFileArchiveingSchedule": "0 0 10,17,22 ? * * *"
+ "DefaultFileArchSchedule": "0 0 23 1/1 * ? *"
  },
  "ConnStr": "Data Source=Wissance.MossbauerLab.Watcher.db;"
  } 

Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/appsettings.Production.json

@@ -75,7 +75,7 @@
  "DefaultEventWatchSchedule": "",
  "DefaultSpectraIndexerSchedule": "30/30 * * ? * * *",
  "DefaultSpectraNotifySchedule": "0 0 10,17,22 ? * * *",
- "DefaultFileArchSchedule": "30/30 * * ? * * *"
+ "DefaultFileArchSchedule": "0 0 23 1/1 * ? *"
  },
  "ConnStr": "Data Source=Wissance.MossbauerLab.Watcher.db;"
  }