removed the attachment property

MaxMelcher · May 2, 2022 · 42f8209 · 42f8209
1 parent b7e3777
commit 42f8209
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,3 +42,4 @@ output/*
 /AzureDevOps.WikiPDFExport/Properties/launchSettings.json
 AzureDevOps.WikiPDFExport.Test/IntegrationTests-Data/Outputs
 AzureDevOps.WikiPDFExport.Test/test-data/Inputs/Azure-Platform-Design/*
+AzureDevOps.WikiPDFExport.Test/test-data/Inputs/1k/html.html
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -13,9 +13,9 @@
             "args": [
                 "--verbose",
                 //"-p..\\AzureDevOps.WikiPDFExport.Test\\test-data\\Inputs\\DeepLink",
-                //"-p..\\AzureDevOps.WikiPDFExport.Test\\Tests\\AzureDevOps.WikiPDFExport.wiki",
+                "-p..\\AzureDevOps.WikiPDFExport.Test\\test-data\\Inputs\\1k",
                 //                 "--attachments-path=..\\AzureDevOps.WikiPDFExport.Test\\Tests\\AzureDevOps.WikiPDFExport.wiki\\.attachments\\",
-                                 "-p..\\AzureDevOps.WikiPDFExport.Test\\Tests\\Code",
+                //                 "-p..\\AzureDevOps.WikiPDFExport.Test\\test-data\\Inputs\\Code",
                 //                 "-p..\\AzureDevOps.WikiPDFExport.Test\\Tests\\Azure-Platform-Design",
                                  //"-p..\\AzureDevOps.WikiPDFExport.Test\\test-data\\Inputs\\Test-Emoticon",
                                 // "-s..\\AzureDevOps.WikiPDFExport.Test\\test-data\\Inputs\\Test-Emoticon\\emoji.md",

diff --git a/AzureDevOps.WikiPDFExport.Test/ExportedWikiDocTest.cs b/AzureDevOps.WikiPDFExport.Test/ExportedWikiDocTest.cs
@@ -62,7 +62,6 @@ public void givenExportDoc_whenGetProperties_thenNoneAreBlank()
             var export = new ExportedWikiDoc(codeWiki);
             AssertExistingValidDirectory(export.exportDir);
             AssertExistingValidDirectory(export.baseDir);
-            AssertExistingValidDirectory(export.attachments);
         }
 
         private static void AssertExistingValidDirectory(DirectoryInfo dir)

diff --git a/AzureDevOps.WikiPDFExport/ExportedWikiDoc.cs b/AzureDevOps.WikiPDFExport/ExportedWikiDoc.cs
@@ -25,11 +25,10 @@ public ExportedWikiDoc(DirectoryInfo exportBase)
         {
             if (!exportBase.Exists)
             {
-                throw new WikiPdfExportException("The wiki export location does not exist");
+                throw new WikiPdfExportException($"The wiki export location {exportBase} does not exist");
             }
             this.exportDir = exportBase;
             this.baseDir = FindNearestParentAttachmentsDirectory(exportBase);
-            this.attachments = baseDir.GetDirectories("./.attachments")[0];
         }
 
         /// <summary>
@@ -53,7 +52,9 @@ public static DirectoryInfo FindNearestParentAttachmentsDirectory(DirectoryInfo
             {
                 return FindNearestParentAttachmentsDirectory(exportBase.Parent);
             }
-            throw new WikiPdfExportException("Failed to locate the base of the Wiki using attachment detection");
+
+            //return the base path and hope for the best
+            return exportBase;
         }
 
         public DirectoryInfo exportDir { get; }
@@ -66,6 +67,5 @@ public string basePath()
         {
             return baseDir.FullName;
         }
-        public DirectoryInfo attachments { get; }
     }
 }