Description:
added timestamp to source download
git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@365 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r168:1a0b47f4c2a4 - - 2 files changed: 10 inserted, 6 deleted
@@ -38,103 +38,98 | |||||
|
38 | @announcements = Announcement.find_for_frontpage |
|
38 | @announcements = Announcement.find_for_frontpage |
|
39 | render :action => 'login', :layout => 'empty' |
|
39 | render :action => 'login', :layout => 'empty' |
|
40 | end |
|
40 | end |
|
41 |
|
41 | ||
|
42 | def list |
|
42 | def list |
|
43 | prepare_list_information |
|
43 | prepare_list_information |
|
44 | end |
|
44 | end |
|
45 |
|
45 | ||
|
46 | def help |
|
46 | def help |
|
47 | @user = User.find(session[:user_id]) |
|
47 | @user = User.find(session[:user_id]) |
|
48 | end |
|
48 | end |
|
49 |
|
49 | ||
|
50 | def submit |
|
50 | def submit |
|
51 | user = User.find(session[:user_id]) |
|
51 | user = User.find(session[:user_id]) |
|
52 |
|
52 | ||
|
53 | @submission = Submission.new(params[:submission]) |
|
53 | @submission = Submission.new(params[:submission]) |
|
54 | @submission.user = user |
|
54 | @submission.user = user |
|
55 | @submission.language_id = 0 |
|
55 | @submission.language_id = 0 |
|
56 | if params['file']!='' |
|
56 | if params['file']!='' |
|
57 | @submission.source = params['file'].read |
|
57 | @submission.source = params['file'].read |
|
58 | @submission.source_filename = params['file'].original_filename |
|
58 | @submission.source_filename = params['file'].original_filename |
|
59 | end |
|
59 | end |
|
60 | @submission.submitted_at = Time.new.gmtime |
|
60 | @submission.submitted_at = Time.new.gmtime |
|
61 |
|
61 | ||
|
62 | if Configuration[SYSTEM_MODE_CONF_KEY]=='contest' and |
|
62 | if Configuration[SYSTEM_MODE_CONF_KEY]=='contest' and |
|
63 | user.site!=nil and user.site.finished? |
|
63 | user.site!=nil and user.site.finished? |
|
64 | @submission.errors.add_to_base "The contest is over." |
|
64 | @submission.errors.add_to_base "The contest is over." |
|
65 | prepare_list_information |
|
65 | prepare_list_information |
|
66 | render :action => 'list' and return |
|
66 | render :action => 'list' and return |
|
67 | end |
|
67 | end |
|
68 |
|
68 | ||
|
69 | if @submission.valid? |
|
69 | if @submission.valid? |
|
70 | if @submission.save == false |
|
70 | if @submission.save == false |
|
71 | flash[:notice] = 'Error saving your submission' |
|
71 | flash[:notice] = 'Error saving your submission' |
|
72 | elsif Task.create(:submission_id => @submission.id, |
|
72 | elsif Task.create(:submission_id => @submission.id, |
|
73 | :status => Task::STATUS_INQUEUE) == false |
|
73 | :status => Task::STATUS_INQUEUE) == false |
|
74 | flash[:notice] = 'Error adding your submission to task queue' |
|
74 | flash[:notice] = 'Error adding your submission to task queue' |
|
75 | end |
|
75 | end |
|
76 | else |
|
76 | else |
|
77 | prepare_list_information |
|
77 | prepare_list_information |
|
78 | render :action => 'list' and return |
|
78 | render :action => 'list' and return |
|
79 | end |
|
79 | end |
|
80 | redirect_to :action => 'list' |
|
80 | redirect_to :action => 'list' |
|
81 | end |
|
81 | end |
|
82 |
|
82 | ||
|
83 | def source |
|
83 | def source |
|
84 | submission = Submission.find(params[:id]) |
|
84 | submission = Submission.find(params[:id]) |
|
85 | if submission.user_id == session[:user_id] |
|
85 | if submission.user_id == session[:user_id] |
|
86 | - if submission.problem.output_only |
|
||
|
87 | - fname = submission.source_filename |
|
||
|
88 | - else |
|
||
|
89 | - fname = submission.problem.name + '.' + submission.language.ext |
|
||
|
90 | - end |
|
||
|
91 | send_data(submission.source, |
|
86 | send_data(submission.source, |
|
92 | - {:filename => fname, |
|
87 | + {:filename => submission.download_filename, |
|
93 | :type => 'text/plain'}) |
|
88 | :type => 'text/plain'}) |
|
94 | else |
|
89 | else |
|
95 | flash[:notice] = 'Error viewing source' |
|
90 | flash[:notice] = 'Error viewing source' |
|
96 | redirect_to :action => 'list' |
|
91 | redirect_to :action => 'list' |
|
97 | end |
|
92 | end |
|
98 | end |
|
93 | end |
|
99 |
|
94 | ||
|
100 | def compiler_msg |
|
95 | def compiler_msg |
|
101 | @submission = Submission.find(params[:id]) |
|
96 | @submission = Submission.find(params[:id]) |
|
102 | if @submission.user_id == session[:user_id] |
|
97 | if @submission.user_id == session[:user_id] |
|
103 | render :action => 'compiler_msg', :layout => 'empty' |
|
98 | render :action => 'compiler_msg', :layout => 'empty' |
|
104 | else |
|
99 | else |
|
105 | flash[:notice] = 'Error viewing source' |
|
100 | flash[:notice] = 'Error viewing source' |
|
106 | redirect_to :action => 'list' |
|
101 | redirect_to :action => 'list' |
|
107 | end |
|
102 | end |
|
108 | end |
|
103 | end |
|
109 |
|
104 | ||
|
110 | def submission |
|
105 | def submission |
|
111 | @user = User.find(session[:user_id]) |
|
106 | @user = User.find(session[:user_id]) |
|
112 | @problems = Problem.find_available_problems |
|
107 | @problems = Problem.find_available_problems |
|
113 | if params[:id]==nil |
|
108 | if params[:id]==nil |
|
114 | @problem = nil |
|
109 | @problem = nil |
|
115 | @submissions = nil |
|
110 | @submissions = nil |
|
116 | else |
|
111 | else |
|
117 | @problem = Problem.find_by_name(params[:id]) |
|
112 | @problem = Problem.find_by_name(params[:id]) |
|
118 | if not @problem.available |
|
113 | if not @problem.available |
|
119 | redirect_to :action => 'list' |
|
114 | redirect_to :action => 'list' |
|
120 | flash[:notice] = 'Error: submissions for that problem are not viewable.' |
|
115 | flash[:notice] = 'Error: submissions for that problem are not viewable.' |
|
121 | return |
|
116 | return |
|
122 | end |
|
117 | end |
|
123 | @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id) |
|
118 | @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id) |
|
124 | end |
|
119 | end |
|
125 | end |
|
120 | end |
|
126 |
|
121 | ||
|
127 | def result |
|
122 | def result |
|
128 | if !Configuration.show_grading_result |
|
123 | if !Configuration.show_grading_result |
|
129 | redirect_to :action => 'list' and return |
|
124 | redirect_to :action => 'list' and return |
|
130 | end |
|
125 | end |
|
131 | @user = User.find(session[:user_id]) |
|
126 | @user = User.find(session[:user_id]) |
|
132 | @submission = Submission.find(params[:id]) |
|
127 | @submission = Submission.find(params[:id]) |
|
133 | if @submission.user!=@user |
|
128 | if @submission.user!=@user |
|
134 | flash[:notice] = 'You are not allowed to view result of other users.' |
|
129 | flash[:notice] = 'You are not allowed to view result of other users.' |
|
135 | redirect_to :action => 'list' and return |
|
130 | redirect_to :action => 'list' and return |
|
136 | end |
|
131 | end |
|
137 | prepare_grading_result(@submission) |
|
132 | prepare_grading_result(@submission) |
|
138 | end |
|
133 | end |
|
139 |
|
134 | ||
|
140 | def load_output |
|
135 | def load_output |
@@ -16,96 +16,105 | |||||
|
16 | before_save :assign_latest_number_if_new_recond |
|
16 | before_save :assign_latest_number_if_new_recond |
|
17 |
|
17 | ||
|
18 | def self.find_last_by_user_and_problem(user_id, problem_id) |
|
18 | def self.find_last_by_user_and_problem(user_id, problem_id) |
|
19 | last_sub = find(:first, |
|
19 | last_sub = find(:first, |
|
20 | :conditions => {:user_id => user_id, |
|
20 | :conditions => {:user_id => user_id, |
|
21 | :problem_id => problem_id}, |
|
21 | :problem_id => problem_id}, |
|
22 | :order => 'number DESC') |
|
22 | :order => 'number DESC') |
|
23 | return last_sub |
|
23 | return last_sub |
|
24 | end |
|
24 | end |
|
25 |
|
25 | ||
|
26 | def self.find_all_last_by_problem(problem_id) |
|
26 | def self.find_all_last_by_problem(problem_id) |
|
27 | # need to put in SQL command, maybe there's a better way |
|
27 | # need to put in SQL command, maybe there's a better way |
|
28 | Submission.find_by_sql("SELECT * FROM submissions " + |
|
28 | Submission.find_by_sql("SELECT * FROM submissions " + |
|
29 | "WHERE id = " + |
|
29 | "WHERE id = " + |
|
30 | "(SELECT MAX(id) FROM submissions AS subs " + |
|
30 | "(SELECT MAX(id) FROM submissions AS subs " + |
|
31 | "WHERE subs.user_id = submissions.user_id AND " + |
|
31 | "WHERE subs.user_id = submissions.user_id AND " + |
|
32 | "problem_id = " + problem_id.to_s + " " + |
|
32 | "problem_id = " + problem_id.to_s + " " + |
|
33 | "GROUP BY user_id) " + |
|
33 | "GROUP BY user_id) " + |
|
34 | "ORDER BY user_id") |
|
34 | "ORDER BY user_id") |
|
35 | end |
|
35 | end |
|
36 |
|
36 | ||
|
37 | def self.find_last_for_all_available_problems(user_id) |
|
37 | def self.find_last_for_all_available_problems(user_id) |
|
38 | submissions = Array.new |
|
38 | submissions = Array.new |
|
39 | problems = Problem.find_available_problems |
|
39 | problems = Problem.find_available_problems |
|
40 | problems.each do |problem| |
|
40 | problems.each do |problem| |
|
41 | sub = Submission.find_last_by_user_and_problem(user_id, problem.id) |
|
41 | sub = Submission.find_last_by_user_and_problem(user_id, problem.id) |
|
42 | submissions << sub if sub!=nil |
|
42 | submissions << sub if sub!=nil |
|
43 | end |
|
43 | end |
|
44 | submissions |
|
44 | submissions |
|
45 | end |
|
45 | end |
|
46 |
|
46 | ||
|
47 | def self.find_by_user_problem_number(user_id, problem_id, number) |
|
47 | def self.find_by_user_problem_number(user_id, problem_id, number) |
|
48 | Submission.find(:first, |
|
48 | Submission.find(:first, |
|
49 | :conditions => { |
|
49 | :conditions => { |
|
50 | :user_id => user_id, |
|
50 | :user_id => user_id, |
|
51 | :problem_id => problem_id, |
|
51 | :problem_id => problem_id, |
|
52 | :number => number |
|
52 | :number => number |
|
53 | }) |
|
53 | }) |
|
54 | end |
|
54 | end |
|
55 |
|
55 | ||
|
56 | def self.find_all_by_user_problem(user_id, problem_id) |
|
56 | def self.find_all_by_user_problem(user_id, problem_id) |
|
57 | Submission.find(:all, |
|
57 | Submission.find(:all, |
|
58 | :conditions => { |
|
58 | :conditions => { |
|
59 | :user_id => user_id, |
|
59 | :user_id => user_id, |
|
60 | :problem_id => problem_id, |
|
60 | :problem_id => problem_id, |
|
61 | }) |
|
61 | }) |
|
62 | end |
|
62 | end |
|
63 |
|
63 | ||
|
|
64 | + def download_filename | ||
|
|
65 | + if self.problem.output_only | ||
|
|
66 | + return self.source_filename | ||
|
|
67 | + else | ||
|
|
68 | + timestamp = self.submitted_at.localtime.strftime("%H%M%S") | ||
|
|
69 | + return "#{self.problem.name}-#{timestamp}.#{self.language.ext}" | ||
|
|
70 | + end | ||
|
|
71 | + end | ||
|
|
72 | + | ||
|
64 | protected |
|
73 | protected |
|
65 |
|
74 | ||
|
66 | def self.find_option_in_source(option, source) |
|
75 | def self.find_option_in_source(option, source) |
|
67 | if source==nil |
|
76 | if source==nil |
|
68 | return nil |
|
77 | return nil |
|
69 | end |
|
78 | end |
|
70 | i = 0 |
|
79 | i = 0 |
|
71 | source.each_line do |s| |
|
80 | source.each_line do |s| |
|
72 | if s =~ option |
|
81 | if s =~ option |
|
73 | words = s.split |
|
82 | words = s.split |
|
74 | return words[1] |
|
83 | return words[1] |
|
75 | end |
|
84 | end |
|
76 | i = i + 1 |
|
85 | i = i + 1 |
|
77 | if i==10 |
|
86 | if i==10 |
|
78 | return nil |
|
87 | return nil |
|
79 | end |
|
88 | end |
|
80 | end |
|
89 | end |
|
81 | return nil |
|
90 | return nil |
|
82 | end |
|
91 | end |
|
83 |
|
92 | ||
|
84 | def self.find_language_in_source(source, source_filename="") |
|
93 | def self.find_language_in_source(source, source_filename="") |
|
85 | langopt = find_option_in_source(/^LANG:/,source) |
|
94 | langopt = find_option_in_source(/^LANG:/,source) |
|
86 | if langopt |
|
95 | if langopt |
|
87 | return (Language.find_by_name(langopt) || |
|
96 | return (Language.find_by_name(langopt) || |
|
88 | Language.find_by_pretty_name(langopt)) |
|
97 | Language.find_by_pretty_name(langopt)) |
|
89 | else |
|
98 | else |
|
90 | if source_filename |
|
99 | if source_filename |
|
91 | return Language.find_by_extension(source_filename.split('.').last) |
|
100 | return Language.find_by_extension(source_filename.split('.').last) |
|
92 | else |
|
101 | else |
|
93 | return nil |
|
102 | return nil |
|
94 | end |
|
103 | end |
|
95 | end |
|
104 | end |
|
96 | end |
|
105 | end |
|
97 |
|
106 | ||
|
98 | def self.find_problem_in_source(source, source_filename="") |
|
107 | def self.find_problem_in_source(source, source_filename="") |
|
99 | prob_opt = find_option_in_source(/^TASK:/,source) |
|
108 | prob_opt = find_option_in_source(/^TASK:/,source) |
|
100 | if problem = Problem.find_by_name(prob_opt) |
|
109 | if problem = Problem.find_by_name(prob_opt) |
|
101 | return problem |
|
110 | return problem |
|
102 | else |
|
111 | else |
|
103 | if source_filename |
|
112 | if source_filename |
|
104 | return Problem.find_by_name(source_filename.split('.').first) |
|
113 | return Problem.find_by_name(source_filename.split('.').first) |
|
105 | else |
|
114 | else |
|
106 | return nil |
|
115 | return nil |
|
107 | end |
|
116 | end |
|
108 | end |
|
117 | end |
|
109 | end |
|
118 | end |
|
110 |
|
119 | ||
|
111 | def assign_problem |
|
120 | def assign_problem |
You need to be logged in to leave comments.
Login now