--- trunk/lib/Frey/Server.pm	2008/11/15 16:29:26	346
+++ trunk/lib/Frey/Server.pm	2008/11/18 23:57:56	429
@@ -12,6 +12,7 @@
 #use Carp::REPL; ## XXX it would be nice, but it breaks error reporting too much
 use Frey::ClassLoader;
 use Frey::Run;
+use Frey::Editor;
 
 my @messages;    # Global (shared) list of messages
 my $got_message; # Flag to indicate that there is a new message to display
@@ -42,7 +43,7 @@
 		cookie_session => 'sid',
 		callback => \&main,
 		debug_level => 2,
-		staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?|xml|json|ya?ml)(\?.*)?$/ },
+		staticp => sub { $_[0]->url =~ m/^(static|var).*\.(jpg|jpeg|gif|png|css|ico|js|html?|xml|json|ya?ml)(\?.*)?$/ },
 	);
 	$Module::Reload::Debug = 1; # auto if debug_level > 1
 	Frey::ClassLoader->new->load_all_classes();
@@ -60,27 +61,38 @@
 	my ($req) = @_;
 
 	my $path = $req->request->url->path;
-	#warn "REQUEST: $path ",dump( $req->params );
 
-	Module::Reload->check if $path =~ m!reload! || $req->param('reload');
+	eval {
 
-#	warn $req->request->header('User_Agent');
+		#warn "REQUEST: $path ",dump( $req->params );
 
-	my %params = $req->params;
-	my $html;
+		if ( $path =~ m!reload! || $req->param('reload') ) {
+			warn "# reload!";
+			Module::Reload->check;
+			Frey::Server->new->load_config;
+		}
 
-	sub rest2class {
-		my $class = shift;
-		$class =~ s/-/::/; # sigh!
-		return $class;
-	}
+#		warn $req->request->header('User_Agent');
 
+		my %params = $req->params;
+		my $html;
+
+		sub rest2class {
+			my $class = shift;
+			$class =~ s/-/::/; # sigh!
+			return $class;
+		}
 
-	eval {
 
 		my $f;
 
 		my $run_regexp = join('|', Frey::Run->runnable );
+		my $editor = Frey::Editor->new;
+
+		# shared run params
+		my $run = {
+			request_url => $req->request->url,
+		};
 
 		if (
 			$path =~ m{/Frey[:-]+ObjectBrowser}
@@ -92,29 +104,25 @@
 		) {
 			$f = Frey::ObjectDesigner->new( fey_class => $params{class} );
 			$f->request( $req );
-		} elsif (
-			$path =~ m{/editor(.+?)\+(\d+)}
-		) {
-			my $editor = $ENV{VISUAL} || $ENV{EDITOR} || 'vi';
-			my $cmd = "$editor -R +$2 $1";
-			warn "# $path -> system $cmd";
-			$req->print( $cmd );
-			system( $cmd );
+		} elsif ( $path =~ $editor->url_regex ) {
+			$req->print( $editor->command( $path ) );
+			system( $editor->command( $path ) );
 			return;
 		} elsif (
-			$path =~ m{/([^/]+)/($run_regexp)}
+			$path =~ m{/([^/]+)/($run_regexp)/?([^/]+)?}
 		) {
 			my $class = rest2class $1;
-			warn "# run $class $2\n";
-			$f = Frey::Run->new( class => $class, params => \%params );
+			warn "# run $path -> $class $2";
+			$run->{format} = $3 if $3;
+			$f = Frey::Run->new( class => $class, params => \%params, run => $2, %$run );
 		} elsif (
 			$path =~ m{/([^/]+)/?$}
 		) {
 			my $class = rest2class $1;
 			warn "# introspect $class";
-			$f = Frey::Run->new( class => 'Frey::Introspect', params => { class => $class } );
+			$f = Frey::Run->new( class => 'Frey::Introspect', params => { class => $class }, %$run );
 		} else {
-			$f = Frey::Run->new( class => 'Frey::ClassBrowser' );
+			$f = Frey::Run->new( class => 'Frey::ClassBrowser', %$run );
 		}
 
 		if ( $f ) {
@@ -125,14 +133,11 @@
 
 	};
 
-	my $self = $req;
-
 	if ( $@ ) {
 		warn $@;
 		$req->conn->send_error( 404 );	# FIXME this should probably be 500, but we can't ship page with it
-		$req->print( qq{<pre class="error">$@<pre>} );
+		$req->print( qq{<pre class="frey-error">$@<pre>} );
 #		Carp::REPL::repl;
-
 	}
 
 	# If this is a request for the pushtream, then give them that