Merge pull request #9 from andreaskueffel/development

andreaskueffel · web-flow · commit 95926da484aa · 2023-09-08T13:34:18.000+02:00
implement DeleteSourceAfterBackup
diff --git a/FileSyncJob/FileSyncJobOptions.cs b/FileSyncJob/FileSyncJobOptions.cs
@@ -16,6 +16,7 @@ public class FileSyncJobOptions : IFileSyncJobOptions
         public List<string> Subfolders { get; set; }
         public bool Recursive { get; set; } = true;
         public bool SyncDeleted { get; set; } = false;
+        public bool DeleteSourceAfterBackup { get; set; } = false;
         public FileSyncProvider FileSyncProvider { get; set; } = FileSyncProvider.FileIO;
 
         public FileSyncJobOptions()
diff --git a/FileSyncJob/FileSyncJobOptionsBuilder.cs b/FileSyncJob/FileSyncJobOptionsBuilder.cs
@@ -74,6 +74,11 @@ public IFileSyncJobOptionsBuilderSetProperties WithSubfolder(string subfolder)
             jobOptions.Subfolders.Add(subfolder);
             return this;
         }
+        public IFileSyncJobOptionsBuilderSetProperties DeleteAfterBackup(bool deleteAfterBackup)
+        {
+            jobOptions.DeleteSourceAfterBackup = deleteAfterBackup;
+            return this;
+        }
         public IFileSyncJobOptionsBuilderSetProperties WithInterval(TimeSpan interval)
         {
             jobOptions.Interval = interval;
@@ -124,6 +129,7 @@ public interface IFileSyncJobOptionsBuilderSetProperties : IFileSyncJobOptionsBu
         IFileSyncJobOptionsBuilderSetProperties WithCredentials(NetworkCredential networkCredential);
         IFileSyncJobOptionsBuilderSetProperties WithSearchPattern(string searchPattern);
         IFileSyncJobOptionsBuilderSetProperties WithSubfolder(string subfolder);
+        IFileSyncJobOptionsBuilderSetProperties DeleteAfterBackup(bool deleteAfterBackup);
         IFileSyncJobOptionsBuilderSetProperties WithLogger(ILogger logger);
         IFileSyncJobOptionsBuilderSetProperties WithLogger(Action<string> loggerAction);
     }
diff --git a/FileSyncJob/IFileSyncJobOptions.cs b/FileSyncJob/IFileSyncJobOptions.cs
@@ -16,6 +16,7 @@ public interface IFileSyncJobOptions
         string SearchPattern { get; set; }
         List<string> Subfolders { get; set; }
         string SourcePath { get; set; }
+        bool DeleteSourceAfterBackup { get; set; }
         bool SyncDeleted { get; set; }
     }
 }
diff --git a/SyncProviders/FileIOProvider.cs b/SyncProviders/FileIOProvider.cs
@@ -55,6 +55,10 @@ public override void SyncSourceToDest()
                             logger.LogDebug("Copy {A}", relativeFilename);
                             File.Copy(f.FullName, remotefile.FullName, true);
                             copied++;
+                            if (JobOptions.DeleteSourceAfterBackup)
+                            {
+                                File.Delete(f.FullName);
+                            }
                         }
                         catch (Exception exc)
                         {
diff --git a/SyncProviders/SmbLibProvider.cs b/SyncProviders/SmbLibProvider.cs
@@ -99,6 +99,10 @@ public override void SyncSourceToDest()
                         try
                         {
                             WriteFile(f.FullName, remotefile);
+                            if (JobOptions.DeleteSourceAfterBackup)
+                            {
+                                File.Delete(f.FullName);
+                            }
                         }
                         catch (Exception exc)
                         {

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,11 @@ public IFileSyncJobOptionsBuilderSetProperties WithSubfolder(string subfolder)`
`74`	`74`	`jobOptions.Subfolders.Add(subfolder);`
`75`	`75`	`return this;`
`76`	`76`	`}`
	`77`	`+ public IFileSyncJobOptionsBuilderSetProperties DeleteAfterBackup(bool deleteAfterBackup)`
	`78`	`+ {`
	`79`	`+ jobOptions.DeleteSourceAfterBackup = deleteAfterBackup;`
	`80`	`+ return this;`
	`81`	`+ }`
`77`	`82`	`public IFileSyncJobOptionsBuilderSetProperties WithInterval(TimeSpan interval)`
`78`	`83`	`{`
`79`	`84`	`jobOptions.Interval = interval;`
`@@ -124,6 +129,7 @@ public interface IFileSyncJobOptionsBuilderSetProperties : IFileSyncJobOptionsBu`
`124`	`129`	`IFileSyncJobOptionsBuilderSetProperties WithCredentials(NetworkCredential networkCredential);`
`125`	`130`	`IFileSyncJobOptionsBuilderSetProperties WithSearchPattern(string searchPattern);`
`126`	`131`	`IFileSyncJobOptionsBuilderSetProperties WithSubfolder(string subfolder);`
	`132`	`+ IFileSyncJobOptionsBuilderSetProperties DeleteAfterBackup(bool deleteAfterBackup);`
`127`	`133`	`IFileSyncJobOptionsBuilderSetProperties WithLogger(ILogger logger);`
`128`	`134`	`IFileSyncJobOptionsBuilderSetProperties WithLogger(Action<string> loggerAction);`
`129`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ public interface IFileSyncJobOptions`
`16`	`16`	`string SearchPattern { get; set; }`
`17`	`17`	`List<string> Subfolders { get; set; }`
`18`	`18`	`string SourcePath { get; set; }`
	`19`	`+ bool DeleteSourceAfterBackup { get; set; }`
`19`	`20`	`bool SyncDeleted { get; set; }`
`20`	`21`	`}`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,10 @@ public override void SyncSourceToDest()`
`55`	`55`	`logger.LogDebug("Copy {A}", relativeFilename);`
`56`	`56`	`File.Copy(f.FullName, remotefile.FullName, true);`
`57`	`57`	`copied++;`
	`58`	`+ if (JobOptions.DeleteSourceAfterBackup)`
	`59`	`+ {`
	`60`	`+ File.Delete(f.FullName);`
	`61`	`+ }`
`58`	`62`	`}`
`59`	`63`	`catch (Exception exc)`
`60`	`64`	`{`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,10 @@ public override void SyncSourceToDest()`
`99`	`99`	`try`
`100`	`100`	`{`
`101`	`101`	`WriteFile(f.FullName, remotefile);`
	`102`	`+ if (JobOptions.DeleteSourceAfterBackup)`
	`103`	`+ {`
	`104`	`+ File.Delete(f.FullName);`
	`105`	`+ }`
`102`	`106`	`}`
`103`	`107`	`catch (Exception exc)`
`104`	`108`	`{`