find redirection files manually (#491)

Author: gewarren

cleanrepo/Program.cs

@@ -351,7 +351,7 @@ static async Task RunOptions(Options options)
             // Remove hops/daisy chains in a redirection file.        
             case "RemoveRedirectHops":
                 {
-                    docFxRepo.RemoveAllRedirectHops();
+                    docFxRepo.RemoveAllRedirectHops(options.TargetDirectory);
 
                     Console.WriteLine("\nFinished removing redirect hops.");
                     break;
@@ -1618,6 +1618,15 @@ public static bool IsFileLinkedFromFile(FileInfo linkedFile, FileInfo linkingFil
         return false;
     }
 
+    /// <summary>
+    /// Gets all .openpublishing.redirection.*.json files recursively, starting in the specified directory.
+    /// </summary>
+    public static List<FileInfo> GetRedirectionFiles(string directoryPath)
+    {
+        DirectoryInfo dir = new(directoryPath);
+        return dir.EnumerateFiles(".openpublishing.redirection.*.json", SearchOption.AllDirectories).ToList();
+    }
+
     /// <summary>
     /// Gets all *.md files recursively, starting in the specified directory.
     /// </summary>

cleanrepo/Repo.cs

@@ -75,17 +75,6 @@ internal FileInfo OpsConfigFile
             return _opsConfigFile;
         }
     }
-    private List<string>? _redirectionFiles;
-    internal List<string> RedirectionFiles
-    {
-        get
-        {
-            if (_redirectionFiles == null)
-                _redirectionFiles = GetRedirectionFiles();
-
-            return _redirectionFiles;
-        }
-    }
 
     #region Constructors
     #endregion
@@ -318,16 +307,10 @@ internal List<Redirect> GetAllRedirects()
     {
         // Gather all the redirects.
         List<Redirect> allRedirects = [];
-        foreach (string redirectionFile in RedirectionFiles)
+        List<FileInfo> redirectionFiles = HelperMethods.GetRedirectionFiles(OpsConfigFile.DirectoryName!);
+        foreach (FileInfo redirectionFile in redirectionFiles)
         {
-            FileInfo redirectsFile = new(Path.Combine(OpsConfigFile.DirectoryName!, redirectionFile));
-            if (redirectsFile == null)
-            {
-                Console.WriteLine($"\nCould not find redirection file '{redirectionFile}'.");
-                continue;
-            }
-
-            IList<Redirect>? redirectsFromOneFile = GetAllRedirectedFiles(redirectsFile, OpsConfigFile.DirectoryName!);
+            IList<Redirect>? redirectsFromOneFile = GetAllRedirectedFiles(redirectionFile, OpsConfigFile.DirectoryName!);
             if (redirectsFromOneFile is not null)
                 allRedirects.AddRange(redirectsFromOneFile);
         }
@@ -587,33 +570,18 @@ internal string ConvertImagePathDestToSrc(string currentImagePath)
 
     #region Redirected files
 
-    public List<string> GetRedirectionFiles()
-    {
-        // Deserialize the OPS config file.
-        OPSConfig? config = LoadOPSJson();
-        if (config == null || config.redirection_files == null)
-            return [".openpublishing.redirection.json"];
-        else
-            return config.redirection_files;
-    }
-
-    internal void RemoveAllRedirectHops()
+    internal void RemoveAllRedirectHops(string directory)
     {
         // Get all docsets for the OPS config file.
         Dictionary<string, string>? docsets = GetDocsetInfo();
 
+        List<FileInfo> redirectionFiles = HelperMethods.GetRedirectionFiles(directory);
+
         // Remove hops within each file.
-        foreach (string redirectionFile in RedirectionFiles)
+        foreach (FileInfo redirectionFile in redirectionFiles)
         {
-            FileInfo redirectsFile = new(Path.Combine(OpsConfigFile.DirectoryName!, redirectionFile));
-            if (redirectsFile == null)
-            {
-                Console.WriteLine($"\nCould not find redirection file '{redirectionFile}'.");
-                continue;
-            }
-
             Console.WriteLine($"\nRemoving hops from the '{redirectionFile}' redirection file.");
-            RemoveRedirectHopsFromFile(redirectsFile, docsets, OpsConfigFile.DirectoryName!);
+            RemoveRedirectHopsFromFile(redirectionFile, docsets, OpsConfigFile.DirectoryName!);
         }
     }