Changeset 935 for lang

Timestamp:

10/31/07 02:35:37 (6 years ago)

Author:

tokuhirom

Message:

lang/perl/mobirc: added pager for /recent

Location:

lang/perl/mobirc/trunk/mobirc

Files:

• assets/tmpl/recent.html (modified) (1 diff)
• config.yaml.sample (modified) (1 diff)
• lib/Mobirc/ConfigLoader.pm (modified) (2 diffs)
• lib/Mobirc/HTTPD/Controller.pm (modified) (2 diffs)
• lib/Mobirc/HTTPD/Router.pm (modified) (1 diff)

lang/perl/mobirc/trunk/mobirc/assets/tmpl/recent.html

@@ -1 +1 @@
 [% INCLUDE 'include/header.html' %]
 
-[% FOR canon_channel IN channel_name.keys.sort %]
-    [% IF channel_name.item(canon_channel) and channel_recent.item(canon_channel) and channel_recent.item(canon_channel).size %]
-        <div class="ChannelHeader">
-            <b class="ChannelName">[% channel_name.item(canon_channel) | html %]</b>
-            <a href="[% docroot %]channels/[% channel_name.item(canon_channel) | uri%]">more..</a><br />
-        </div>
+[% FOR channel IN target_channels %]
+    <div class="ChannelHeader">
+        <b class="ChannelName">[% channel_name.item(channel) | html %]</b>
+        <a href="[% docroot %]channels/[% channel_name.item(channel) | uri%]">more..</a><br />
+    </div>
 
-        [% FOR line IN channel_recent.item(canon_channel) %]
-            [% render_line( line ) %]<br />
-        [% END %]
+    [% FOR line IN channel_recent.item(channel) %]
+        [% render_line( line ) %]<br />
+    [% END %]
 
-        <hr />
-    [% END %]
+    <hr />
 [% END %]
 <br />
+
+[% IF has_next_page %]
+<a href="[% docroot %]recent?t=[% now %]">next</a>
+[% END %]
+
+<hr />
+
 <a accesskey="8" href="[% docroot %]">ch list[8]</a>
 

lang/perl/mobirc/trunk/mobirc/config.yaml.sample

@@ -22 +22 @@
   cookie_expires: +3d
   use_cookie: 1
+  # recent_log_per_page: 40
   authorizer:
     - module: Mobirc::HTTPD::Authorizer::Cookie

lang/perl/mobirc/trunk/mobirc/lib/Mobirc/ConfigLoader.pm

@@ -60 +60 @@
                 root           => { type => 'str', },
                 echo           => { type => 'bool', },
-                au_pcsv        => { type => 'bool', },
+                recent_log_per_page => { type => 'int', },
                 filter => {
                     type     => 'seq',
@@ -133 +133 @@
     $config->{httpd}->{content_type}   ||= 'text/html; charset=Shift_JIS';
     $config->{httpd}->{echo} = true unless exists $config->{httpd}->{echo};
+    $config->{httpd}->{recent_log_per_page} ||= 30;
     $config->{global}->{assets_dir}    ||= File::Spec->catfile( $FindBin::Bin, 'assets' );
 

lang/perl/mobirc/trunk/mobirc/lib/Mobirc/HTTPD/Controller.pm

@@ -65 +65 @@
     my ($class, $c) = @_;
 
+    my @target_channels;
+    my $log_counter = 0;
+    my $has_next_page = false;
+
+    my @unread_channels =
+      grep { @{ $c->{irc_heap}->{channel_recent}->{$_} || [] } }
+      keys %{ $c->{irc_heap}->{channel_recent} };
+
+    DEBUG "SCALAR " . scalar @unread_channels;
+
+    for my $channel (@unread_channels) {
+        push @target_channels, $channel;
+        $log_counter += scalar @{ $c->{irc_heap}->{channel_recent}->{$channel} };
+
+        if ($log_counter >= $c->{config}->{httpd}->{recent_log_per_page}) {
+            $has_next_page = true;
+            last;
+        }
+    }
+
     my $out = render(
         $c,
         'recent' => {
+            target_channels => \@target_channels,
+            has_next_page   => $has_next_page,
         },
     );
 
     # reset counter.
-    for my $canon_channel ( sort keys %{ $c->{irc_heap}->{channel_name} } ) {
+    for my $canon_channel ( @target_channels ) {
         $c->{irc_heap}->{unread_lines}->{$canon_channel}   = 0;
         $c->{irc_heap}->{channel_recent}->{$canon_channel} = [];
@@ -200 +222 @@
         title                => $c->{config}->{httpd}->{title},
         version              => $Mobirc::VERSION,
+        now                  => time(),
 
         %{ $c->{irc_heap} },

lang/perl/mobirc/trunk/mobirc/lib/Mobirc/HTTPD/Router.pm

@@ -17 +17 @@
         return 'topics';
     }
-    elsif ( $uri eq '/recent' ) {
+    elsif ( $uri =~ m{^/recent(?:\?t=\d+)?$} ) {
         return 'recent';
     }