X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FData.pm;h=1ca79586a24580b06ed494727230176a4c91f91e;hb=7f0f55d8d78f78bdc76d6ac3089c6aa085d95be6;hp=f9162af3cfda71af69068f1cacbd69e8d727d129;hpb=cd9af27e94244e6454c3db787a8ca6811f44fc16;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index f9162af..1ca7958 100644
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -9,6 +9,7 @@ use Redis;
 
 our $contest;
 my $redis = Redis->new;
+my $pubsub = Redis->new;
 
 sub dynsub{
 	no strict 'refs';
@@ -16,8 +17,12 @@ sub dynsub{
 }
 
 BEGIN {
-	for my $cmd (qw/multi exec smembers get hget hset sadd incr hmset/) {
-		dynsub uc $cmd, sub { say $cmd;exit;$redis->$cmd(@_) };
+	for my $cmd (qw/multi exec smembers get hget hdel hset sadd srem incr hmset hsetnx publish/) {
+		dynsub uc $cmd, sub { $redis->$cmd(@_) };
+	}
+
+	for my $cmd (qw/subscribe wait_for_messages/) {
+		dynsub uc $cmd, sub { $pubsub->$cmd(@_) };
 	}
 }
 
@@ -28,12 +33,17 @@ sub rexec				()		{ EXEC }
 
 sub problems			()		{ SMEMBERS cp . 'problem' }
 sub contests			()		{ SMEMBERS cp . 'contest' }
-sub jobcard			()		{ GET cp . 'job' }
+sub users				()		{ SMEMBERS cp . 'user' }
+sub jobcard				()		{ GET cp . 'job' }
 
-sub job_results		(_)	{ decode_json HGET cp . "job.$_[0]", 'results' }
-sub set_job_results	($+)	{ HSET cp . "job.$_[0]", 'results', encode_json $_[1] }
-sub problem_meta		(_)	{ decode_json HGET cp . "pb.$_[0]", 'meta' }
-sub set_problem_meta	($+)	{ HSET cp . "pb.$_[0]", 'meta', encode_json $_[1] }
+sub job_results			(_)		{ decode_json HGET cp . "job.$_[0]", 'results' }
+sub set_job_results		($+)	{ HSET cp . "job.$_[0]", 'results', encode_json $_[1] }
+sub job_inmeta			(_)		{ decode_json HGET cp . "job.$_[0]", 'inmeta' }
+sub set_job_inmeta		($+)	{ HSET cp . "job.$_[0]", 'inmeta', encode_json $_[1] }
+sub problem_meta		(_)		{ decode_json HGET cp . "problem.$_[0]", 'meta' }
+sub set_problem_meta	($+)	{ HSET cp . "problem.$_[0]", 'meta', encode_json $_[1] }
+sub job_daemon			(_)		{ HGET cp . "job.$_[0]", 'daemon' }
+sub set_job_daemon		($$)	{ HSETNX cp . "job.$_[0]", 'daemon', $_[1] };
 
 sub defhash{
 	my ($name, @keys) = @_;
@@ -42,24 +52,40 @@ sub defhash{
 		dynsub "set_${name}_$key", sub ($$) { HSET cp . "$name.$_[0]", $key, $_[1] };
 	}
 
+	dynsub "edit_$name", sub {
+		my ($key, %values) = @_;
+		HMSET cp . "$name.$key", %values;
+	};
+
 	dynsub "insert_$name", sub {
 		my ($key, %values) = @_;
 		SADD cp . $name, $key or return;
 		HMSET cp . "$name.$key", %values;
 	};
+	dynsub "remove_$name", sub (_) {
+		my $key = shift;
+		SREM cp . $name, $key;
+	};
+
 	dynsub "push_$name", sub {
 		my $nr = INCR cp . $name;
 		HMSET cp . "$name.$nr", @_;
+		$nr
 	};
 }
 
-defhash problem => qw/name level statement/;
+defhash problem => qw/name level statement owner author/;
 defhash contest => qw/start end name owner/;
-defhash job => qw/date file name private problem result result_text user/;
+defhash job => qw/date errors extension filesize private problem result result_text user/;
+defhash user => qw/name email town university level/;
+
+sub clean_job (_){
+	HDEL cp . "job.$_[0]", qw/result result_text results daemon/
+}
 
-our @EXPORT_OK = do {
+our @EXPORT = do {
 	no strict 'refs';
-	grep { $_ =~ /^[a-z]/ and exists &$_ } keys %{__PACKAGE__ . '::'};
+	grep { $_ =~ /^[a-zA-Z]/ and exists &$_ } keys %{__PACKAGE__ . '::'};
 };
 
 1