genorg: comparison genorg.pl

equal deleted inserted replaced

-:c576e88fef13
+:f00ed34eca17
 use File::Copy qw(copy move);
 use Cwd;
 use experimental qw(declared_refs);
 use Data::Dumper;
 use POSIX;
+# !! Add seperatio between title and identifier
 # 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
 # Variable for map_css
 # Remove the desc
 # Domain thing as well
-# Load custom filpe for htmlize and all that
 # 2 articles 1 day better sorting
+# cataogry linking
+# reinforce slash ending for $oudir
 my $cache = 1;
 my $config_file = "genorg-conf";
 my $dir = "blog";
 my $outdir = "out/";
 "../" x ($p > 0 ? $p : 0) . substr("@f2", 1);
 }
 my @org_exps;
 my @files_to_make;
+my @files_to_move;
 sub wanted {
 my $n_path = $outdir . prel_path ($dir,  "$File::Find::name/");
 # We need to mirror the direcotry structure
 if (-d) {
 return;
 }
 if (/\.org$/) {
 push @org_exps, substr $n_path, length($outdir);
 } else {
-copy $_, $n_path;
+push @files_to_move, $File::Find::name
 }
 }
 my @modified_files;
 mkdir $outdir;
 chdir $cdir or die "Couldn't access $cdir\n";
 read_config $config_file;
 -d $dir or die "$dir doesn't exist \n";
 find (\&wanted, $dir);
+for (@files_to_move) {
+copy $_, s#$dir/?#$outdir#er;
+}
 mkdir for @files_to_make;
 values %{conv_files()};
 $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;
 map {$dom->createElement($_)} ("art", "date", "title", "catag", "related");
 $art_el->{path} = $art->{file};
 $ca->appendText($art->{catag});
 $title->appendText($art->{title});
 $date->appendText($art->{date}->text_easy);
+my @ll = @{$art->{links}};
+if (@ll) {
+my $links = $dom->createElement('links');
+for (@ll) {
+	my $link = $dom->createElement("link");
+	$link->{catag} = $_->[0];
+	$link->appendText($_->[1]);
+	$links->appendChild($link);
+}
+$art_el->appendChild($links);
+}
 my $rel_str;
 for my $thing ($art->{related}) {
 for (@{$thing}) {
 	my ($catag, $artt) = @{$_};
 	my $rel_str .= "\"$catag\"" . ($artt && "->\"$artt\"");
 	   ["<li>..."],
 	   (map [$_, $_], (($no_pages - 5)..$no_pages)))
 	}
 }
-sub linkify ($bom) {
+sub get_art($cat, $id) {
-$bom
+for (@arts) {
+return $_ if $_->{catag} eq $cat && $_->{title} eq $id
+}
 }
 sub finalise_html {
 mkdir $no_name_dir;
 open my $fh, '>', "$no_name_dir/1.html";
 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 (grep /^$a_file$/, @modified_files) {
+if (1 or grep /^$a_file$/, @modified_files) {
+my $doom = linkify($art);
 open my $h_file, '>', $a_file;
-my $doom = linkify $art->{dom};
+print $h_file $doom->toStringHTML;
-print $h_file $doom->toString;
 close $h_file;
 }
 }
 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;
+close $_;
 }
 print $mrss '</channel> </rss>';
 for (values %r_files) {
 print $_ '</channel> </rss>';;
-close;
+close $_;
 }
+}
+sub linkify ($art) {
+# if $art->{dom} is undefined, we must sadly parse again
+my @links;
+my @olinks = @{$art->{links} //[]};
+my $bom = $art->{dom} // XML::LibXML->load_html(location => $art->{file});
+for ($bom->findnodes('//a[@class="rakim"]')) {
+my $key;
+my $link_text;
+if (@olinks) {
+$key = pop @olinks;
+} else {
+($key) = parse_keywords($_->to_literal);
+$link_text = $_->{href};
+$_->removeChild($_->firstChild());
+$_->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
 }
 # 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
 my %dome = ('file' => $fn);
 (@dome{'title', 'catag'}, my $date) =
 map
 { $d->getChildrenByTagName($_)->[0]->to_literal }
 qw[title catag date];
+for ($d->getChildrenByTagName("links")) {
+my @ll = map [$_->{catag}, $_->to_literal],
+	($_->getChildrenByTagName('link'));
+$dome{links} = \@ll;
+}
 $catags{$dome{catag}}++;
 $dome{date} = PDate->new(split /-/, $date);
 return \%dome;
 }
 return 0;
 sub html_fixup ($filename) {
 # for (getcache($filename)) {
 # $_ && return $_;
 # }
-unless ($cache && grep /^$filename$/, @modified_files) {
+unless (!$cache && grep /^$filename$/, @modified_files) {
 for (getcache($filename)) {
 return $_ if $_
 }
 }
 my $dom =

changeset 7	f00ed34eca17
parent 6	c576e88fef13
child 8	ee9b57cbbefc