added hierarchical export for single file

MaxMelcher · Oct 10, 2022 · 4f530f4 · 4f530f4
1 parent b943426
commit 4f530f4
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 15 deletions.
diff --git a/AzureDevOps.WikiPDFExport/WikiPDFExporter.cs b/AzureDevOps.WikiPDFExport/WikiPDFExporter.cs
@@ -109,7 +109,7 @@ public async Task<bool> Export()
                     _wiki = new ExportedWikiDoc(_options.Path);
 
                     IWikiDirectoryScanner scanner = !string.IsNullOrEmpty(_options.Single)
-                        ? new SingleFileScanner(_options.Single, _logger)
+                        ? new SingleFileScanner(_options.Single, _wiki.exportPath(), _options, _logger)
                         : (_options.IncludeUnlistedPages
                             ? new WikiDirectoryScanner(_wiki.exportPath(), _options, _logger)
                             : new WikiOptionFilesScanner(_wiki.exportPath(), _options, _logger));

diff --git a/AzureDevOps.WikiPDFExport/WikiScanners/SingleFileScanner.cs b/AzureDevOps.WikiPDFExport/WikiScanners/SingleFileScanner.cs
@@ -1,37 +1,51 @@
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.TeamFoundation.TestManagement.WebApi;
+using Microsoft.TeamFoundation.Wiki.WebApi;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 
 namespace azuredevops_export_wiki
 {
-    internal class SingleFileScanner : IWikiDirectoryScanner
+    internal class SingleFileScanner : WikiOptionFilesScanner
     {
         private readonly string singleFilePath;
-        private ILogger logger;
 
-        public SingleFileScanner(string filePath, ILogger logger)
+        public SingleFileScanner(string filePath, string wikiPath, Options options, ILogger logger)
+            : base(wikiPath, options, logger) 
         {
             this.singleFilePath = filePath;
-            this.logger = logger;
         }
 
-        public IList<MarkdownFile> Scan()
+        public override IList<MarkdownFile> Scan()
         {
-            var filePath = Path.GetFullPath(singleFilePath);
-            var directory = new DirectoryInfo(Path.GetFullPath(filePath));
+            var allFiles = base.Scan(); 
+            var current = allFiles.FirstOrDefault(m => m.FileRelativePath.Contains(singleFilePath));
+            var idx = allFiles.IndexOf(current);
 
-            if (!File.Exists(filePath))
+            if (current is null || idx == -1)
             {
-                logger.Log($"Single-File [-s] {filePath} specified not found" + filePath, LogLevel.Error);
+                logger.Log($"Single-File [-s] {singleFilePath} specified not found" + singleFilePath, LogLevel.Error);
                 throw new ArgumentException($"{singleFilePath} not found");
             }
+            var result = new List<MarkdownFile>() { current };
 
-            var relativePath = filePath.Substring(directory.FullName.Length);
+            if (allFiles.Count > idx)
+            {
+                foreach (var item in allFiles.Skip(idx + 1))
+                {
+                    if (item.Level > current.Level)
+                    {
+                        result.Add(item);
+                    }
+                    else
+                        break;
+                }
+            }
 
-            return new List<MarkdownFile>() {
-                            new MarkdownFile(new FileInfo(filePath), relativePath, 0, "/")
-                        };
+            return result;
         }
 
     }

diff --git a/AzureDevOps.WikiPDFExport/WikiScanners/WikiOptionFilesScanner.cs b/AzureDevOps.WikiPDFExport/WikiScanners/WikiOptionFilesScanner.cs
@@ -12,7 +12,7 @@ internal class WikiOptionFilesScanner : WikiScannerBase, IWikiDirectoryScanner,
         public WikiOptionFilesScanner(string wikiPath, Options options, ILogger logger)
             : base(wikiPath, options, logger) { }
 
-        public IList<MarkdownFile> Scan()
+        public virtual IList<MarkdownFile> Scan()
         {
             return ReadOrderFiles(wikiPath, 0, excludeRegexes); // root level
         }