--- trunk/lib/Frey/Server.pm 2008/06/29 16:24:41 23 +++ trunk/lib/Frey/Server.pm 2008/06/30 07:06:11 34 @@ -8,15 +8,14 @@ use Data::Dump qw/dump/; use base 'Frey'; - use Frey::HTML; my @messages; # Global (shared) list of messages my $got_message; # Flag to indicate that there is a new message to display use vars qw( $repl $server ); -$repl = Continuity::REPL->new; +#$repl = Continuity::REPL->new; $server = Continuity->new( port => 16001, path_session => 1, @@ -24,8 +23,28 @@ callback => \&main, ); $server->debug_level( 2 ); +sub run { + + $server->loop; +} + +my @callbacks; +my $callback_count; + +sub gen_link { + my ($text, $code) = @_; + $callbacks[$callback_count++] = $code; + return qq{$text}; +} -$server->loop; +sub process_links { + my $request = shift; + my $cb = $request->param('cb'); + if (exists $callbacks[$cb]) { + $callbacks[$cb]->($request); + delete $callbacks[$cb]; + } +} # This is the main entrypoint. We are looking for one of three things -- a # pushstream, a sent message, or a request for the main HTML. We delegate each @@ -99,25 +118,31 @@ warn "param = ",dump($req->param); my $path = $req->request->url->path; + my $html; + if ( $path =~ m/::/ ) { my ( undef, $module, $method ) = split(m!/!, $path, 3); if ( ! defined( $templates->{$module} ) ) { $req->conn->send_status_line( 404, "$module" ); - $req->print("Package $module not found"); + $html = "Package $module not found"; + } elsif ( ! $method ) { + $html = Frey::HTML->page( 'package-methods', $req, $module ); } elsif ( grep(/^\Q$method\E$/, @{ $templates->{$module} }) ) { - $req->print( Frey::HTML->page( $method, $req ) ); + $html = Frey::HTML->page( $method, $req ); } else { $req->conn->send_status_line( 404, "$module $method" ); - $req->print("Package $module doesn't have $method"); + $html = "Package $module doesn't have $method"; } } else { - my $html = Frey::HTML->page( 'status' ); - $req->print( $html ); - warn ">> ",length( $html ), " bytes\n"; + warn "fallback to status page\n"; + $html = Frey::HTML->page( 'status' ); } + + $req->print( $html ); + warn ">> ",length( $html ), " bytes\n"; $req->next; - Module::Refresh->refresh; } } +1;