genorg: comparison genorg.pl

equal deleted inserted replaced

-:f00ed34eca17
+:ee9b57cbbefc
 # Fix up CLI interface
 # Add option ro set cache to 0 through command line
 # Print required elisp code it is in $req_config
 # Add config option for $max_rss and $max_cat
 # Sort cataogirs by entires
+# Document link to file x from file x no work
 # Variable for map_css
 # Remove the desc
 # Domain thing as well
 # 2 articles 1 day better sorting
 # cataogry linking
 my $config_file = "genorg-conf";
 my $dir = "blog";
 my $outdir = "out/";
 my $emacs = "emacs";
-my $css = "style.css";
+my $art_css = "astyle.css";
-my $map_css ="other.css";
+my $cat_css ="cstyle.css";
 my $no_name_dir = "c";
 my $cache_file = "genorg-cache/cache.xml";
 my $domain = "p.bauherren.ovh";
 my $max_rss = 30;
 # The first page has one less article.  Think of it as a feature.
 my $max_cat = 7;
+my $main_title= "";
+my $blog_title = "Pranshu's blog";
 my $username = $ENV{LOGNAME} || $ENV{USER} || getpwuid ($<);
 my $template = <<"END";
 #+title: Test document
 #+subtitle: This is the subtitle
 			 :store nil)
 END
 my $custom_code = "(list 1)";
