fix target path not being respected

Author: SimonCropp

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591</NoWarn>
-    <Version>0.6.2</Version>
+    <Version>0.6.3</Version>
     <Description>A tool to help synchronizing specific files and folders across GitHub hosted repositories.</Description>
     <PackageTags>GitHub</PackageTags>
     <SignAssembly>false</SignAssembly>

src/GitHubSync/ManualSyncItem.cs

@@ -3,5 +3,6 @@
     public class ManualSyncItem
     {
         public string Path { get; set; }
+        public string Target { get; set; }
     }
 }

src/GitHubSync/RepoSync.cs

@@ -71,7 +71,8 @@ public void AddOrRemoveSourceItem(bool toBeAdded, TreeEntryTargetType type, stri
 
             manualSyncItems.Add(new ManualSyncItem
             {
-                Path = path
+                Path = path,
+                Target = target
             });
         }
 
@@ -192,30 +193,51 @@ void ProcessItem(string item, List<SyncItem> itemsToSync, RepositoryInfo source)
             var parts = new Parts(
                 $"{source.Owner}/{source.Repository}",
                 TreeEntryTargetType.Blob, source.Branch, item);
-            var isManualSyncItem = manualSyncItems.Any(x => item.StartsWith(x.Path, StringComparison.OrdinalIgnoreCase));
-            if (syncMode == SyncMode.IncludeAllByDefault)
+            var localManualSyncItems = manualSyncItems.Where(x => item == x.Path).ToList();
+            var isManualSyncItem = localManualSyncItems.Any();
+            if (isManualSyncItem)
             {
-                itemsToSync.Add(new SyncItem
+                foreach (var manualSyncItem in localManualSyncItems)
                 {
-                    Parts = parts,
-                    ToBeAdded = !isManualSyncItem,
-                    Target = null
-                });
+                    switch (syncMode)
+                    {
+                        case SyncMode.IncludeAllByDefault:
+                            itemsToSync.Add(new SyncItem
+                            {
+                                Parts = parts,
+                                ToBeAdded = false,
+                                Target = manualSyncItem?.Target
+                            });
+                            continue;
+                        case SyncMode.ExcludeAllByDefault:
+                            itemsToSync.Add(new SyncItem
+                            {
+                                Parts = parts,
+                                ToBeAdded = true,
+                                Target = manualSyncItem?.Target
+                            });
+                            continue;
+                    }
+                }
                 return;
             }
-
-            if (syncMode == SyncMode.ExcludeAllByDefault)
+            switch (syncMode)
             {
-                itemsToSync.Add(new SyncItem
-                {
-                    Parts = parts,
-                    ToBeAdded = isManualSyncItem,
-                    Target = null
-                });
-                return;
+                case SyncMode.IncludeAllByDefault:
+                    itemsToSync.Add(new SyncItem
+                    {
+                        Parts = parts,
+                        ToBeAdded = true,
+                    });
+                    return;
+                case SyncMode.ExcludeAllByDefault:
+                    itemsToSync.Add(new SyncItem
+                    {
+                        Parts = parts,
+                        ToBeAdded = false,
+                    });
+                    return;
             }
-
-            throw new ArgumentOutOfRangeException(nameof(syncMode), $"Sync mode '{syncMode}' is not supported");
         }
 
         public async Task<IReadOnlyList<UpdateResult>> Sync(SyncOutput syncOutput = SyncOutput.CreatePullRequest)

src/Tests/RepoSyncTests.SyncPrExcludeAllByDefault.approved.txt

@@ -2,11 +2,15 @@
   Title: 'GitHubSync update',
   Body: 'This is an automated synchronization PR.\r\n\r\nThe following source template repositories were used:\r\n* SimonCropp/GitHubSync.TestRepository\r\n',
   Commits: 1,
-  Additions: 1,
-  ChangedFiles: 1,
+  Additions: 2,
+  ChangedFiles: 2,
   State: 'open',
   Target: 'SyncPrExcludeAllByDefault',
   Files: [
+    {
+      FileName: 'nested/sourceFile.txt',
+      Status: 'added'
+    },
     {
       FileName: 'sourceFile.txt',
       Status: 'added'

src/Tests/RepoSyncTests.cs

@@ -30,6 +30,7 @@ public async Task SyncPrExcludeAllByDefault()
         await using var repoContext = await TempRepoContext.Create(Context.MethodName);
         repoSync.AddSourceRepository(new RepositoryInfo(credentials, "SimonCropp", "GitHubSync.TestRepository", "source"));
         repoSync.AddBlob("sourceFile.txt");
+        repoSync.AddSourceItem(TreeEntryTargetType.Blob,"sourceFile.txt", "nested/sourceFile.txt");
         repoSync.AddTargetRepository(new RepositoryInfo(credentials, "SimonCropp", "GitHubSync.TestRepository", repoContext.TempBranchName));
 
         var sync = await repoSync.Sync();