Replaced FREE_PASCAL_RTE by a generic EXIT_CODE_HOOK.

[moe.git] / submit / MO / Submit.pm

diff --git a/submit/MO/Submit.pm b/submit/MO/Submit.pm
index 3491d81c7f1cea4c88aa701e4bc1ce99d8098d77..ba55961f7eff6dd3c56253541bf787e890196948 100644 (file)
--- a/submit/MO/Submit.pm
+++ b/submit/MO/Submit.pm
@@ -9,19 +9,29 @@ use warnings;
 use IO::Socket::INET;
 use IO::Socket::SSL; # qw(debug3);
 use Sherlock::Object;
+use POSIX;
 
 sub new($) {
+       my $user = $ENV{"USER"} or die "Environment variable USER not set\n";
+       my $home = $ENV{"HOME"} or die "Environment variable HOME not set\n";
+       my $mo = "$home/.mo";
+       my $root = $ENV{"MO_ROOT"} or die "Environment variable MO_ROOT not set\n";
        my $self = {
-               "Server" => "localhost:8888",
-               "Key" => "client-key.pem",
-               "Cert" => "client-cert.pem",
-               "CACert" => "ca-cert.pem",
-               "Trace" => 0,
-               "user" => "testuser",
+               "Contest" => "CEOI 2007",
+               "Server" => "ceoi-gamma:8888",
+               "Key" => "$mo/key.pem",         # Keys and certificates
+               "Cert" => "$mo/cert.pem",
+               "CACert" => "$mo/ca-cert.pem",
+               "Trace" => defined $ENV{"MO_SUBMIT_TRACE"},
+               "Checks" => 1,                  # Run `check' before submitting
+               "AllowOverride" => 1,           # Allow overriding a failed check
+               "History" => "$home/.history",  # Keep submission history in this directory
+               "RefreshTimer" => 60000,        # How often GUI sends STATUS commands [ms]
+               "root" => $root,
+               "user" => $user,
                "sk" => undef,
                "error" => undef,
        };
-       # FIXME: Read config file
        return bless $self;
 }
 
@@ -32,7 +42,7 @@ sub DESTROY($) {
 
 sub log($$) {
        my ($self, $msg) = @_;
-       print STDERR "LOG: $msg\n" if $self->{"Trace"};
+       print STDERR "SUBMIT: $msg\n" if $self->{"Trace"};
 }
 
 sub err($$) {
@@ -59,6 +69,7 @@ sub disconnect($) {
 sub connect($) {
        my $self = shift @_;
        $self->disconnect;
+
        $self->log("Connecting to submit server");
        my $sk = new IO::Socket::INET(
                PeerAddr => $self->{"Server"},
@@ -86,9 +97,9 @@ sub connect($) {
                        $sk,
                        SSL_version => 'TLSv1',
                        SSL_use_cert => 1,
-                       SSL_key_file => "client-key.pem",
-                       SSL_cert_file => "client-cert.pem",
-                       SSL_ca_file => "ca-cert.pem",
+                       SSL_key_file => $self->{"Key"},
+                       SSL_cert_file => $self->{"Cert"},
+                       SSL_ca_file => $self->{"CACert"},
                        SSL_verify_mode => 3,
                );
                if (!defined $sk) {
@@ -97,6 +108,7 @@ sub connect($) {
                }
        }
        $self->{"sk"} = $sk;
+       $sk->autoflush(0);
 
        $self->log("Logging in");
        my $req = new Sherlock::Object("U" => $self->{"user"});
@@ -114,12 +126,14 @@ sub connect($) {
 sub request($$) {
        my ($self, $obj) = @_;
        my $sk = $self->{"sk"};
-       $obj->write($sk);       ### FIXME: Flushing
+       local $SIG{'PIPE'} = 'ignore';
+       $obj->write($sk);
+       print $sk "\n";
+       $sk->flush();
        if ($sk->error) {
                $self->err("Connection broken");
                return undef;
        }
-       print $sk "\n";
        return $self->reply;
 }
 
@@ -138,6 +152,7 @@ sub reply($) {
 sub send_file($$$) {
        my ($self, $fh, $size) = @_;
        my $sk = $self->{"sk"};
+       local $SIG{'PIPE'} = 'ignore';
        while ($size) {
                my $l = ($size < 4096 ? $size : 4096);
                my $buf = "";
@@ -155,4 +170,17 @@ sub send_file($$$) {
        return $self->reply;
 }
 
+sub write_history($$$$$) {
+       my ($self, $task, $part, $ext, $filename) = @_;
+       my $hist = $self->{"History"};
+       -d $hist or mkdir $hist or return "Unable to create $hist: $!";
+       my $now = POSIX::strftime("%H:%M:%S", localtime(time));
+       my $maybe_part = ($part eq $task) ? "" : ":$part";
+       my $name = "$hist/$now-$task$maybe_part.$ext";
+       $self->log("Backing up to $name");
+       `cp "$filename" "$name"`;
+       return "Unable to back up $filename as $name" if $?;
+       return undef;
+}
+
 1;