diff --git a/examples/web/docusaurus_example.vsh b/examples/web/docusaurus_example.vsh index b73b14d9..612e8f26 100755 --- a/examples/web/docusaurus_example.vsh +++ b/examples/web/docusaurus_example.vsh @@ -6,6 +6,7 @@ playcmds.run( heroscript: ' !!docusaurus.config + name: "tfgrid_tech" title: "TFGrid Tech Docs" !!docusaurus.define @@ -15,7 +16,7 @@ playcmds.run( install: 1 template_update: 1 - !!docusaurus.add sitename:"default" + !!docusaurus.add sitename:"tfgrid_tech" git_url:"https://git.threefold.info/tfgrid/docs_tfgrid4/src/branch/main/ebooks/tech" git_root:"/tmp/code" git_reset:1 @@ -23,6 +24,6 @@ playcmds.run( !!docusaurus.build - !!docusaurus.dev site:"default" open:true watch_changes:true + !!docusaurus.dev site:"tfgrid_tech" open:true watch_changes:true ' )! diff --git a/lib/core/playbook/playbook.v b/lib/core/playbook/playbook.v index 8e693054..7b09cb79 100644 --- a/lib/core/playbook/playbook.v +++ b/lib/core/playbook/playbook.v @@ -8,7 +8,7 @@ import crypto.blake2b @[heap] pub struct PlayBook { pub mut: - actions []&Action @[skip; str: skip] + actions []&Action priorities map[int][]int // first key is the priority, the list of int's is position in list self.actions othertext string // in case there is text outside of the actions result string // if any result diff --git a/lib/core/playcmds/factory.v b/lib/core/playcmds/factory.v index 6bc34c8f..e3351f9d 100644 --- a/lib/core/playcmds/factory.v +++ b/lib/core/playcmds/factory.v @@ -50,7 +50,7 @@ pub fn run(args_ PlayArgs) ! { bizmodel.play(mut plbook)! doctree.play(mut plbook)! docusaurus.play(mut plbook)! - // openai.play(mut plbook)! + openai.play(mut plbook)! // slides.play(mut plbook)! // base_install(play(mut plbook)! diff --git a/lib/web/docusaurus/dsite_add.v b/lib/web/docusaurus/dsite_add.v index faff6324..465cff37 100644 --- a/lib/web/docusaurus/dsite_add.v +++ b/lib/web/docusaurus/dsite_add.v @@ -72,7 +72,7 @@ pub fn dsite_add(args_ AddArgs) !&DocSite { path_build_ := '${f.path_build.path}/${args.sitename}' // get our website - mut mysite := &site.Site(unsafe { nil }) + mut mysite := &site.Site{} if site.exists(name: args.sitename) { // Site already exists (likely processed by hero command), use existing site mysite = site.get(name: args.sitename)! @@ -88,9 +88,6 @@ pub fn dsite_add(args_ AddArgs) !&DocSite { } } - println(mysite) - if true{panic("ss8")} - // Create the DocSite instance mut dsite := &DocSite{ name: args.sitename diff --git a/lib/web/site/factory.v b/lib/web/site/factory.v index 574d5fa0..d92660ca 100644 --- a/lib/web/site/factory.v +++ b/lib/web/site/factory.v @@ -15,12 +15,6 @@ pub mut: pub fn new(args FactoryArgs) !&Site { name := texttools.name_fix(args.name) - // Check if a site with this name already exists - if name in websites { - // Return the existing site instead of creating a new one - return get(name: name)! - } - websites[name] = &Site{ siteconfig: SiteConfig{ name: name diff --git a/lib/web/site/play.v b/lib/web/site/play.v index 8706f9d1..acecfe44 100644 --- a/lib/web/site/play.v +++ b/lib/web/site/play.v @@ -5,6 +5,10 @@ import freeflowuniverse.herolib.core.texttools import time pub fn play(mut plbook PlayBook) ! { + if !plbook.exists(filter: 'site.') && !plbook.exists(filter: 'docusaurus.config') { + return + } + // Handle multiple site configurations - look for both site.config and docusaurus.config mut config_actions := plbook.find(filter: 'site.config')! if config_actions.len == 0 {