Show title on status bar

mdom · Jan 19, 2019 · 821490c · 821490c
1 parent 30efbf6
commit 821490c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/lib/App/termpub.pm b/lib/App/termpub.pm
@@ -119,13 +119,14 @@ sub update_screen {
     $self->win->clear;
     $self->win->refresh;
     prefresh( $self->pad, $self->line, 0, 0, 0, $self->rows - 1, 80 );
+    $self->win->move( $self->rows, 0 );
+    $self->win->attron(A_STANDOUT);
+    $self->win->addstring( $self->chapters->[$self->chapter]->title );
     if ( $self->line + $self->rows - 1 >= $self->max_lines ) {
-        $self->win->move( $self->rows, 0 );
-        $self->win->attron(A_STANDOUT);
-        $self->win->addstring('(END) ');
-        $self->win->attroff(A_STANDOUT);
-        $self->win->refresh;
+        $self->win->addstring(' (END) ');
     }
+    $self->win->attroff(A_STANDOUT);
+    $self->win->refresh;
 }
 
 sub set_chapter {

diff --git a/lib/App/termpub/Epub.pm b/lib/App/termpub/Epub.pm
@@ -73,11 +73,18 @@ has chapters => sub {
         my $href = $item->attr('href');
         next if !$href;
 
+        my $title;
+        if ( $self->nav_doc ) {
+            $title =
+              $self->nav_doc->find("a[href=$href]")->map('content')->first;
+        }
+
         push @chapters,
           App::termpub::Epub::Chapter->new(
             archive  => $self->archive,
             filename => $self->root_file->sibling($href)->to_rel->to_string,
             href     => $href,
+            $title ? ( title => $title ) : (),
           );
     }
     return \@chapters;

diff --git a/lib/App/termpub/Epub/Chapter.pm b/lib/App/termpub/Epub/Chapter.pm
@@ -5,9 +5,16 @@ has 'archive';
 has 'title';
 has 'filename';
 has 'href';
+has title => sub {
+	shift->dom->find('title')->map('content')->first;
+};
 has content => sub {
     my $self = shift;
     $self->archive->contents( $self->filename );
 };
 
+has dom => sub {
+	Mojo::DOM->new( shift->content );
+};
+
 1;