Skip to content

Fix img src url #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 18, 2025
Merged

Fix img src url #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a590bb2
Fix img src url
reakaleek Feb 18, 2025
6605ced
Refactor
reakaleek Feb 18, 2025
37c9256
Cleanup
reakaleek Feb 18, 2025
73a3598
Use Path.GetRelativePath
reakaleek Feb 18, 2025
55b4b19
Also use Path.GetRelativePath in DiagnosticLinkeInlineParser
reakaleek Feb 18, 2025
8ee6af5
Format
reakaleek Feb 18, 2025
6df6676
Add explaining comment
reakaleek Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// See the license.txt file in the project root for more information.

using Elastic.Markdown.Diagnostics;
using Elastic.Markdown.Myst.CodeBlocks;
using Elastic.Markdown.Myst.FrontMatter;
using Elastic.Markdown.Myst.Settings;
using Elastic.Markdown.Myst.Substitution;
Expand Down Expand Up @@ -85,11 +84,24 @@ protected override void Write(HtmlRenderer renderer, DirectiveBlock directiveBlo

private void WriteImage(HtmlRenderer renderer, ImageBlock block)
{
var imageUrl =
block.ImageUrl != null &&
(block.ImageUrl.StartsWith("/_static") || block.ImageUrl.StartsWith("_static"))
? $"{block.Build.UrlPathPrefix}/{block.ImageUrl.TrimStart('/')}"
: block.ImageUrl;
var imageUrl = block.ImageUrl;
if (!string.IsNullOrEmpty(block.ImageUrl))
{
if (block.ImageUrl.StartsWith('/') || block.ImageUrl.StartsWith("_static"))
imageUrl = $"{block.Build.UrlPathPrefix}/{block.ImageUrl.TrimStart('/')}";
else
{
// `block.Build.ConfigurationPath.DirectoryName` is the directory of the docset.yml file
// which is the root of the documentation source
// e.g. `/User/username/Projects/docs-builder/docs`
// `block.CurrentFile.DirectoryName` is the directory of the current markdown file where the image is referenced
// e.g. `/User/username/Projects/docs-builder/docs/page/with/image`
// `Path.GetRelativePath` will return the relative path to the docset.yml directory
// e.g. `page/with/image`
// Hence the full imageUrl will be something like /path-prefix/page/with/image/image.png
imageUrl = block.Build.UrlPathPrefix + '/' + Path.GetRelativePath(block.Build.ConfigurationPath.DirectoryName!, block.CurrentFile.DirectoryName!) + "/" + block.ImageUrl;
}
}
var slice = Image.Create(new ImageViewModel
{
Label = block.Label,
Expand Down
2 changes: 1 addition & 1 deletion src/Elastic.Markdown/Myst/InlineParsers/DiagnosticLinkInlineParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ private static void UpdateLinkUrl(LinkInline link, string url, ParserContext con
private static string GetRootRelativePath(ParserContext context, IFileInfo file)
{
var docsetDirectory = context.Configuration.SourceFile.Directory;
return file.FullName.Replace(docsetDirectory!.FullName, string.Empty);
return "/" + Path.GetRelativePath(docsetDirectory!.FullName, file.FullName);
}

private static bool IsCrossLink([NotNullWhen(true)] Uri? uri) =>
Expand Down