--- deliantra/Deliantra-Client/DC.pm	2006/06/05 05:31:13	1.88
+++ deliantra/Deliantra-Client/DC.pm	2006/06/05 21:10:03	1.89
@@ -26,7 +26,91 @@
 use Carp ();
 use AnyEvent ();
 use BerkeleyDB;
-use Pod::POM;
+use Pod::POM ();
+use Storable (); # finally
+
+package CFClient::PodToPango;
+
+use base Pod::POM::View::Text;
+
+our $VERSION = 1; # bump if resultant formatting changes
+
+our $indent = 0;
+
+*view_seq_code   =
+*view_seq_bold   = sub { "<b>$_[1]</b>" };
+*view_seq_italic = sub { "<i>$_[1]</i>" };
+*view_seq_space  =
+*view_seq_link   =
+*view_seq_index  = sub { CFClient::UI::Label::escape ($_[1]) };
+
+sub view_seq_text {
+   my $text = $_[1];
+   $text =~ s/\s+/ /g;
+   CFClient::UI::Label::escape ($text)
+}
+
+sub view_item {
+   ("\t" x ($indent / 4))
+   . $_[1]->title->present ($_[0])
+   . "\n"
+   . $_[1]->content->present ($_[0])
+}
+
+sub view_verbatim {
+   (join "",
+       map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
+          split /\n/, CFClient::UI::Label::escape ($_[1]))
+   . "\n"
+}
+
+sub view_textblock {
+   ("\t" x ($indent / 2)) . "$_[1]\n\n"
+}
+
+sub view_head1 {
+   "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
+   . $_[1]->content->present ($_[0])
+};
+
+sub view_head2 {
+   "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
+   . $_[1]->content->present ($_[0])
+};
+
+sub view_head3 {
+   "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
+   . $_[1]->content->present ($_[0])
+};
+
+sub view_over {
+   local $indent = $indent + $_[1]->indent;
+   $_[1]->content->present ($_[0])
+}
+
+package CFClient::Database;
+
+our @ISA = BerkeleyDB::Btree::;
+
+sub get($$) {
+   my $data;
+
+   $_[0]->db_get ($_[1], $data) == 0
+      ? $data
+      : ()
+}
+
+my %DB_SYNC;
+
+sub put($$$) {
+   my ($db, $key, $data) = @_;
+
+   $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
+
+   $db->db_put ($key => $data)
+}
+
+package CFClient;
 
 sub find_rcfile($) {
    my $path;
@@ -71,21 +155,6 @@
    close CFG;
 }
 
-my %POD_CACHE;
-
-sub load_pod($) {
-   $POD_CACHE{$_[0]} ||= do {
-      my $pod = do {
-         local $/;
-         open my $pod, "<:utf8", $_[0]
-            or die "$_[0]: $!";
-         <$pod>
-      };
-
-      Pod::POM->new->parse_text ($pod)
-   }
-}
-
 our $DB_ENV;
 
 {
@@ -122,98 +191,49 @@
          or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
 }
 
-sub pod_to_pango($) {
-   my ($pom) = @_;
+my $pod_cache = db_table "pod_cache";
 
-   $pom->present ("CFClient::PodToPango")
-}
+sub load_pod($$$$) {
+   my ($path, $filtertype, $filterversion, $filtercb) = @_;
 
-sub pod_to_pango_list($) {
-   my ($pom) = @_;
+   stat $path
+      or die "$path: $!";
 
-   [
-      map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
-         split /\n/, $pom->present ("CFClient::PodToPango")
-   ]
-}
+   my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
 
-package CFClient::PodToPango;
+   my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
 
-use base Pod::POM::View::Text;
+   return $pom if $chash eq $phash;
 
-our $indent = 0;
+   my $pod = do {
+      local $/;
+      open my $pod, "<:utf8", $_[0]
+         or die "$_[0]: $!";
+      <$pod>
+   };
 
-*view_seq_code   =
-*view_seq_bold   = sub { "<b>$_[1]</b>" };
-*view_seq_italic = sub { "<i>$_[1]</i>" };
-*view_seq_space  =
-*view_seq_link   =
-*view_seq_index  = sub { CFClient::UI::Label::escape ($_[1]) };
+   #utf8::downgrade $pod;
 
-sub view_seq_text {
-   my $text = $_[1];
-   $text =~ s/\s+/ /g;
-   CFClient::UI::Label::escape ($text)
-}
+   $pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
 
-sub view_item {
-   ("\t" x ($indent / 4))
-   . $_[1]->title->present ($_[0])
-   . "\n"
-   . $_[1]->content->present ($_[0])
-}
+   $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
 
-sub view_verbatim {
-   (join "",
-       map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
-          split /\n/, CFClient::UI::Label::escape ($_[1]))
-   . "\n"
-}
-
-sub view_textblock {
-   ("\t" x ($indent / 2)) . "$_[1]\n\n"
+   $pom
 }
 
-sub view_head1 {
-   "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
-   . $_[1]->content->present ($_[0])
-};
-
-sub view_head2 {
-   "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
-   . $_[1]->content->present ($_[0])
-};
-
-sub view_head3 {
-   "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
-   . $_[1]->content->present ($_[0])
-};
-
-sub view_over {
-   local $indent = $indent + $_[1]->indent;
-   $_[1]->content->present ($_[0])
-}
-
-package CFClient::Database;
-
-our @ISA = BerkeleyDB::Btree::;
-
-sub get($$) {
-   my $data;
+sub pod_to_pango($) {
+   my ($pom) = @_;
 
-   $_[0]->db_get ($_[1], $data) == 0
-      ? $data
-      : ()
+   $pom->present ("CFClient::PodToPango")
 }
 
-my %DB_SYNC;
-
-sub put($$$) {
-   my ($db, $key, $data) = @_;
-
-   $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
+sub pod_to_pango_list($) {
+   my ($pom) = @_;
 
-   $db->db_put ($key => $data)
+   [
+      map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
+         split /\n/, $pom->present ("CFClient::PodToPango")
+   ]
 }
 
 package CFClient::Item;