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
@@ -62,55 +62,50 | |||
|
62 | 62 | if Configuration[SYSTEM_MODE_CONF_KEY]=='contest' and |
|
63 | 63 | user.site!=nil and user.site.finished? |
|
64 | 64 | @submission.errors.add_to_base "The contest is over." |
|
65 | 65 | prepare_list_information |
|
66 | 66 | render :action => 'list' and return |
|
67 | 67 | end |
|
68 | 68 | |
|
69 | 69 | if @submission.valid? |
|
70 | 70 | if @submission.save == false |
|
71 | 71 | flash[:notice] = 'Error saving your submission' |
|
72 | 72 | elsif Task.create(:submission_id => @submission.id, |
|
73 | 73 | :status => Task::STATUS_INQUEUE) == false |
|
74 | 74 | flash[:notice] = 'Error adding your submission to task queue' |
|
75 | 75 | end |
|
76 | 76 | else |
|
77 | 77 | prepare_list_information |
|
78 | 78 | render :action => 'list' and return |
|
79 | 79 | end |
|
80 | 80 | redirect_to :action => 'list' |
|
81 | 81 | end |
|
82 | 82 | |
|
83 | 83 | def source |
|
84 | 84 | submission = Submission.find(params[:id]) |
|
85 | 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 | 86 | send_data(submission.source, |
|
92 | - {:filename => fname, | |
|
87 | + {:filename => submission.download_filename, | |
|
93 | 88 | :type => 'text/plain'}) |
|
94 | 89 | else |
|
95 | 90 | flash[:notice] = 'Error viewing source' |
|
96 | 91 | redirect_to :action => 'list' |
|
97 | 92 | end |
|
98 | 93 | end |
|
99 | 94 | |
|
100 | 95 | def compiler_msg |
|
101 | 96 | @submission = Submission.find(params[:id]) |
|
102 | 97 | if @submission.user_id == session[:user_id] |
|
103 | 98 | render :action => 'compiler_msg', :layout => 'empty' |
|
104 | 99 | else |
|
105 | 100 | flash[:notice] = 'Error viewing source' |
|
106 | 101 | redirect_to :action => 'list' |
|
107 | 102 | end |
|
108 | 103 | end |
|
109 | 104 | |
|
110 | 105 | def submission |
|
111 | 106 | @user = User.find(session[:user_id]) |
|
112 | 107 | @problems = Problem.find_available_problems |
|
113 | 108 | if params[:id]==nil |
|
114 | 109 | @problem = nil |
|
115 | 110 | @submissions = nil |
|
116 | 111 | else |
@@ -40,48 +40,57 | |||
|
40 | 40 | problems.each do |problem| |
|
41 | 41 | sub = Submission.find_last_by_user_and_problem(user_id, problem.id) |
|
42 | 42 | submissions << sub if sub!=nil |
|
43 | 43 | end |
|
44 | 44 | submissions |
|
45 | 45 | end |
|
46 | 46 | |
|
47 | 47 | def self.find_by_user_problem_number(user_id, problem_id, number) |
|
48 | 48 | Submission.find(:first, |
|
49 | 49 | :conditions => { |
|
50 | 50 | :user_id => user_id, |
|
51 | 51 | :problem_id => problem_id, |
|
52 | 52 | :number => number |
|
53 | 53 | }) |
|
54 | 54 | end |
|
55 | 55 | |
|
56 | 56 | def self.find_all_by_user_problem(user_id, problem_id) |
|
57 | 57 | Submission.find(:all, |
|
58 | 58 | :conditions => { |
|
59 | 59 | :user_id => user_id, |
|
60 | 60 | :problem_id => problem_id, |
|
61 | 61 | }) |
|
62 | 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 | 73 | protected |
|
65 | 74 | |
|
66 | 75 | def self.find_option_in_source(option, source) |
|
67 | 76 | if source==nil |
|
68 | 77 | return nil |
|
69 | 78 | end |
|
70 | 79 | i = 0 |
|
71 | 80 | source.each_line do |s| |
|
72 | 81 | if s =~ option |
|
73 | 82 | words = s.split |
|
74 | 83 | return words[1] |
|
75 | 84 | end |
|
76 | 85 | i = i + 1 |
|
77 | 86 | if i==10 |
|
78 | 87 | return nil |
|
79 | 88 | end |
|
80 | 89 | end |
|
81 | 90 | return nil |
|
82 | 91 | end |
|
83 | 92 | |
|
84 | 93 | def self.find_language_in_source(source, source_filename="") |
|
85 | 94 | langopt = find_option_in_source(/^LANG:/,source) |
|
86 | 95 | if langopt |
|
87 | 96 | return (Language.find_by_name(langopt) || |
You need to be logged in to leave comments.
Login now