genorg: comparison genorg.pl

equal deleted inserted replaced

-:c98c7c32ab46
+:24fc5a406138
 use File::Find;
 use File::Copy qw(copy move);
 use Cwd;
 use experimental qw(declared_refs);
 use Data::Dumper;
+use POSIX;
 # 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
 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 = 10;
+my $max_cat = 7;
 my $username = $ENV{LOGNAME} || $ENV{USER} || getpwuid ($<);
 my $template = <<"END";
 #+title: Test document
 #+subtitle: This is the subtitle
 			 #'(lambda (link desc _ _)
 			     (format "<genorg desc=\"%s\" link=\"%s\"/>" desc link))
 			 :store nil))
 END
+my $custom_code = "(require 'ob-dot) (setq org-confirm-babel-evaluate nil)";
 my $elisp_code = <<"END" =~ s/\n\s+//gr;
 (let ((ls '(LIST)))
 (require 'org)
+$custom_code
 (mapc
 (lambda (b)
 (with-current-buffer b
 (when (and (not (string-match "^ " (buffer-name b)))
 		  (eq major-mode 'org-mode))
 read_config $config_file;
 -d $dir or die "$dir doesn't exist \n";
 find (\&wanted, $dir);
 mkdir for @files_to_make;
 values %{conv_files()};
-my $cache_dom = XML::LibXML->load_xml(location => $cache_file) if $cache && -f $cache_file;
+$cache_dom = XML::LibXML->load_xml(location => $cache_file) if $cache && -f $cache_file;
 chdir $outdir;
 @arts = sort { $b->{date} <=> $a->{date}} map { html_fixup($_) } @org_exps;
+finalise_html();
 chdir '..';
 populate_cache();
-# finalise_html();
 }
 sub populate_cache {
 my $dom = XML::LibXML::Document->new('1.0', 'UTF-8');
 my $root = $dom->createElement('root');
 	my ($catag, $artt) = @{$_};
 	my $rel_str .= "\"$catag\"" . ($artt && "->\"$artt\"");
 	$related->appendText("\"$catag\"" . ($artt && "->\"$artt\" "));
 }
 }
-$art_el->appendChild($_) for ($date, $ca, $related);
+$art_el->appendChild($_) for ($date, $ca, $related, $title);
 $root->appendChild($art_el);
 }
 $root->appendChild($_) for values %c_els;
 $dom->setDocumentElement($root);
-open my $fh, '>' ,$cache_file;
+open my $fh, '>' , $cache_file;
 print $fh ($dom->toString(1) =~ s/(.+)/$1\n<!-- Nicley formated :() -->/r);
 close $fh;
 }
 sub entry {
 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/DESCREPTION/$data->{desc}/er
 =~ s|LINK|prel_path($prel_path, '/'. $data->{file})|er
 }
 sub rss_en ($data) {
 my $thing = <<"END" =~ s/\n\s+//gr;
 <item>
 <title>TITLE</title>
 <link>LINK</link>
 <description>DESC</description>
 </item>
 END
 $thing =~ s|LINK|"$domain/" . $data->{file}|er
-=~ s/TITLE/$data->{title}/er
+=~ s/TITLE/$data->{title}/er;
-=~ s/DESC/$data->{desc}/er;
 }
 sub min ($x, $y) {
 ($x, $y)[$x > $y]
 }
 }
 sub move_on_if_neccasary ($fh, $art_num, $total_articles, $path) {
 return $fh if $art_num == 0 || $art_num % $max_cat;
 my $cpage = $art_num / $max_cat;
-print $fh panigation($cpage, int 0.6 +  $total_articles / $max_cat, $path);
+print $fh panigation($cpage, ceil($total_articles / $max_cat), $path);
 open $fh, '>', $path . '/' . ($cpage + 1).'.html';
 $fh;
 }
 sub panigation ($page, $no_pages, $dir) {
-say ($no_pages - 4);
 if ($no_pages < 9) {
 list2paginaiton ($page, (map [$_, $_], (1..$no_pages)))
 } elsif (4 < $page <= ($no_pages - 4)) {
-say "HERE";
 list2paginaiton
 ($page,
 [1, 1],
 ["<li>..."],
 (map [$_, $_], (($page-2)..($page+2))),
 	   ["<li>..."],
 	   (map [$_, $_], (($no_pages - 5)..$no_pages)))
 	}
 }
+sub linkify ($bom) {
+$bom
+}
 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 {$$cfh} entry $art;
 my $a_file = $art->{file};
 # say $a_file;
 if (grep /^$a_file$/, @modified_files) {
 open my $h_file, '>', $a_file;
-# print $h_file $art->{dom}->toString;
+my $doom = linkify $art->{dom};
+print $h_file $doom->toString;
 close $h_file;
 }
 }
-print $fh panigation (($n_fh / $max_cat) x 2, $no_name_dir) if $max_cat < $total_articles;
+print $fh panigation ((ceil $n_fh / $max_cat) x 2, $no_name_dir) if $max_cat < $total_articles;
 print $fh $h_end;
 close $fh;
 for (values %c_files) {
 print $_ $h_end;
 close;
 }
 # I don't want to prepopulate, as it is not known which ones are
 # usless and outdated, and it would be a waste of cycles parsing
 # something to know it is not needed
-sub getcache {
+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) =
+map
+{ $d->getChildrenByTagName($_)->[0]->to_literal }
+qw[title catag date];
+$catags{$dome{catag}}++;
+$dome{date} = PDate->new(split /-/, $date);
+return \%dome;
+}
 return 0;
 }
 sub html_fixup ($filename) {
 # for (getcache($filename)) {
 # $_ && return $_;
 # }
-unless (grep /^$filename$/, @modified_files) {
+unless ($cache && grep /^$filename$/, @modified_files) {
 for (getcache($filename)) {
 return $_ if $_
 }
 }
 my $dom =
 }
 # keywords/catogry
 for my $node ($dom->findnodes('/html/head/meta')) {
 (my $cont = $node->getAttribute('content')) || next;
 for ($node->getAttribute('name')) {
-if (/description/) {
+if (/keywords/) {
-	$data{desc} = $cont;
-} elsif (/keywords/) {
 	my ($key, $rest) = parse_keywords($cont);
 	@data{qw[catag title]} = @{$key};
 	$catags{$data{catag}}++;
 	$rest =~ s/\s+\|\s+//;
 	while ($rest) {
 qw(January Febuary March April May June July August September November October December);
 my $n = $self->{day};
 if ($n == 1) { $n = '1st' }
 elsif (($n - 2) % 10 == 0) { $n = "${n}nd" }
 elsif (($n - 3) % 10 == 0) { $n = "${n}rd" }
-else { $n = "${n}st" }
+else { $n = "${n}th" }
 $months[$self->{month} - 1] . " $n, " . $self->{year}
 }
 sub short_fmt {
 my $self = shift;

changeset 5	24fc5a406138
parent 4	c98c7c32ab46
child 6	c576e88fef13