From b5fde070b378ca4c7ce517dd35fe6b31e0617b38 Mon Sep 17 00:00:00 2001 From: mariobassem Date: Tue, 31 Dec 2024 15:14:13 +0200 Subject: [PATCH] fixes --- cli/hero.v | 11 +- lib/core/playcmds/factory.v | 4 +- lib/core/playcmds/play_dagu.v | 4 +- lib/core/playcmds/play_zola.v | 442 +++++++++++++++++----------------- lib/core/playcmds/scheduler.v | 12 +- lib/installers/base/redis.v | 8 +- 6 files changed, 241 insertions(+), 240 deletions(-) diff --git a/cli/hero.v b/cli/hero.v index 7c6bb28a..25e7e99b 100644 --- a/cli/hero.v +++ b/cli/hero.v @@ -2,6 +2,7 @@ module main import os import cli { Command, Flag } +import freeflowuniverse.herolib.core.herocmds // import freeflowuniverse.herolib.hero.cmds // import freeflowuniverse.herolib.hero.publishing import freeflowuniverse.herolib.installers.base @@ -9,7 +10,7 @@ import freeflowuniverse.herolib.ui.console import freeflowuniverse.herolib.ui import freeflowuniverse.herolib.osal import freeflowuniverse.herolib.core.playbook -// import freeflowuniverse.herolib.core.playcmds +import freeflowuniverse.herolib.core.playcmds fn playcmds_do(path string) ! { mut plbook := playbook.new(path: path)! @@ -68,9 +69,9 @@ fn do() ! { } } - base.redis_install()! + base.install()! - //herocmds.cmd_bootstrap(mut cmd) + // herocmds.cmd_bootstrap(mut cmd) // herocmds.cmd_run(mut cmd) // herocmds.cmd_git(mut cmd) // herocmds.cmd_init(mut cmd) @@ -83,8 +84,8 @@ fn do() ! { // herocmds.cmd_postgres(mut cmd) // herocmds.cmd_mdbook(mut cmd) // herocmds.cmd_luadns(mut cmd) - //herocmds.cmd_caddy(mut cmd) - //herocmds.cmd_zola(mut cmd) + // herocmds.cmd_caddy(mut cmd) + // herocmds.cmd_zola(mut cmd) // herocmds.cmd_juggler(mut cmd) // herocmds.cmd_generator(mut cmd) // herocmds.cmd_docsorter(mut cmd) diff --git a/lib/core/playcmds/factory.v b/lib/core/playcmds/factory.v index e3105969..c12a16c9 100644 --- a/lib/core/playcmds/factory.v +++ b/lib/core/playcmds/factory.v @@ -9,7 +9,7 @@ import freeflowuniverse.herolib.hero.publishing import freeflowuniverse.herolib.threefold.grid4.gridsimulator // import freeflowuniverse.herolib.installers.sysadmintools.daguserver import freeflowuniverse.herolib.threefold.grid4.farmingsimulator -import freeflowuniverse.herolib.web.components.slides +// import freeflowuniverse.herolib.web.components.slides // import freeflowuniverse.herolib.installers.base as base_install // import freeflowuniverse.herolib.installers.infra.coredns @@ -32,7 +32,7 @@ pub fn run(mut plbook playbook.PlayBook, dagu bool) ! { farmingsimulator.play(mut plbook)! gridsimulator.play(mut plbook)! bizmodel.play(mut plbook)! - slides.play(mut plbook)! + // slides.play(mut plbook)! // base_install(play(mut plbook)! // coredns.play(mut plbook)! diff --git a/lib/core/playcmds/play_dagu.v b/lib/core/playcmds/play_dagu.v index 5986d323..1f80dfb0 100644 --- a/lib/core/playcmds/play_dagu.v +++ b/lib/core/playcmds/play_dagu.v @@ -1,7 +1,7 @@ module playcmds -import freeflowuniverse.herolib.clients.daguclient -import freeflowuniverse.herolib.installers.sysadmintools.daguserver +// import freeflowuniverse.herolib.clients.daguclient +// import freeflowuniverse.herolib.installers.sysadmintools.daguserver // import freeflowuniverse.herolib.installers.sysadmintools.daguserver import freeflowuniverse.herolib.core.playbook import freeflowuniverse.herolib.ui.console diff --git a/lib/core/playcmds/play_zola.v b/lib/core/playcmds/play_zola.v index d73e8bab..a8b95717 100644 --- a/lib/core/playcmds/play_zola.v +++ b/lib/core/playcmds/play_zola.v @@ -1,246 +1,246 @@ module playcmds -import freeflowuniverse.herolib.ui.console -import freeflowuniverse.herolib.web.zola -import freeflowuniverse.herolib.core.playbook +// import freeflowuniverse.herolib.ui.console +// import freeflowuniverse.herolib.web.zola +// import freeflowuniverse.herolib.core.playbook -struct WebsiteItem { -mut: - name string - site ?&zola.ZolaSite -} +// struct WebsiteItem { +// mut: +// name string +// site ?&zola.ZolaSite +// } -pub fn play_zola(mut plbook playbook.PlayBook) ! { - // mut coderoot := '' - mut buildroot := '' - mut publishroot := '' - mut install := true - mut reset := false +// pub fn play_zola(mut plbook playbook.PlayBook) ! { +// // mut coderoot := '' +// mut buildroot := '' +// mut publishroot := '' +// mut install := true +// mut reset := false - wsactions := plbook.find(filter: 'website.')! - if wsactions.len == 0 { - return - } +// wsactions := plbook.find(filter: 'website.')! +// if wsactions.len == 0 { +// return +// } - mut config_actions := plbook.find(filter: 'websites:configure')! - if config_actions.len > 1 { - return error('can only have 1 config action for websites') - } else if config_actions.len == 1 { - mut p := config_actions[0].params - buildroot = p.get_default('buildroot', '')! - publishroot = p.get_default('publishroot', '')! - // coderoot = p.get_default('coderoot', '')! - install = p.get_default_true('install') - reset = p.get_default_false('reset') - config_actions[0].done = true - } - mut websites := zola.new( - path_build: buildroot - path_publish: publishroot - install: install - reset: reset - )! +// mut config_actions := plbook.find(filter: 'websites:configure')! +// if config_actions.len > 1 { +// return error('can only have 1 config action for websites') +// } else if config_actions.len == 1 { +// mut p := config_actions[0].params +// buildroot = p.get_default('buildroot', '')! +// publishroot = p.get_default('publishroot', '')! +// // coderoot = p.get_default('coderoot', '')! +// install = p.get_default_true('install') +// reset = p.get_default_false('reset') +// config_actions[0].done = true +// } +// mut websites := zola.new( +// path_build: buildroot +// path_publish: publishroot +// install: install +// reset: reset +// )! - mut ws := WebsiteItem{} +// mut ws := WebsiteItem{} - for mut action in plbook.find(filter: 'website.')! { - if action.name == 'define' { - console.print_debug('website.define') - mut p := action.params - ws.name = p.get('name')! - title := p.get_default('title', '')! - description := p.get_default('description', '')! - ws.site = websites.new(name: ws.name, title: title, description: description)! - } else if action.name == 'template_add' { - console.print_debug('website.template_add') - mut p := action.params - url := p.get_default('url', '')! - mut site_ := ws.site or { - return error("can't find website for template_add, should have been defined before with !!website.define") - } +// for mut action in plbook.find(filter: 'website.')! { +// if action.name == 'define' { +// console.print_debug('website.define') +// mut p := action.params +// ws.name = p.get('name')! +// title := p.get_default('title', '')! +// description := p.get_default('description', '')! +// ws.site = websites.new(name: ws.name, title: title, description: description)! +// } else if action.name == 'template_add' { +// console.print_debug('website.template_add') +// mut p := action.params +// url := p.get_default('url', '')! +// mut site_ := ws.site or { +// return error("can't find website for template_add, should have been defined before with !!website.define") +// } - site_.template_add(url: url)! - } else if action.name == 'content_add' { - console.print_debug('website.content_add') - mut p := action.params - url := p.get_default('url', '')! - mut site_ := ws.site or { - return error("can't find website for content_add, should have been defined before with !!website.define") - } +// site_.template_add(url: url)! +// } else if action.name == 'content_add' { +// console.print_debug('website.content_add') +// mut p := action.params +// url := p.get_default('url', '')! +// mut site_ := ws.site or { +// return error("can't find website for content_add, should have been defined before with !!website.define") +// } - site_.content_add(url: url)! - } else if action.name == 'doctree_add' { - console.print_debug('website.doctree_add') - mut p := action.params - url := p.get_default('url', '')! - pull := p.get_default_false('pull') - mut site_ := ws.site or { - return error("can't find website for doctree_add, should have been defined before with !!website.define") - } +// site_.content_add(url: url)! +// } else if action.name == 'doctree_add' { +// console.print_debug('website.doctree_add') +// mut p := action.params +// url := p.get_default('url', '')! +// pull := p.get_default_false('pull') +// mut site_ := ws.site or { +// return error("can't find website for doctree_add, should have been defined before with !!website.define") +// } - site_.doctree_add(url: url, pull: pull)! - } else if action.name == 'post_add' { - console.print_debug('website.post_add') - mut p := action.params - name := p.get_default('name', '')! - collection := p.get_default('collection', '')! - file := p.get_default('file', '')! - page := p.get_default('page', '')! - pointer := p.get_default('pointer', '')! - mut site_ := ws.site or { - return error("can't find website for doctree_add, should have been defined before with !!website.define") - } +// site_.doctree_add(url: url, pull: pull)! +// } else if action.name == 'post_add' { +// console.print_debug('website.post_add') +// mut p := action.params +// name := p.get_default('name', '')! +// collection := p.get_default('collection', '')! +// file := p.get_default('file', '')! +// page := p.get_default('page', '')! +// pointer := p.get_default('pointer', '')! +// mut site_ := ws.site or { +// return error("can't find website for doctree_add, should have been defined before with !!website.define") +// } - site_.post_add(name: name, collection: collection, file: file, pointer: pointer)! - } else if action.name == 'blog_add' { - console.print_debug('website.blog_add') - mut p := action.params - name := p.get_default('name', '')! - collection := p.get_default('collection', '')! - file := p.get_default('file', '')! - page := p.get_default('page', '')! - pointer := p.get_default('pointer', '')! - mut site_ := ws.site or { - return error("can't find website for doctree_add, should have been defined before with !!website.define") - } +// site_.post_add(name: name, collection: collection, file: file, pointer: pointer)! +// } else if action.name == 'blog_add' { +// console.print_debug('website.blog_add') +// mut p := action.params +// name := p.get_default('name', '')! +// collection := p.get_default('collection', '')! +// file := p.get_default('file', '')! +// page := p.get_default('page', '')! +// pointer := p.get_default('pointer', '')! +// mut site_ := ws.site or { +// return error("can't find website for doctree_add, should have been defined before with !!website.define") +// } - site_.blog_add(name: name)! - } else if action.name == 'person_add' { - console.print_debug('website.person_add') - mut p := action.params - name := p.get_default('name', '')! - page := p.get_default('page', '')! - collection := p.get_default('collection', '')! - file := p.get_default('file', '')! - pointer := p.get_default('pointer', '')! - mut site_ := ws.site or { - return error("can't find website for doctree_add, should have been defined before with !!website.define") - } +// site_.blog_add(name: name)! +// } else if action.name == 'person_add' { +// console.print_debug('website.person_add') +// mut p := action.params +// name := p.get_default('name', '')! +// page := p.get_default('page', '')! +// collection := p.get_default('collection', '')! +// file := p.get_default('file', '')! +// pointer := p.get_default('pointer', '')! +// mut site_ := ws.site or { +// return error("can't find website for doctree_add, should have been defined before with !!website.define") +// } - site_.person_add( - name: name - collection: collection - file: file - page: page - pointer: pointer - )! - } else if action.name == 'people_add' { - console.print_debug('website.people_add') - mut p := action.params - name := p.get_default('name', '')! - description := p.get_default('description', '')! - sort_by_ := p.get_default('sort_by', '')! - mut site_ := ws.site or { - return error("can't find website for people_add, should have been defined before with !!website.define") - } +// site_.person_add( +// name: name +// collection: collection +// file: file +// page: page +// pointer: pointer +// )! +// } else if action.name == 'people_add' { +// console.print_debug('website.people_add') +// mut p := action.params +// name := p.get_default('name', '')! +// description := p.get_default('description', '')! +// sort_by_ := p.get_default('sort_by', '')! +// mut site_ := ws.site or { +// return error("can't find website for people_add, should have been defined before with !!website.define") +// } - sort_by := zola.SortBy.from(sort_by_)! - site_.people_add( - name: name - title: p.get_default('title', '')! - sort_by: sort_by - description: description - )! - } else if action.name == 'blog_add' { - console.print_debug('website.blog_add') - mut p := action.params - name := p.get_default('name', '')! - description := p.get_default('description', '')! - sort_by_ := p.get_default('sort_by', '')! - mut site_ := ws.site or { - return error("can't find website for people_add, should have been defined before with !!website.define") - } +// sort_by := zola.SortBy.from(sort_by_)! +// site_.people_add( +// name: name +// title: p.get_default('title', '')! +// sort_by: sort_by +// description: description +// )! +// } else if action.name == 'blog_add' { +// console.print_debug('website.blog_add') +// mut p := action.params +// name := p.get_default('name', '')! +// description := p.get_default('description', '')! +// sort_by_ := p.get_default('sort_by', '')! +// mut site_ := ws.site or { +// return error("can't find website for people_add, should have been defined before with !!website.define") +// } - sort_by := zola.SortBy.from(sort_by_)! - site_.blog_add( - name: name - title: p.get_default('title', '')! - sort_by: sort_by - description: description - )! - } else if action.name == 'news_add' { - console.print_debug('website.news_add') - mut p := action.params - name := p.get_default('name', '')! - collection := p.get_default('collection', '')! - pointer := p.get_default('pointer', '')! - file := p.get_default('file', '')! - mut site_ := ws.site or { - return error("can't find website for news_add, should have been defined before with !!website.define") - } +// sort_by := zola.SortBy.from(sort_by_)! +// site_.blog_add( +// name: name +// title: p.get_default('title', '')! +// sort_by: sort_by +// description: description +// )! +// } else if action.name == 'news_add' { +// console.print_debug('website.news_add') +// mut p := action.params +// name := p.get_default('name', '')! +// collection := p.get_default('collection', '')! +// pointer := p.get_default('pointer', '')! +// file := p.get_default('file', '')! +// mut site_ := ws.site or { +// return error("can't find website for news_add, should have been defined before with !!website.define") +// } - site_.article_add(name: name, collection: collection, file: file, pointer: pointer)! - } else if action.name == 'header_add' { - console.print_debug('website.header_add') - mut p := action.params - template := p.get_default('template', '')! - logo := p.get_default('logo', '')! - mut site_ := ws.site or { - return error("can't find website for doctree_add, should have been defined before with !!website.define") - } +// site_.article_add(name: name, collection: collection, file: file, pointer: pointer)! +// } else if action.name == 'header_add' { +// console.print_debug('website.header_add') +// mut p := action.params +// template := p.get_default('template', '')! +// logo := p.get_default('logo', '')! +// mut site_ := ws.site or { +// return error("can't find website for doctree_add, should have been defined before with !!website.define") +// } - site_.header_add(template: template, logo: logo)! - } else if action.name == 'header_link_add' { - console.print_debug('website.header_link_add') - mut p := action.params - page := p.get_default('page', '')! - label := p.get_default('label', '')! - mut site_ := ws.site or { - return error("can't find website for header_link_add, should have been defined before with !!website.define") - } +// site_.header_add(template: template, logo: logo)! +// } else if action.name == 'header_link_add' { +// console.print_debug('website.header_link_add') +// mut p := action.params +// page := p.get_default('page', '')! +// label := p.get_default('label', '')! +// mut site_ := ws.site or { +// return error("can't find website for header_link_add, should have been defined before with !!website.define") +// } - site_.header_link_add(page: page, label: label)! - } else if action.name == 'footer_add' { - console.print_debug('website.footer_add') - mut p := action.params - template := p.get_default('template', '')! - mut site_ := ws.site or { - return error("can't find website for doctree_add, should have been defined before with !!website.define") - } +// site_.header_link_add(page: page, label: label)! +// } else if action.name == 'footer_add' { +// console.print_debug('website.footer_add') +// mut p := action.params +// template := p.get_default('template', '')! +// mut site_ := ws.site or { +// return error("can't find website for doctree_add, should have been defined before with !!website.define") +// } - site_.footer_add(template: template)! - } else if action.name == 'page_add' { - console.print_debug('website.page_add') - mut p := action.params - name := p.get_default('name', '')! - collection := p.get_default('collection', '')! - file := p.get_default('file', '')! - homepage := p.get_default_false('homepage') - mut site_ := ws.site or { - return error("can't find website for doctree_add, should have been defined before with !!website.define") - } +// site_.footer_add(template: template)! +// } else if action.name == 'page_add' { +// console.print_debug('website.page_add') +// mut p := action.params +// name := p.get_default('name', '')! +// collection := p.get_default('collection', '')! +// file := p.get_default('file', '')! +// homepage := p.get_default_false('homepage') +// mut site_ := ws.site or { +// return error("can't find website for doctree_add, should have been defined before with !!website.define") +// } - site_.page_add(name: name, collection: collection, file: file, homepage: homepage)! +// site_.page_add(name: name, collection: collection, file: file, homepage: homepage)! - // }else if action.name=="pull"{ - // mut site_:=ws.site or { return error("can't find website for pull, should have been defined before with !!website.define")} - // site_.pull()! - } else if action.name == 'section_add' { - console.print_debug('website.section_add') - // mut p := action.params - // name := p.get_default('name', '')! - // // collection := p.get_default('collection', '')! - // // file := p.get_default('file', '')! - // // homepage := p.get_default_false('homepage') - // mut site_ := ws.site or { - // return error("can't find website for doctree_add, should have been defined before with !!website.define") - // } +// // }else if action.name=="pull"{ +// // mut site_:=ws.site or { return error("can't find website for pull, should have been defined before with !!website.define")} +// // site_.pull()! +// } else if action.name == 'section_add' { +// console.print_debug('website.section_add') +// // mut p := action.params +// // name := p.get_default('name', '')! +// // // collection := p.get_default('collection', '')! +// // // file := p.get_default('file', '')! +// // // homepage := p.get_default_false('homepage') +// // mut site_ := ws.site or { +// // return error("can't find website for doctree_add, should have been defined before with !!website.define") +// // } - // site_.add_section(name: name)! +// // site_.add_section(name: name)! - // }else if action.name=="pull"{ - // mut site_:=ws.site or { return error("can't find website for pull, should have been defined before with !!website.define")} - // site_.pull()! - } else if action.name == 'generate' { - mut site_ := ws.site or { - return error("can't find website for generate, should have been defined before with !!website.define") - } +// // }else if action.name=="pull"{ +// // mut site_:=ws.site or { return error("can't find website for pull, should have been defined before with !!website.define")} +// // site_.pull()! +// } else if action.name == 'generate' { +// mut site_ := ws.site or { +// return error("can't find website for generate, should have been defined before with !!website.define") +// } - site_.generate()! - // site_.serve()! - } else { - return error("Cannot find right action for website. Found '${action.name}' which is a non understood action for !!website.") - } - action.done = true - } -} +// site_.generate()! +// // site_.serve()! +// } else { +// return error("Cannot find right action for website. Found '${action.name}' which is a non understood action for !!website.") +// } +// action.done = true +// } +// } diff --git a/lib/core/playcmds/scheduler.v b/lib/core/playcmds/scheduler.v index ca4bfc9e..36e75132 100644 --- a/lib/core/playcmds/scheduler.v +++ b/lib/core/playcmds/scheduler.v @@ -1,9 +1,9 @@ module playcmds -import freeflowuniverse.herolib.installers.sysadmintools.daguserver +// import freeflowuniverse.herolib.installers.sysadmintools.daguserver -pub fn scheduler(heroscript string) ! { - daguserver.play( - heroscript: heroscript - )! -} +// pub fn scheduler(heroscript string) ! { +// daguserver.play( +// heroscript: heroscript +// )! +// } diff --git a/lib/installers/base/redis.v b/lib/installers/base/redis.v index 57cb88f4..5f3a432f 100644 --- a/lib/installers/base/redis.v +++ b/lib/installers/base/redis.v @@ -53,7 +53,7 @@ pub fn install(args_ RedisInstallArgs) ! { start(args)! } -fn configfilepath(args InstallArgs) string { +fn configfilepath(args RedisInstallArgs) string { if osal.is_linux() { return '/etc/redis/redis.conf' } else { @@ -61,12 +61,12 @@ fn configfilepath(args InstallArgs) string { } } -fn configure(args InstallArgs) ! { +fn configure(args RedisInstallArgs) ! { c := $tmpl('templates/redis_config.conf') pathlib.template_write(c, configfilepath(), true)! } -pub fn check(args InstallArgs) bool { +pub fn check(args RedisInstallArgs) bool { res := os.execute('redis-cli -c -p ${args.port} ping > /dev/null 2>&1') if res.exit_code == 0 { return true @@ -74,7 +74,7 @@ pub fn check(args InstallArgs) bool { return false } -pub fn start(args InstallArgs) ! { +pub fn start(args RedisInstallArgs) ! { if check() { return }