Changeset 407

Timestamp:

02/09/08 02:53:35 (2 years ago)

Author:

eevee

Message:

Added Bulbanews feed to the front page. (#178)

Location:

veekun/trunk

Files:

• README.pod (modified) (2 diffs)
• lib/Vee.pm (modified) (3 diffs)
• lib/Vee/Controller/Index.pm (modified) (1 diff)
• lib/Vee/Controller/Root.pm (modified) (3 diffs)
• lib/Vee/View/TT.pm (modified) (5 diffs)
• site_options.yml (modified) (2 diffs)
• templates/index.tt (modified) (2 diffs)
• templates/style/index.tt (modified) (1 diff)

veekun/trunk/README.pod

@@ -28 +28 @@
     Catalyst::Plugin::Session::State::Cookie
     Catalyst::Plugin::Session::Store::DBIC
+    Catalyst::Plugin::Unicode
     DBIx::Class
     DBIx::Class::QueryLog
@@ -38 +39 @@
     String::Approx
     Template
+    XML::Feed
     YAML
 

veekun/trunk/lib/Vee.pm

@@ -11 +11 @@
     -Debug
     StackTrace
-    Static::Simple 
+    Static::Simple
     
     ConfigLoader
+    Unicode
     
     Authentication
@@ -67 +68 @@
 {
     # WARNING: HERE BE DRAGONS, AND BY DRAGONS I MEAN HACKS
-    # TODO: WHAT THE FUCK CLEAN THIS GARBAGE UP WITH PLUGINS OR SOMETHING
-
-    no strict 'refs';
+    no warnings 'redefine';
 
     # I find myself doing this a lot and it's a bit cumbersome
-    *{'DBIx::Class::ResultSet::is_empty'} = sub {
+    *DBIx::Class::ResultSet::is_empty = sub {
         my ($self) = @_;
         my $first = $self->first;
@@ -82 +81 @@
     # conditions with critical code like this.
     # CAVEAT EMPTOR: may break if you upgrade
-    *{'DBIx::Class::ResultSet::find_or_create'} = sub {
+    *DBIx::Class::ResultSet::find_or_create = sub {
         my $self     = shift;
         my $attrs    = (@_ > 1 && ref $_[$#_] eq 'HASH' ? pop(@_) : {});

veekun/trunk/lib/Vee/Controller/Index.pm

@@ -70 +70 @@
         $s->{is_unread} = sub { $unread_hash{$_[0]->id} };
     }
-        
-    # check for latest subversion revision every 15 minutes or so
-    if (not $c->cache->{svn} or $c->cache->{svn}{last_checked} < time - 15 * 60) {
-        eval {
-            open my $svn_fh, '-|', 'svn', 'log', '--limit' => 1, '--incremental', $c->site_opts->{svn_url};
-            my (undef, $details, undef, @log) = <$svn_fh>;
-            close $svn_fh;
-            my ($rev, $user, $time, undef) = split / \| /, $details;
-            $rev =~ s/^r//;
-            my ($yr, $mo, $day, $hr, $min, $sec, $tz) = split /[- :]/, $time, 7;
-
-            $c->cache->{svn} = {
-                revision     => $rev,
-                user         => $user,
-                time         => new DateTime(
-                    year   => $yr,
-                    month  => $mo,
-                    day    => $day,
-                    hour   => $hr,
-                    minute => $min,
-                    second => $sec,
-                    time_zone => substr $tz, 0, 5,
-                ),
-                last_checked => time,
-                log          => join '', @log,
-            }
-        };
-    }
-
-    $s->{recent_revision} = $c->cache->{svn};
 
     $s->{recent_users} = $c->model('DBIC::Users')->search(
         { time_active => { '>', time - $c->site_opts->{user_activity_timeout} } },
         { order_by => 'me.time_active DESC' }
-    );    
+    );
 
     my $shoutbox_form = Vee::Form->new(

veekun/trunk/lib/Vee/Controller/Root.pm

@@ -5 +5 @@
 use base 'Catalyst::Controller';
 
-use Time::HiRes;
 use Data::Dumper;
 use DBIx::Class::QueryLog;
 use File::Path;
+use Time::HiRes;
+use URI;
+use XML::Feed;
+
 use Vee::Authorization;
 use Vee::Utils;
@@ -54 +57 @@
         $s->{$_} = $c->flash->{$_} for qw/error_msg info_msg success_msg/;
     }
+
+    $self->_do_periodic_tasks($c);
         
     return 1;
@@ -233 +238 @@
 }
 
+=head2 _do_periodic_tasks
+
+Performs various actions if they haven't been done for some amount of time.
+
+Regular method!  Not an action.
+
+=cut
+
+sub _do_periodic_tasks
+{
+    my ($self, $c) = @_;
+
+    if ($c->{cache}{_last_performed} and
+        $c->{cache}{_last_performed} > time - 15 * 60)
+    {
+        next;
+    }
+
+    # Last subversion commit
+eval {
+    open my $svn_fh, '-|', 'svn', 'log', '--limit' => 1, '--incremental', $c->site_opts->{svn_url};
+    my (undef, $details, undef, @log) = <$svn_fh>;
+    close $svn_fh;
+    my ($rev, $user, $time, undef) = split / \| /, $details;
+    $rev =~ s/^r//;
+    my ($yr, $mo, $day, $hr, $min, $sec, $tz) = split /[- :]/, $time, 7;
+
+    $c->cache->{svn} = {
+        revision     => $rev,
+        user         => $user,
+        time         => new DateTime(
+            year   => $yr,
+            month  => $mo,
+            day    => $day,
+            hour   => $hr,
+            minute => $min,
+            second => $sec,
+            time_zone => substr $tz, 0, 5,
+        ),
+        log          => join '', @log,
+    };
+};
+
+    # Refresh Bulbapedia feeds
+eval {
+    Vee::Utils::timed_exec( 5 => sub {
+        my $uri = URI->new($c->site_opts->{rss_url});
+        my @entries = XML::Feed->parse($uri)->entries;
+        @entries = grep { defined }
+            @entries[ 0 .. $c->site_opts->{page_sizes}{index}{rss} - 1 ];
+        $c->cache->{rss_entries} = \@entries;
+    } );
+};
+
+    $c->cache->{_last_performed} = time;
+}
+
 =head1 AUTHOR
 

veekun/trunk/lib/Vee/View/TT.pm

@@ -4 +4 @@
 use base 'Catalyst::View::TT';
 
-use Vee::Utils;
-use Time::HiRes;
+use DateTime;
 use File::Temp qw/tempdir/;
 use Template::Namespace::Constants;
 use Template::Stash;
+use Time::HiRes;
+
+use Vee::Utils;
 
 if (Vee->debug) {
@@ -45 +47 @@
         postbar_color => sub { Vee::Utils::hsv2rgb(shift, 84, 192) },
 
+        format_time => \&format_time,
+
             # forum stuff...
     #                allowed_postedit    => sub { return !$self->test_postedit(@_) },
@@ -61 +65 @@
         bbcode      => \&Vee::BBCode::apply_bbcode,
         timespan    => \&_format_timespan,
-        date        => \&_format_date,  # later this may have to change to use user's date prefs
+        date        => \&format_time,  # later this may have to change to use user's date prefs
         email       => \&_obfuscate_email,
     #                wordcap         => \&Vee::wordcap,
@@ -92 +96 @@
 }
 
-=head2 _format_date
+=head2 format_time
 
 Returns a pretty-printed version of the given UNIX-style timestamp.
@@ -99 +103 @@
 
 # TODO: add options for this
-sub _format_date {
-    my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime(shift);
-    return sprintf "%02d/%02d/%02d %02d:%02d", $mon+1, $mday, substr($year, -2), $hour, $min;
+sub format_time {
+    my ($time) = @_;
+    if (not ref $time) {
+        $time = DateTime->from_epoch( epoch => $time, time_zone => 'floating' );
+    }
+
+    return $time->strftime('%D %R');
 }
 

veekun/trunk/site_options.yml

@@ -78 +78 @@
         forum: 20
         users: 25
+        rss: 3
     posts: 20
     posts_preview: 3
@@ -103 +104 @@
 # Note that at the moment this *requires* anon access!
 svn_url: svn://veekun.com/veekun
+
+# URL for RSS feed on the front page and the site behind it
+rss_url: http://bulbanews.bulbagarden.net/feed/news.rss
+rss_site_url: http://bulbanews.bulbagarden.net/
 
 # Number of posts => rank you get

veekun/trunk/templates/index.tt

@@ -28 +28 @@
 <div id="leftcol">
     <div class="front-box">
+        <a href="[% c.site_opts.rss_site_url %]" class="heading"><img src="/images/icons/index/news.png" alt="" class="icon"/> Pok&eacute;mon News</a>
+[% FOR feed_entry IN c.cache.rss_entries %]
+        <div class="front-feedentry">
+            <div class="title"> <a href="[% feed_entry.link %]">[% feed_entry.title %]</a> </div>
+            <div class="time"> [% format_time(feed_entry.issued) %] </div>
+            <p class="summary"> [% feed_entry.content.body | nohtml %] </p>
+        </div>
+[% END %]
+[% IF NOT c.cache.rss_entries %]
+        <p> No Pok&eacute;mon news. </p>
+[% END %]
+    </div>
+    <div class="front-box">
         <a href="/forum/[% c.site_opts.special_forums.news %]" class="heading"><img src="/images/icons/index/news.png" alt="" class="icon"/> News</a>
 [% WHILE (t = recent_news.next) %]
         <div class="front-newspost">
+            <div class="time">[% format_time(t.first_post.time) %]</div>
             <a href="/users/[% t.first_post.user_id %]" class="icon">[% IF t.first_post.user.news_pic %]<img src="/images/news/[% t.first_post.user.news_pic %]" alt="[% t.first_post.user.name %]" title="[% t.first_post.user.name %]"/>[% ELSE; t.first_post.user.name; END %]</a>
-            <div class="date">[% format_date(t.first_post.time) %]</div>
             <div class="title">[% t.subject %]</div>
             <div class="body">[% t.first_post.content | bbcode %]</div>
@@ -113 +126 @@
 [% END %]
     </div>
-    <div class="front-box">
-        <a href="/forum/" class="heading"><img src="/images/icons/index/news.png" alt="" class="icon"/> Pok&eacute;mon News</a>
-        <p> hold yer horses </p>
-    </div>
-[% IF recent_revision %]
+[% IF c.svn %]
     <div class="front-box">
         <a href="http://trac.veekun.com/browser/veekun/trunk" class="heading"><img src="/images/icons/index/svn.png" alt="" class="icon"/>Subversion</a>
-        <p class="svncommit-revision"> <em>Last Subversion commit:</em> <a href="http://trac.veekun.com/changeset/[% recent_revision.revision.replace('r','') %]">[% recent_revision.revision %]</a> </p>
-        <p class="svncommit-log">[% recent_revision.log | nohtml %]</p>
-        <p class="svncommit-stamp">by [% recent_revision.user %] on [% recent_revision.time %]</p>
+        <p class="svncommit-revision"> <em>Last Subversion commit:</em> <a href="http://trac.veekun.com/changeset/[% c.svn.revision.replace('r','') %]">[% c.svn.revision %]</a> </p>
+        <p class="svncommit-log">[% c.svn.log | nohtml %]</p>
+        <p class="svncommit-stamp">by [% c.svn.user %] on [% format_time(c.svn.time) %]</p>
     </div>
 [% END %]

veekun/trunk/templates/style/index.tt

@@ -18 +18 @@
   .front-forum a { display: block; }
 
+.front-feedentry { padding: 3px; clear: right; }
+.front-feedentry + .front-feedentry { border-top: 1px dotted [% dark_separator %]; }
+  .front-feedentry .title { font-size: bigger; font-weight: bold; float: left; }
+  .front-feedentry .time { float: right; font-size: 85%; }
+  .front-feedentry .summary { margin: 0.5em; clear: both; }
+
 .front-newspost { padding: 3px; clear: right; }
 .front-newspost + .front-newspost { border-top: 1px dotted [% dark_separator %]; }
-  .front-newspost .icon { float: right; padding: 3px 3px 0 0; }
-  .front-newspost .date { float: right; font-size: 85%; }
+  .front-newspost .time { float: right; font-size: 85%; }
+  .front-newspost .icon { float: right; clear: right; padding: 3px 3px 0 0; }
   .front-newspost .title { color: [% header_text %]; font-size: bigger; font-weight: bold; }
   .front-newspost .body { margin: 0.5em; }