zyl/webdog
1
0
Fork 0
mirror of https://github.com/zyllian/webdog.git synced 2025-06-27 08:56:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix webdog script insertion with custom paths

Browse source
This commit is contained in:
zyl 2025-06-04 23:52:10 -07:00
parent 0dbe284d57
commit 05d66c2143
Signed by: zyl
SSH key fingerprint: SHA256:uxxbSXbdroP/OnKBGnEDk5q7EKB2razvstC/KmzdXXs
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/builder.rs
View file

@ -2,15 +2,15 @@
use std::{collections::HashMap, path::PathBuf}; use std::{collections::HashMap, path::PathBuf};
use eyre::{eyre, Context, OptionExt}; use eyre::{Context, OptionExt, eyre};
use lol_html::{element, html_content::ContentType, HtmlRewriter, Settings}; use lol_html::{HtmlRewriter, Settings, element, html_content::ContentType};
use rayon::prelude::*; use rayon::prelude::*;
use serde::Serialize; use serde::Serialize;
use syntect::{highlighting::ThemeSet, parsing::SyntaxSet}; use syntect::{highlighting::ThemeSet, parsing::SyntaxSet};
use tera::Tera; use tera::Tera;
use url::Url; use url::Url;
use crate::{resource::ResourceBuilder, util, PageMetadata, Site, ROOT_PATH, SASS_PATH}; use crate::{PageMetadata, ROOT_PATH, SASS_PATH, Site, resource::ResourceBuilder, util};
/// Default path for static webdog resources included with the site build. /// Default path for static webdog resources included with the site build.
const WEBDOG_DEFAULT_PATH: &str = "webdog"; const WEBDOG_DEFAULT_PATH: &str = "webdog";
@ -161,6 +161,7 @@ impl SiteBuilder {
} }
/// Function to rewrite HTML wow. /// Function to rewrite HTML wow.
#[allow(clippy::too_many_arguments)]
pub fn rewrite_html( pub fn rewrite_html(
&self, &self,
html: String, html: String,
@ -169,6 +170,7 @@ impl SiteBuilder {
scripts: &[String], scripts: &[String],
styles: &[String], styles: &[String],
is_partial: bool, is_partial: bool,
webdog_path: &str,
) -> eyre::Result<String> { ) -> eyre::Result<String> {
use kuchikiki::traits::*; use kuchikiki::traits::*;
@ -257,7 +259,9 @@ impl SiteBuilder {
); );
} }
el.append( el.append(
r#"<script type="text/javascript" src="/webdog/webdog.js" defer></script>"#, &format!(
r#"<script type="text/javascript" src="/{webdog_path}/webdog.js" defer></script>"#
),
ContentType::Html, ContentType::Html,
); );
if self.serving { if self.serving {
@ -383,6 +387,12 @@ impl SiteBuilder {
&page_metadata.scripts, &page_metadata.scripts,
&page_metadata.styles, &page_metadata.styles,
page_metadata.is_partial, page_metadata.is_partial,
&self
.site
.config
.webdog_path
.clone()
.unwrap_or_else(|| WEBDOG_DEFAULT_PATH.to_string()),
)?; )?;
if let Some(data) = extra { if let Some(data) = extra {