[mb-commits] r9928 - mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller
root at musicbrainz.org
root at musicbrainz.org
Tue Jul 1 17:02:14 UTC 2008
Author: acid2
Date: 2008-07-01 17:02:14 +0000 (Tue, 01 Jul 2008)
New Revision: 9928
Modified:
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Release.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Root.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Url.pm
Log:
Per luks request moved use statements to header. Also fixed blog
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm 2008-07-01 00:45:57 UTC (rev 9927)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm 2008-07-01 17:02:14 UTC (rev 9928)
@@ -4,6 +4,16 @@
use warnings;
use parent 'Catalyst::Controller';
+use Encode qw( decode );
+use ModDefs;
+use MusicBrainz::Server::Artist;
+use MusicBrainz::Server::Link;
+use MusicBrainz::Server::Release;
+use MusicBrainz::Server::Tag;
+use MusicBrainz::Server::URL;
+use MusicBrainz::Server::Validation;
+use MusicBrainz;
+
=head1 NAME
MusicBrainz::Server::Controller::Artist - Catalyst Controller for working with Artist entities
@@ -54,10 +64,6 @@
{
my ($self, $c, $mbid) = @_;
- use MusicBrainz;
- use MusicBrainz::Server::Artist;
- use MusicBrainz::Server::Validation;
-
$c->error("Not a valid GUID") unless MusicBrainz::Server::Validation::IsGUID($mbid);
my $mb = new MusicBrainz;
@@ -88,15 +94,6 @@
{
my ($self, $c, $mbid) = @_;
- use Encode qw( decode );
- use MusicBrainz::Server::Artist;
- use MusicBrainz::Server::Link;
- use MusicBrainz::Server::Release;
- use MusicBrainz::Server::Tag;
- use MusicBrainz::Server::Validation;
- use MusicBrainz;
- use ModDefs;
-
# Validate the MBID
$c->error("Not a valid GUID") unless MusicBrainz::Server::Validation::IsGUID($mbid);
@@ -142,13 +139,11 @@
}
elsif ($ar->{link1_type} eq 'album')
{
- use MusicBrainz::Server::Controller::Release;
$entity = MusicBrainz::Server::Controller::Release::releaseLinkRaw($ar->{link1_name},
$ar->{link1_mbid});
}
elsif ($ar->{link1_type} eq 'url')
{
- use MusicBrainz::Server::Controller::Url;
$entity = MusicBrainz::Server::Controller::Url::urlLinkRaw($ar->{link1_name},
$ar->{link1_mbid});
}
@@ -292,8 +287,6 @@
sub LoadArtistReleases
{
- use MusicBrainz::Server::Artist;
-
my $artist = shift;
my @releases = $artist->GetReleases(1, 1);
@@ -349,8 +342,6 @@
sub CheckAttributes
{
- use MusicBrainz::Server::Release;
-
my ($a) = @_;
for my $attr ($a->GetAttributes)
@@ -382,8 +373,6 @@
sub SortAlbums
{
- use MusicBrainz::Server::Release;
-
# I edited these out of one huge "or"ed conditional as it was a bitch to debug
my @predicates = (
($a->{_is_va_} <=> $b->{_is_va_}),
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Release.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Release.pm 2008-07-01 00:45:57 UTC (rev 9927)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Release.pm 2008-07-01 17:02:14 UTC (rev 9928)
@@ -4,6 +4,9 @@
use warnings;
use parent 'Catalyst::Controller';
+use MusicBrainz::Server::Release;
+use MusicBrainz;
+
=head1 NAME
MusicBrainz::Server::Controller::Release - Catalyst Controller for working with Release entities
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Root.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Root.pm 2008-07-01 00:45:57 UTC (rev 9927)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Root.pm 2008-07-01 17:02:14 UTC (rev 9928)
@@ -3,6 +3,8 @@
use strict;
use warnings;
use base 'Catalyst::Controller';
+use MusicBrainz::Server::Replication ':replication_type';
+use MusicBrainz::Server::NewsFeed;
# Import MusicBrainz libraries
use DBDefs;
@@ -14,36 +16,36 @@
__PACKAGE__->config->{namespace} = '';
=head1 NAME
+
musicbrainz::Controller::Root - Root Controller for musicbrainz
=head1 DESCRIPTION
+
This controller handles application wide logic for the MusicBrainz website.
=head1 METHODS
-=cut
=head2 index
+
Render the standard MusicBrainz welcome page, which is mainly static, other than the blog feed.
+
=cut
sub index : Path Args(0)
{
- use MusicBrainz::Server::Replication ':replication_type';
- require MusicBrainz::Server::NewsFeed;
-
my ($self, $c) = @_;
$c->stash->{server_details} = {
- is_slave_db => &DBDefs::REPLICATION_TYPE == RT_SLAVE,
- staging_server => &DBDefs::DB_STAGING_SERVER,
+ is_slave_db => &DBDefs::REPLICATION_TYPE == RT_SLAVE,
+ staging_server => &DBDefs::DB_STAGING_SERVER,
};
# Load the blog for the sidebar
#
my $feed = MusicBrainz::Server::NewsFeed->new(
- url => 'http://blog.musicbrainz.org/index-excerpt.xml',
- update_interval => 5 * 60,
- max_items => 3);
+ url => 'http://blog.musicbrainz.org/?feed=rss2',
+ update_interval => 5 * 60,
+ max_items => 3);
$feed->Load() if defined $feed;
@@ -52,48 +54,57 @@
my $item = undef;
$c->stash->{blog} = [];
- foreach $item ($feed->GetItems()) {
- push @{ $c->stash->{blog} }, {
- title => $item->GetTitle(),
- description => $item->GetDescription(),
- date_time => $item->GetDateTimeString(),
- link => $item->GetLink(),
- };
+ foreach $item ($feed->GetItems())
+ {
+ push @{ $c->stash->{blog} }, {
+ title => $item->GetTitle,
+ description => $item->GetDescription,
+ date_time => $item->GetDateTimeString,
+ link => $item->GetLink,
+ };
}
$c->stash->{template} = 'main/index.tt';
}
=head2 default
+
Handle any pages not matched by a specific controller path. In our case, this means serving a 404 error page.
+
=cut
sub default : Path
{
my ($self, $c) = @_;
- $c->response->body( 'Page not found' );
+ $c->response->body('Page not found');
$c->response->status(404);
}
=head2 end
+
Attempt to render a view, if needed. This will also set up some global variables in the
context containing important information about the server used on the majority of templates,
and also the current user.
+
=cut
-sub end : ActionClass('RenderView') {
+sub end : ActionClass('RenderView')
+{
my ($self, $c) = @_;
$c->stash->{server_details}->{version} = &DBDefs::VERSION;
$c->stash->{logged_in} = defined $c->session->{user}{name};
- $c->stash->{user}->{name} = $c->session->{user}->{name} if $c->stash->{logged_in};
+ $c->stash->{user}->{name} = $c->session->{user}->{name}
+ if $c->stash->{logged_in};
}
=head1 AUTHOR
+
Oliver Charles <oliver.g.charles at googlemail.com>
=head1 LICENSE
+
This library is free software, you can redistribute it and/or modify
it under the same terms as Perl itself.
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Url.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Url.pm 2008-07-01 00:45:57 UTC (rev 9927)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Url.pm 2008-07-01 17:02:14 UTC (rev 9928)
@@ -4,6 +4,9 @@
use warnings;
use parent 'Catalyst::Controller';
+use MusicBrainz::Server::URL;
+use MusicBrainz;
+
=head1 NAME
MusicBrainz::Server::Controller::Url - Catalyst Controller for working with Url entities
More information about the MusicBrainz-commits
mailing list