Merge branch 'origin/opensrc/main-staging' into open-main

Author: ljcollins25

Codex.xln

@@ -3,7 +3,7 @@
     <!-- Allow all projects -->
     <SolutionSaveLocation>$(MSBuildThisFileDirectory)\src\Codex.sln</SolutionSaveLocation>
     <ProjectFilterLocal>$(ProjectFilter)</ProjectFilterLocal>
-    <DisplayName>$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildThisFileFullPath)))))</DisplayName>
+    <SolutionDisplayName>$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildThisFileFullPath)))))</SolutionDisplayName>
   </PropertyGroup>
 
   <ItemDefinitionGroup>

src/Codex.Integration.Tests/AnalyzeTestProjectBase.cs

@@ -80,12 +80,18 @@ public Task<IngestOperation> RunAnalyzeTestProject(bool searchOnly, bool cleanIn
         });
     }
 
+    protected virtual void PreconfigureOptions(AnalyzeTestProjectOptions options)
+    {
+
+    }
+
     public async Task<AnalyzeOperation> RunAnalyzeTestProjectAnalysis(
         Func<AnalyzeTestProjectOptions, AnalyzeTestProjectOptions> configureOptions = null,
         AsyncOut<AnalyzeTestProjectOptions> optionsOut = null,
         [CallerMemberName] string caller = null)
     {
         var options = new AnalyzeTestProjectOptions();
+        PreconfigureOptions(options);
         options = configureOptions?.Invoke(options) ?? options;
         optionsOut?.Set(options);
 

src/Codex.Integration.Tests/CodexTestBase.cs

@@ -180,21 +180,16 @@ public CodexPage CreateCodexApp(string indexDirectory,
         var options = new CodexAppOptions();
         options = updateOptions?.Invoke(options) ?? options;
 
-        if (indexDirectory.StartsWith("https://"))
+        if (PathUtilities.ToUriOrPath(indexDirectory, out var uri, out var path))
         {
+            // For uri's we need to use paging logic
             options.UsePaging = true;
             options.ConfigurePaging = options.ConfigurePaging.ApplyBefore(pc => pc with
             {
                 CacheLimit = 100_000,
             });
         }
 
-        if (PathUtilities.ToUriOrPath(indexDirectory, out var uri, out var path))
-        {
-            // For uri's we need to use paging logic
-            options.UsePaging = true;
-        }
-
         ICodex getCodex()
         {
             {

src/Codex.Lucene/Paging/PagingHelpers.cs

@@ -154,7 +154,7 @@ IHttpClient getClient(string directoryOrUrl, HttpClientKind kind)
 
         private static Url GetAddress(Uri uri)
         {
-            Url result = uri;
+            Url result = uri.EnsureTrailingSlash();
             return result;
         }
 

src/Codex.Web.Wasm/wwwroot/styles.css …x.Web.Wasm/wwwroot/content/home.html.csssrc/Codex.Web.Wasm/wwwroot/styles.css renamed to src/Codex.Web.Wasm/wwwroot/content/home.html.css src/Codex.Web.Wasm/wwwroot/styles.css renamed to src/Codex.Web.Wasm/wwwroot/content/home.html.css

@@ -1,5 +1,5 @@
 <div style="pointer-events: all; overflow: auto; height: 100%">
-        <link rel="stylesheet" href="./content/styles.css" />
+        <link rel="stylesheet" href="content/home.html.css" />
         <link href="content/dark.css" rel="stylesheet" media="(prefers-color-scheme: dark)" />
 
         <div class="homeRoot">

src/Codex.Web.Wasm/wwwroot/home.html

@@ -58,7 +58,7 @@
 
     <_AllProjects Include="@(CodexDependency ->'$(RepoRoot)\src\build\%(Identity)\dep.proj')" ReferenceOutputAssembly="false" />
     <_AllProjects Include="@(ContentReference ->'$(RepoRoot)\src\%(SourceRelativeRoot)\%(Identity)\%(Identity).contentprj')" />
-    <_AllProjects Include="@(CodexReference ->'$(RepoRoot)\src\%(SourceRelativeRoot)\%(Identity)\%(Identity).%(ProjectExtension)')" />
+    <_AllProjects Include="@(CodexReference ->'$(RepoRoot)\src\%(SourceRelativeRoot)\%(Identity)\%(Identity).%(ProjectExtension)')" Folder="" />
     <_AllProjects Include="@(LuceneReference ->'$(LuceneRepoRoot)\src\%(Identity)\%(Identity).csproj')" />
     <_AllProjects Include="@(ZoneTreeReference ->'$(RepoRoot)\zonetree\src\%(Identity)\%(Identity).csproj')" />