X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=submit%2Fcontest;h=7d5445663a099bcfd3d0ccc0dbf7d8b1c6170935;hb=58850660666010fcd997bdcc96ad47bebcc2665d;hp=640ca15a6d9df40ee820bc9f9b82902d7a66f5f5;hpb=dea3b41a87ab1e3010f19fefa7935664d8458af5;p=eval.git
diff --git a/submit/contest b/submit/contest
index 640ca15..7d54456 100755
--- a/submit/contest
+++ b/submit/contest
@@ -8,12 +8,14 @@ use warnings;
BEGIN {
defined $ENV{"MO_ROOT"} or die "Please set MO_ROOT to the contest root directory first.\n";
}
-use lib $ENV{"MO_ROOT"} . "/submit";
+use lib $ENV{"MO_ROOT"} . "/lib/perl5";
use lib $ENV{"MO_ROOT"} . "/submit/lib/perl5";
use MO::Submit;
use Sherlock::Object;
use POSIX;
+use IO::File;
+use File::stat;
use Gtk2 -init;
my $conn = new MO::Submit;
@@ -21,9 +23,12 @@ my $conn = new MO::Submit;
### GUI INITIALIZATION ###
sub init_refresh();
-sub timed_refresh();
-sub refresh($);
-sub submit();
+sub start_refresh_timer($);
+sub stop_refresh_timer();
+my $force_refresh = 0;
+sub refresh();
+
+sub submit($);
my $busy_cursor = Gtk2::Gdk::Cursor->new('watch');
@@ -40,15 +45,18 @@ $title_lab->set_markup("" . $conn->{"Contest"} . "")
# The row of buttons
my $b_submit = Gtk2::Button->new('Submit');
-$b_submit->signal_connect(clicked => \&submit);
+$b_submit->set_image(Gtk2::Image->new_from_stock('gtk-apply', 'button'));
+$b_submit->signal_connect(clicked => sub { submit(0) });
$b_submit->set_sensitive(0);
my $b_check = Gtk2::Button->new('Check');
-$b_check->signal_connect(clicked => sub { Gtk2->main_quit });
+$b_check->set_image(Gtk2::Image->new_from_stock('gtk-find', 'button'));
+$b_check->signal_connect(clicked => sub { submit(1) });
$b_check->set_sensitive(0);
my $b_refresh = Gtk2::Button->new('Refresh');
-$b_refresh->signal_connect(clicked => sub { refresh(0) });
+$b_refresh->set_image(Gtk2::Image->new_from_stock('gtk-refresh', 'button'));
+$b_refresh->signal_connect(clicked => sub { start_refresh_timer(1) });
my $button_box = Gtk2::HBox->new;
$button_box->pack_start_defaults($b_submit);
@@ -109,8 +117,12 @@ $window->show_all;
my $last_status_id;
-sub status($) {
+sub msg($) {
print "GUI: ", $_[0], "\n" if $conn->{"Trace"};
+}
+
+sub status($) {
+ msg($_[0]);
defined $last_status_id and $status_bar->remove($bar_ctx, $last_status_id);
$last_status_id = $status_bar->push($bar_ctx, shift @_);
}
@@ -131,18 +143,35 @@ my $window_inited = 0;
sub init_refresh()
{
if (!$window_inited) {
- refresh(1);
+ $force_refresh = 1;
+ start_refresh_timer(1);
$window_inited = 1;
}
return 1;
}
+my $refresh_timer_id;
+
sub timed_refresh()
{
- refresh(0); # FIXME: If-modified-since version?
+ refresh();
return 1; # We wish to re-run the timer
}
+sub start_refresh_timer($) {
+ my ($go) = @_;
+ stop_refresh_timer();
+ refresh() if $go;
+ $refresh_timer_id = Glib::Timeout->add($conn->{"RefreshTimer"}, \&timed_refresh);
+}
+
+sub stop_refresh_timer() {
+ if (defined $refresh_timer_id) {
+ Glib::Source->remove($refresh_timer_id);
+ $refresh_timer_id = undef;
+ }
+}
+
my $task_status_object;
my @task_parts = ();
my @task_stat = ();
@@ -201,10 +230,9 @@ sub recalc_task_list() {
@task_stat = @new_stat;
}
-sub refresh($)
+sub refresh()
{
- my $force = shift @_;
- if (!$conn->is_connected || $force) {
+ if (!$conn->is_connected || $force_refresh) {
busy("Connecting to server...");
if ($conn->connect) {
ready("Connected successfully");
@@ -223,13 +251,15 @@ sub refresh($)
} else {
$task_status_object = $r;
recalc_task_list;
+ $force_refresh = 0;
ready("Ready");
}
}
- if (!$conn->is_connected && !$force) {
+ if (!$conn->is_connected && !$force_refresh) {
# Retry
$conn->log("Retrying");
- refresh(1);
+ $force_refresh = 1;
+ refresh();
}
}
@@ -241,29 +271,36 @@ my $subwin_vbox;
my $subwin_label;
my $bbutton_box;
my $submitting_label;
+my $text_frame;
my $status_label;
+my $check_only;
my $submit_filename;
+my $submit_extension;
+my %submit_fn_cache = ();
sub end_submit($) {
my ($close) = @_;
$subwin->destroy if $close;
- ### FIXME: ... and refresh status
+ start_refresh_timer(1);
}
sub finish_submit() {
- my $button = Gtk2::Button->new('Return');
+ my $button = Gtk2::Button->new_from_stock('gtk-close');
$button->signal_connect(clicked => sub { end_submit(1) });
$bbutton_box = Gtk2::HButtonBox->new;
$bbutton_box->pack_start_defaults($button);
$subwin_vbox->pack_start($bbutton_box, 0, 0, 10);
+ ready("Ready");
$subwin->show_all;
+ $subwin->window->set_cursor(undef);
}
sub submit_ok() {
$status_label->set_markup("Submitted OK");
$submitting_label->set_markup("The task has been successfully submitted.");
+ refresh();
finish_submit();
}
@@ -275,15 +312,102 @@ sub submit_failed($) {
}
sub run_submit() {
- sleep 1;
- submit_failed("Xyzzy");
- #submit_ok();
+ my ($task, $part) = split /\//, $selected_task;
+ defined $part or $part = $task;
+
+ if (defined $conn->{"History"}) {
+ busy("Submitting locally to " . $conn->{"History"});
+ my $err = $conn->write_history($task, $part, $submit_extension, $submit_filename);
+ if (defined $err) {
+ submit_failed("Recording to local history failed\n($err)");
+ return;
+ }
+ }
+
+ if ($conn->is_connected) {
+ busy("Checking server status...");
+ my $r = new Sherlock::Object("!" => "NOP");
+ $r = $conn->request($r);
+ }
+ if (!$conn->is_connected) {
+ busy("Reconnecting to server...");
+ if (!$conn->connect) {
+ ready($conn->{"error"});
+ submit_failed("Unable to connect to the server");
+ return;
+ }
+ }
+ busy("Submitting...");
+
+ my $fh = new IO::File($submit_filename);
+ if (!$fh) {
+ submit_failed("Unable to open $submit_filename\n($!)");
+ return;
+ }
+ my $stat = File::stat::populate($fh->stat);
+ if (!$stat) {
+ submit_failed("Unable to stat $submit_filename\n($!)");
+ return;
+ }
+ my $size = $stat->size;
+
+ my $r = new Sherlock::Object("!" => "SUBMIT", "T" => $task, "P" => $part, "X" => $submit_extension, "S" => $size);
+ $r = $conn->request($r);
+ if (!defined($r)) {
+ submit_failed("Connection to the server lost");
+ return;
+ } elsif ($r->get("-")) {
+ submit_failed($r->get("-"));
+ return;
+ }
+
+ $r = $conn->send_file($fh, $size);
+ if (!defined($r)) {
+ submit_failed("Connection to the server lost");
+ return;
+ } elsif ($r->get("-")) {
+ submit_failed($r->get("-"));
+ return;
+ }
+
+ close $fh;
+ submit_ok();
+}
+
+sub checks_ok() {
+ if ($check_only) {
+ $status_label->set_markup("Checked successfully");
+ $submitting_label->set_markup("The task has passed the checks.");
+ finish_submit();
+ return;
+ }
+
+ $status_label->set_markup("Submitting");
+ $subwin->show_all;
+
+ # Continue when everything is displayed
+ Glib::Idle->add(sub {
+ $window->Gtk2::Gdk::flush;
+ run_submit();
+ return 0;
+ });
+}
+
+sub checks_override() {
+ $submitting_label = Gtk2::Label->new("Please wait...");
+ $subwin_vbox->pack_start_defaults($submitting_label);
+
+ $subwin->window->set_cursor($busy_cursor);
+ $bbutton_box->destroy;
+ $text_frame->destroy;
+ checks_ok();
}
sub checks_failed($) {
my ($msg) = @_;
$status_label->set_markup("Check failed");
+ $submitting_label->destroy;
my $text_buffer = Gtk2::TextBuffer->new;
$text_buffer->set_text($msg);
@@ -292,37 +416,64 @@ sub checks_failed($) {
$text_view->set_editable(0);
$text_view->set_cursor_visible(0);
- $submitting_label->destroy;
- $subwin_vbox->pack_start_defaults($text_view);
+ my $text_scroll = Gtk2::ScrolledWindow->new;
+ $text_scroll->set_policy("automatic", "automatic");
+ $text_scroll->add($text_view);
- finish_submit();
-}
+ $text_frame = Gtk2::Frame->new("Checker log");
+ $text_frame->add($text_scroll);
-sub checks_ok() {
- ### FIXME: Record to local history here
+ $subwin_vbox->pack_start_defaults($text_frame);
- $status_label->set_markup("Submitting");
- $subwin->show_all;
+ if ($check_only || !$conn->{"AllowOverride"}) {
+ finish_submit();
+ return;
+ }
- # Continue when everything is displayed
- Glib::Idle->add(sub {
- $window->Gtk2::Gdk::flush;
- run_submit();
- return 0;
- });
+ my $close_button = Gtk2::Button->new_from_stock('gtk-close');
+ $close_button->signal_connect(clicked => sub { end_submit(1) });
+
+ my $anyway_button = Gtk2::Button->new('Submit anyway');
+ $anyway_button->signal_connect(clicked => \&checks_override);
+
+ $bbutton_box = Gtk2::HButtonBox->new;
+ $bbutton_box->pack_start_defaults($anyway_button);
+ $bbutton_box->pack_start_defaults($close_button);
+ $bbutton_box->set_border_width(5);
+ $subwin_vbox->pack_start($bbutton_box, 0, 0, 10);
+
+ ready("Ready");
+ $subwin->show_all;
+ $subwin->window->set_cursor(undef);
}
sub run_checks() {
- sleep 1;
- #checks_failed("One\nTwo\nThree...\n");
- checks_ok();
+ ($submit_extension) = ($submit_filename =~ /\.([^.]+)$/);
+ if (!$submit_extension) {
+ checks_failed("The filename does not have a valid extension");
+ return;
+ }
+ if (!$conn->{"Checks"}) {
+ checks_ok();
+ return;
+ }
+ my $root = $conn->{"root"};
+ my ($task, $part) = split /\//, $selected_task;
+ defined $part or $part = "";
+ my $verdict = `$root/bin/check -s "$submit_filename" $task $part 2>&1`;
+ if ($?) {
+ checks_failed($verdict);
+ } else {
+ checks_ok();
+ }
}
sub do_submit() {
- my $submit_filename = $chooser->get_filename;
+ $submit_filename = $chooser->get_filename;
+ $submit_fn_cache{$selected_task} = $submit_filename;
+ msg "Selected $submit_filename";
defined $submit_filename or return;
-f $submit_filename or return;
- $conn->log("Selected $submit_filename for submit");
$chooser->destroy;
$bbutton_box->destroy;
@@ -332,6 +483,7 @@ sub do_submit() {
$submitting_label = Gtk2::Label->new("Please wait...");
$subwin_vbox->pack_start_defaults($submitting_label);
$subwin->show_all;
+ $subwin->window->set_cursor($busy_cursor);
# Continue when everything is displayed
Glib::Idle->add(sub {
@@ -341,8 +493,11 @@ sub do_submit() {
});
}
-sub submit() {
- ## FIXME: Stop the status timer?
+sub submit($) {
+ $check_only = shift @_;
+
+ stop_refresh_timer();
+
$subwin = Gtk2::Window->new('toplevel');
$subwin->set_default_size(640, 480);
$subwin->set_modal(1);
@@ -352,11 +507,11 @@ sub submit() {
$subwin->set_wmclass("submitter", "Submitter");
$subwin->signal_connect("delete-event" => sub { end_submit(0); return 0; });
- my $bb_submit = Gtk2::Button->new('Submit');
+ my $bb_submit = Gtk2::Button->new($check_only ? 'Check' : 'Submit');
+ $bb_submit->set_image(Gtk2::Image->new_from_stock('gtk-apply', 'button'));
$bb_submit->signal_connect(clicked => \&do_submit);
- #$bb_submit->set_sensitive(0);
- my $bb_cancel = Gtk2::Button->new('Cancel');
+ my $bb_cancel = Gtk2::Button->new_from_stock('gtk-cancel');
$bb_cancel->signal_connect(clicked => sub { end_submit(1) });
$bbutton_box = Gtk2::HButtonBox->new;
@@ -365,14 +520,15 @@ sub submit() {
$bbutton_box->set_border_width(5);
my $subwin_label = Gtk2::Label->new;
- $subwin_label->set_markup("Submitting $selected_task");
+ $subwin_label->set_markup("" . ($check_only ? "Checking" : "Submitting") . " $selected_task");
$status_label = Gtk2::Label->new;
- $status_label->set_markup("Please select file to submit");
+ $status_label->set_markup("Please select file to " . ($check_only ? "check" : "submit") . "");
$chooser = Gtk2::FileChooserWidget->new("open");
$chooser->set_local_only(1);
$chooser->signal_connect("file-activated" => \&do_submit);
+ $chooser->set_filename($submit_fn_cache{$selected_task}) if defined $submit_fn_cache{$selected_task};
$subwin_vbox = Gtk2::VBox->new;
$subwin_vbox->pack_start($subwin_label, 0, 0, 10);
@@ -386,6 +542,5 @@ sub submit() {
### MAIN ###
-Glib::Timeout->add(5000, \&timed_refresh);
Gtk2->main;
exit 0;