+my $navbar = <<"END" =~ s/\n\s+//gr;
+<ul>
+<li> Home
+<li> Catagories
+<li> About
+</ul>
+END
 my $elisp_code = <<"END" =~ s/\n\s+//gr;
 (let ((ls '(LIST)))
 (require 'org)
 (mapc
 (lambda (b)
 <html lang="en">
 <head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>TITLE</title>
-<link rel="stylesheet" href="style.css">
+<link rel="stylesheet" href="CSS">
 </head>
+<body>
+NAV
+<h1> BTIT </h1>
 SPLIT
-<body>
-<h1> Pranshu's Blog </h1>
 <ul id="cataogries">
 SPLIT
 <li> <a href="LINK">  CATAG (NUMBER)</a>
 SPLIT
 </ul>
 <div>
-<h2> All articles </h2> <hr>
+<h2> All articles <a id="rss" href="rss.xml">(rss)</span> </h2> <hr>
 SPLIT
 <a href="LINK">
-<strong> TITLE </strong> <span>DATE</span>
+<strong> TITLE </strong> <span>DATE</span> <i>CATAG</i>
-<p>DESCREPTION</p>
-<i>CATAG</i>
 <hr>
 </a>
 SPLIT
 <a href="LINK">
 <strong> TITLE </strong> <span>DATE</span>
-<p>DESCREPTION</p>
 <hr>
 </a>
 SPLIT
 </div>
 </body>
 END
 my %config_vars =
 (
 'emacs-path' => \$emacs,
-css => \$css,
+css => \$art_css,
 indir => \$dir,
 outdir => \$outdir,
 no_name_dir => \$no_name_dir
 );
 my %catags;
 my @arts;
 my $cache_dom;
 sub main {
--d $cdir or help_and_bye;
+$outdir =~ s!/*$!/!;
-mkdir $outdir;
+-d $cdir or help_and_bye;
-chdir $cdir or die "Couldn't access $cdir\n";
+mkdir $outdir;
-read_config $config_file;
+chdir $cdir or die "Couldn't access $cdir\n";
--d $dir or die "$dir doesn't exist \n";
+read_config $config_file;
-find (\&wanted, $dir);
+-d $dir or die "$dir doesn't exist \n";
-for (@files_to_move) {
+find (\&wanted, $dir);
-copy $_, s#$dir/?#$outdir#er;
+for (@files_to_move) {
-}
+	copy $_, s#$dir/?#$outdir#er;
-mkdir for @files_to_make;
+}
-values %{conv_files()};
+mkdir for @files_to_make;
-$cache_dom = XML::LibXML->load_xml(location => $cache_file) if $cache && -f $cache_file;
+values %{conv_files()};
-chdir $outdir;
+$cache_dom = XML::LibXML->load_xml(location => $cache_file) if $cache && -f $cache_file;
-@arts = sort { $b->{date} <=> $a->{date}} map { html_fixup($_) } @org_exps;
+chdir $outdir;
-finalise_html();
+@arts = sort { $b->{date} <=> $a->{date}} map { html_fixup($_) } @org_exps;
-chdir '..';
+finalise_html();
-populate_cache();
+chdir '..';
+populate_cache();
 }
 sub populate_cache {
 my $dom = XML::LibXML::Document->new('1.0', 'UTF-8');
 my $root = $dom->createElement('root');
 my %c_els;
 for my $art (@arts) {
 # We need the: related, file, date
-my ($art_el, $date, $title, $ca, $related) =
+my ($art_el, $date, $title, $ca, $related, $utitle) =
-map {$dom->createElement($_)} ("art", "date", "title", "catag", "related");
+map {$dom->createElement($_)} ("art", "date", "title", "catag", "related", "utitle");
 $art_el->{path} = $art->{file};
 $ca->appendText($art->{catag});
 $title->appendText($art->{title});
 $date->appendText($art->{date}->text_easy);
+$utitle->appendText($art->{utitle});
 my @ll = @{$art->{links}};
 if (@ll) {
 my $links = $dom->createElement('links');
 for (@ll) {
 	my $link = $dom->createElement("link");
 	my ($catag, $artt) = @{$_};
 	my $rel_str .= "\"$catag\"" . ($artt && "->\"$artt\"");
 	$related->appendText("\"$catag\"" . ($artt && "->\"$artt\" "));
 }
 }
-$art_el->appendChild($_) for ($date, $ca, $related, $title);
+$art_el->appendChild($_) for ($date, $ca, $related, $title, $utitle);
 $root->appendChild($art_el);
 }
 $root->appendChild($_) for values %c_els;
 $dom->setDocumentElement($root);
 open my $fh, '>' , $cache_file;
 my ($data, $catagory) = @_;
 my $str = defined $catagory
 ? ($h_en_cat =~ s/CATAG/$data->{catag}/er) : $h_en;
 my $prel_path = "/$no_name_dir/" . (defined $catagory ? "c" : "c/b");
 $str =~ s/DATE/$data->{date}->fmt/er
-=~ s/TITLE/$data->{title}/er
+=~ s/TITLE/$data->{utitle}/er
 =~ s|LINK|prel_path($prel_path, '/'. $data->{file})|er
 }
 sub rss_en ($data) {
 my $thing = <<"END" =~ s/\n\s+//gr;
 <title>TITLE</title>
 <link>LINK</link>
 <description>DESC</description>
 </item>
 END
-$thing =~ s|LINK|"$domain/" . $data->{file}|er
+$thing
-=~ s/TITLE/$data->{title}/er;
+=~ s|LINK|"$domain/" . $data->{file}|er
+=~ s/TITLE/$data->{utitle}/er;
 }
 sub min ($x, $y) {
 ($x, $y)[$x > $y]
 }
 # @_ has to be in format of [STRING, LINK]
 sub list2paginaiton {
 my $page = shift;
 '<ul>' . join ("", map {
 my ($str, $file) = @{$_};
-$str = "---$str" if $file && ($file == $page);
+$str = "<span class=\"psel\">$str</span>" if $file && ($file == $page);
 defined $file ?
 "<li><a href=\"$file.html\">$str</a>" : $str
 } ((["←", $page - 1]) x!! ($page - 1),
 @_,
 (["→", $page + 1]) x ($page != $_[$#_]->[1]))) . '</ul>'
 for (@arts) {
 return $_ if $_->{catag} eq $cat && $_->{title} eq $id
 }
 }
+sub cssbs($s,$t,$p){
+$s =~ s|CSS|prel_path("/$p","/$cat_css")|er
+=~ s/TITLE|BTIT/$t/ger
+=~ s/NAV/$navbar/er;
+}
 sub finalise_html {
 mkdir $no_name_dir;
 open my $fh, '>', "$no_name_dir/1.html";
 open my $mrss, '>', "$no_name_dir/rss.xml"; # The master rss file
 print $mrss $rss_entry;
-print $fh $h_intro . $h_c_intro;
+print $fh cssbs($h_intro . $h_c_intro, $blog_title, "a/c");
 my (%c_files, %r_files);	# Cataogry files and rss
-while (my ($cat, $num) = each %catags) {
+for my $cat (sort { $catags{$b} <=> $catags{$a} } keys(%catags)) {
+my $num = $catags{$cat};
 # ($h_intro, $h_c_intro, $h_cat_li, $h_chap, $h_en_cat, $h_en, $h_end)
 print $fh $h_cat_li =~ s/NUMBER/$num/re
 =~ s/CATAG/$cat/er
 =~ s=LINK="$cat/1.html"=er;
 mkdir "$no_name_dir/$cat";
 open $c_files{$cat}, '>', "$no_name_dir/$cat/1.html";
 open $r_files{$cat}, '>', "$no_name_dir/$cat/rss.xml";
 print {$r_files{$cat}} $rss_entry;
-print {$c_files{$cat}} $h_intro;
+print {$c_files{$cat}}
+cssbs($h_intro, "$cat  <a id=\"rss\" href=\"rss.xml\">(rss)</span> ", "a/b/c");
 }
 print $fh $h_chap;
 # :-)
 my $total_articles = () =  map {(1)x$_} values %catags;
 # Now we iterate through the articles and add their index
 my ($n_fh, $n_mrss, %n_rss) = (0,0);
 my %n_cat;
 for my $art (@arts) {
+# TODO do we need $title?
 my ($catag, $title) = @{$art}{qw(catag title)};
 my $rentry = rss_en $art;
 if (($n_rss{$catag} // 0) < $max_rss) {
 print {$r_files{$catag}} $rentry;
 ++$n_rss{$catag};
 ++$$ncat;
 my $cfh = \$c_files{$catag};
 $$cfh = move_on_if_neccasary $$cfh, $$ncat, $catags{$catag}, "$no_name_dir/$catag";
 print {$$cfh} entry $art;
 my $a_file = $art->{file};
-# say $a_file;
 if (1 or grep /^$a_file$/, @modified_files) {
 my $doom = linkify($art);
 open my $h_file, '>', $a_file;
 print $h_file $doom->toStringHTML;
 close $h_file;
 $_->appendText($link_text);
 }
 push @links, $key;
 my $l = get_art(@{$key})->{file} or die "Link not found in $art->{filename}\n";
 $_->{href} = prel_path("/".$art->{file}, "/$l");
-print $_;
 }
 $art->{links} = \@links;
 return $bom
 }
 sub getcache ($fn) {
 $cache_dom || return 0;
 for my $d ($cache_dom->findnodes("/root/art[\@path=\"$fn\"]")) {
 # TODO related
 my %dome = ('file' => $fn);
-(@dome{'title', 'catag'}, my $date) =
+(@dome{'title', 'catag', 'utitle'}, my $date) =
 map
 { $d->getChildrenByTagName($_)->[0]->to_literal }
-qw[title catag date];
+qw[title catag  utitle date];
 for ($d->getChildrenByTagName("links")) {
 my @ll = map [$_->{catag}, $_->to_literal],
 	($_->getChildrenByTagName('link'));
 $dome{links} = \@ll;
 }
 }
 return 0;
 }
 sub html_fixup ($filename) {
-# for (getcache($filename)) {
+if ($cache && !grep /^$filename$/, @modified_files) {
-# $_ && return $_;
-# }
-unless (!$cache && grep /^$filename$/, @modified_files) {
 for (getcache($filename)) {
 return $_ if $_
 }
 }
 my $dom =
-XML::LibXML->load_html(location  => $filename, recover   => 1);
+XML::LibXML->load_html(location  => $filename);
 my %data = ('file', $filename);
 # We don't need style or table of contents heading (if exists)
 for my $xpath ('/html/head/style', '/html/body/div/div[@id="table-of-contents"]/h2') {
 $_->parentNode->removeChild($_) for $dom->findnodes($xpath)
 $data{date} = $date;
 my $p = $_->parentNode;
 $p->parentNode->removeChild($p);
 }
 }
-# Title\
+# Title
+say "HELLO";
 for ($dom->findnodes('/html/head/title')) {
-$data{title}  = $_->to_literal;
+say "HERE";
+$data{utitle}  = $_->to_literal;
 }
 # keywords/catogry
 for my $node ($dom->findnodes('/html/head/meta')) {
 (my $cont = $node->getAttribute('content')) || next;
 for ($node->getAttribute('name')) {

changeset 8	ee9b57cbbefc
parent 7	f00ed34eca17
child 9	58b72fea234c