From 6ba074b29cc6c7b2cb15848ce875208ae7aae446 Mon Sep 17 00:00:00 2001 From: despiegk Date: Thu, 17 Jul 2025 19:50:05 +0400 Subject: [PATCH] ... --- lib/web/docusaurus/dsite.v | 4 ++-- lib/web/docusaurus/dsite_generate.v | 7 +++---- lib/web/docusaurus/dsite_get.v | 5 +++++ lib/web/docusaurus/factory.v | 5 ----- lib/web/siteconfig/config.v | 4 +++- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/web/docusaurus/dsite.v b/lib/web/docusaurus/dsite.v index 36758356..005539ce 100644 --- a/lib/web/docusaurus/dsite.v +++ b/lib/web/docusaurus/dsite.v @@ -3,9 +3,8 @@ module docusaurus import freeflowuniverse.herolib.osal.screen import os import freeflowuniverse.herolib.core.pathlib -// import freeflowuniverse.herolib.core.base +import freeflowuniverse.herolib.web.siteconfig import freeflowuniverse.herolib.develop.gittools -// import json import freeflowuniverse.herolib.osal import freeflowuniverse.herolib.ui.console import time @@ -21,6 +20,7 @@ pub mut: args DSiteGetArgs errors []SiteError config Configuration + siteconfig siteconfig.SiteConfig factory &DocusaurusFactory @[skip; str: skip] // Reference to the parent } diff --git a/lib/web/docusaurus/dsite_generate.v b/lib/web/docusaurus/dsite_generate.v index e442091b..287ad620 100644 --- a/lib/web/docusaurus/dsite_generate.v +++ b/lib/web/docusaurus/dsite_generate.v @@ -48,21 +48,20 @@ pub fn (mut site DocSite) generate() ! { site.download_collections()! - } - pub fn (mut site DocSite) download_collections() ! { mut gs := gittools.new()! - for item in site.config.import_sources { + for item in site.siteconfig.import_collections { mypath := gs.get_path( pull: false reset: false url: item.url )! mut mypatho := pathlib.get(mypath) - println(mypatho) + mypatho.copy(dest: '${site.factory.path_build.path}/docs/${item.dest}', delete: true)! + println(mypath) // site.process_md(mut mypatho, item)! } diff --git a/lib/web/docusaurus/dsite_get.v b/lib/web/docusaurus/dsite_get.v index 0548413f..159db09f 100644 --- a/lib/web/docusaurus/dsite_get.v +++ b/lib/web/docusaurus/dsite_get.v @@ -4,6 +4,7 @@ import os import freeflowuniverse.herolib.core.pathlib import freeflowuniverse.herolib.core.texttools import freeflowuniverse.herolib.develop.gittools +import freeflowuniverse.herolib.web.siteconfig import freeflowuniverse.herolib.ui.console import freeflowuniverse.herolib.osal @@ -64,6 +65,7 @@ pub fn (mut f DocusaurusFactory) get(args_ DSiteGetArgs) !&DocSite { } } + mut myconfig:=config_load(configpath)! if myconfig.main.name.len == 0 { @@ -83,6 +85,8 @@ pub fn (mut f DocusaurusFactory) get(args_ DSiteGetArgs) !&DocSite { args.path_publish = "${f.path_publish}/${args.name}" } + mut mysiteconfig:=*siteconfig.new(configpath)! + mut ds := DocSite{ name: args.name url: args.url @@ -90,6 +94,7 @@ pub fn (mut f DocusaurusFactory) get(args_ DSiteGetArgs) !&DocSite { path_publish: pathlib.get_dir(path:args.path_publish)! args: args config: myconfig + siteconfig: mysiteconfig //comes from the heroconfig factory: &f } ds.check()! diff --git a/lib/web/docusaurus/factory.v b/lib/web/docusaurus/factory.v index cccdd6aa..37722bcb 100644 --- a/lib/web/docusaurus/factory.v +++ b/lib/web/docusaurus/factory.v @@ -1,12 +1,7 @@ module docusaurus import os -// import freeflowuniverse.herolib.data.doctree.collection import freeflowuniverse.herolib.core.pathlib -// import freeflowuniverse.herolib.ui.console -// import freeflowuniverse.herolib.core.base -// import freeflowuniverse.herolib.develop.gittools -// import freeflowuniverse.herolib.ui.console @[heap] pub struct DocusaurusFactory { diff --git a/lib/web/siteconfig/config.v b/lib/web/siteconfig/config.v index 511228ca..5e0b1b42 100644 --- a/lib/web/siteconfig/config.v +++ b/lib/web/siteconfig/config.v @@ -27,6 +27,8 @@ pub mut: build_dest_dev []BuildDest // Development build destinations (from !!site.build_dest_dev) } + + pub struct Page { pub mut: name string @@ -90,5 +92,5 @@ pub mut: path string dest string // location in the docs folder of the place where we will build docusaurus replace map[string]string // will replace ${NAME} in the imported content - visible bool + visible bool = true }