cafe-grader-web

Commit r270:6fd950650700 public

parent | child
Description:
removes imported testdata file after extracted
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Show 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

r270:6fd950650700 - - 1 file changed: 2 inserted, 0 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -25,96 +25,98
25 25
26 26 @problem.test_pairs.clear
27 27 if import_test_pairs(dirname)
28 28 test_pair_count = TestPair.count :conditions => "problem_id = #{@problem.id}"
29 29 @log_msg = "Importing test pair successful. (#{test_pair_count} test pairs imported)"
30 30 else
31 31 @log_msg = "Importing test pair failed. (0 test pairs imported)"
32 32 end
33 33 end
34 34
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 + File.delete(testdata_filename)
74 +
73 75 return File.dirname(files[0])
74 76 end
75 77
76 78 def save_testdata_file(tempfile)
77 79 ext = TestdataImporter.long_ext(tempfile.original_filename)
78 80 testdata_filename = File.join(Dir.tmpdir,"#{@problem.name}#{ext}")
79 81
80 82 return nil if tempfile==""
81 83
82 84 if tempfile.instance_of?(Tempfile)
83 85 tempfile.close
84 86 FileUtils.move(tempfile.path,testdata_filename)
85 87 else
86 88 File.open(testdata_filename, "wb") do |f|
87 89 f.write(tempfile.read)
88 90 end
89 91 end
90 92
91 93 return testdata_filename
92 94 end
93 95
94 96 def import_test_pairs(dirname)
95 97 test_num = 1
96 98 while FileTest.exists? "#{dirname}/#{test_num}.in"
97 99 in_filename = "#{dirname}/#{test_num}.in"
98 100 sol_filename = "#{dirname}/#{test_num}.sol"
99 101
100 102 break if not FileTest.exists? sol_filename
101 103
102 104 test_pair = TestPair.new(:input => open(in_filename).read,
103 105 :solution => open(sol_filename).read,
104 106 :problem => @problem)
105 107 break if not test_pair.save
106 108
107 109 test_num += 1
108 110 end
109 111 return test_num > 1
110 112 end
111 113
112 114 def import_problem_description(dirname)
113 115 html_files = Dir["#{dirname}/*.html"]
114 116 markdown_files = Dir["#{dirname}/*.md"] + Dir["#{dirname}/*.markdown"]
115 117 if (html_files.length != 0) or (markdown_files.length != 0)
116 118 description = @problem.description || Description.new
117 119
118 120 if html_files.length != 0
119 121 filename = html_files[0]
120 122 description.markdowned = false
You need to be logged in to leave comments. Login now