cafe-grader-web

Commit r235:41d234115580 public

parent | child
Description:
fixed import error when no problem descriptions provided
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r235:41d234115580 - - 1 file changed: 2 inserted, 0 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -35,100 +35,102
35 35 @log_msg << import_problem_description(dirname)
36 36
37 37 return true
38 38 end
39 39
40 40 protected
41 41
42 42 def self.long_ext(filename)
43 43 i = filename.index('.')
44 44 len = filename.length
45 45 return filename.slice(i..len)
46 46 end
47 47
48 48 def extract(tempfile)
49 49 testdata_filename = save_testdata_file(tempfile)
50 50 ext = TestdataImporter.long_ext(tempfile.original_filename)
51 51
52 52 extract_dir = File.join(GraderScript.raw_dir, @problem.name)
53 53 begin
54 54 Dir.mkdir extract_dir
55 55 rescue Errno::EEXIST
56 56 end
57 57
58 58 if ext=='.tar.gz' or ext=='.tgz'
59 59 cmd = "tar -zxvf #{testdata_filename} -C #{extract_dir}"
60 60 elsif ext=='.tar'
61 61 cmd = "tar -xvf #{testdata_filename} -C #{extract_dir}"
62 62 elsif ext=='.zip'
63 63 cmd = "unzip -o #{testdata_filename} -d #{extract_dir}"
64 64 else
65 65 return nil
66 66 end
67 67
68 68 system(cmd)
69 69
70 70 files = Dir["#{extract_dir}/**/*1*.in"]
71 71 return nil if files.length==0
72 72
73 73 return File.dirname(files[0])
74 74 end
75 75
76 76 def save_testdata_file(tempfile)
77 77 ext = TestdataImporter.long_ext(tempfile.original_filename)
78 78 testdata_filename = File.join(Dir.tmpdir,"#{@problem.name}#{ext}")
79 79
80 80 return nil if tempfile==""
81 81
82 82 if tempfile.instance_of?(Tempfile)
83 83 tempfile.close
84 84 FileUtils.move(tempfile.path,testdata_filename)
85 85 else
86 86 File.open(testdata_filename, "wb") do |f|
87 87 f.write(tempfile.read)
88 88 end
89 89 end
90 90
91 91 return testdata_filename
92 92 end
93 93
94 94 def import_test_pairs(dirname)
95 95 test_num = 1
96 96 while FileTest.exists? "#{dirname}/#{test_num}.in"
97 97 in_filename = "#{dirname}/#{test_num}.in"
98 98 sol_filename = "#{dirname}/#{test_num}.sol"
99 99
100 100 break if not FileTest.exists? sol_filename
101 101
102 102 test_pair = TestPair.new(:input => open(in_filename).read,
103 103 :solution => open(sol_filename).read,
104 104 :problem => @problem)
105 105 break if not test_pair.save
106 106
107 107 test_num += 1
108 108 end
109 109 return test_num > 1
110 110 end
111 111
112 112 def import_problem_description(dirname)
113 113 html_files = Dir["#{dirname}/*.html"]
114 114 markdown_files = Dir["#{dirname}/*.md"] + Dir["#{dirname}/*.markdown"]
115 115 if (html_files.length != 0) or (markdown_files.length != 0)
116 116 description = @problem.description || Description.new
117 117
118 118 if html_files.length != 0
119 119 filename = html_files[0]
120 120 description.markdowned = false
121 121 else
122 122 filename = markdown_files[0]
123 123 description.markdowned = true
124 124 end
125 125
126 126 description.body = open(filename).read
127 127 description.save
128 128 @problem.description = description
129 129 @problem.save
130 130 return "\nProblem description imported from #{filename}."
131 + else
132 + return ''
131 133 end
132 134 end
133 135
134 136 end
You need to be logged in to leave comments. Login now