From: Emil Williams Date: Wed, 21 May 2025 00:27:38 +0000 (-0600) Subject: -- X-Git-Url: https://git.xolatile.top/?a=commitdiff_plain;h=72252cfa3f021d5390d1aa3a10b40b4fbde6a947;p=emil-3chen.org.git -- --- diff --git a/perl/Triple.pm b/perl/Triple.pm index 9857c0b..98102b1 100644 --- a/perl/Triple.pm +++ b/perl/Triple.pm @@ -12,7 +12,8 @@ use Template; use URI::Escape; # Internal -use Secrets; +use Triple::Secrets; +use Triple::Init; our $debug = 0; @@ -38,8 +39,6 @@ our %page = ( our %static; -our $template = Template->new({INCLUDE_PATH => 'tt'}); - sub Triple::main { sub parse_post { @@ -54,6 +53,7 @@ sub Triple::main { my ($sitename, $version) = init(); my $request = FCGI::Request(); + my $template = Template->new({INCLUDE_PATH => 'tt'}); my @threads = ( [ @@ -168,62 +168,11 @@ sub Triple::main { } sub init { - - sub static { - - my ($sitename, $version) = @_; - my @boards = ( - '/c/', - '/sys/', - ); - my $vars = { - boards => \@boards, - page => \%Triple::page, - sitename => $sitename, - version => $version, - }; - foreach my $key (keys %page) { - my @set = @{$page{$key}}; - next if $set[PAGE_TYPE] != STATIC_PAGE; - syslog("info", "Marking Static '$key'"); - $vars->{"uri"} = "$key"; - $vars->{"title"} = "$set[PAGE_TITLE]"; - $vars->{"description"} = "$set[PAGE_DESCRIPTION]"; - my $temporary; - $template->process($set[PAGE_TT], $vars, \$temporary) or syslog("info", $template->error()); - $static{$key} = $temporary; - } - } - - sub sitename { - - use Cwd; - my $cwd = getcwd(); - $cwd =~ s/.*\///; - return $cwd; - } - - sub debug { - - my $sitename = $_[0]; - openlog($sitename, "ndelay,pid", Sys::Syslog::LOG_DAEMON); - $debug = 1 if $sitename =~ /^test\./; - } - - sub version { - - open my $fh, '<', "version" or die "Can't open file: $!"; - my $line = uc(substr(<$fh>, 0, 12)); - close $fh; - return $line; - } - - my $sitename = sitename(); - debug($sitename); - my $version = version(); + my $sitename = Init::sitename(); + Init::debug($sitename); + my $version = Init::version(); syslog("info", ""); - - static($sitename, $version); + Init::static($sitename, $version); return $sitename, $version; } diff --git a/perl/Triple/.gitignore b/perl/Triple/.gitignore new file mode 100644 index 0000000..a189ecd --- /dev/null +++ b/perl/Triple/.gitignore @@ -0,0 +1 @@ +Secrets.pm diff --git a/perl/Triple/Init.pm b/perl/Triple/Init.pm new file mode 100644 index 0000000..71895df --- /dev/null +++ b/perl/Triple/Init.pm @@ -0,0 +1,51 @@ +sub sitename { + + use Cwd; + my $cwd = getcwd(); + $cwd =~ s/.*\///; + return $cwd; +} + +sub debug { + use Sys::Syslog; + + my $sitename = $_[0]; + openlog($sitename, "ndelay,pid", Sys::Syslog::LOG_DAEMON); + $debug = 1 if $sitename =~ /^test\./; +} + +sub version { + + open my $fh, '<', "version" or die syslog("info", "Can't open file: $!"); + my $line = uc(substr(<$fh>, 0, 12)); + close $fh; + return $line; +} + +sub static { + my ($sitename, $version) = @_; + my $template = Template->new({INCLUDE_PATH => 'tt'}); + my @boards = ( + '/c/', + '/sys/', + ); + my $vars = { + boards => \@boards, + page => \%Triple::page, # fixme + sitename => $sitename, + version => $version, + }; + foreach my $key (keys %page) { + my @set = @{$page{$key}}; + next if $set[PAGE_TYPE] != STATIC_PAGE; + syslog("info", "Marking Static '$key'"); + $vars->{"uri"} = "$key"; + $vars->{"title"} = "$set[PAGE_TITLE]"; + $vars->{"description"} = "$set[PAGE_DESCRIPTION]"; + my $temporary; + $template->process($set[PAGE_TT], $vars, \$temporary) or syslog("info", $template->error()); + $static{$key} = $temporary; + } +} + +1;