Description:
rename_problem fix
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r234:45474cc69e4c - - 1 file changed: 2 inserted, 2 deleted
@@ -1,23 +1,23 | |||
|
1 | 1 | #!/usr/bin/env ruby |
|
2 | 2 | |
|
3 | 3 | ENVIRONMENT_DIRS = ['ev', 'ev-exam'] |
|
4 | 4 | |
|
5 | 5 | def config |
|
6 | 6 | Grader::Configuration.get_instance |
|
7 | 7 | end |
|
8 | 8 | |
|
9 | 9 | def rename_problem(old_problem_name, new_problem_name) |
|
10 | 10 | |
|
11 |
- |
|
|
11 | + unless valid_problem_name(new_problem_name) | |
|
12 | 12 | puts "Bad new problem name: #{new_problem_name}" |
|
13 | 13 | return |
|
14 | 14 | end |
|
15 | 15 | |
|
16 | 16 | problem = Problem.find_by_name(old_problem_name) |
|
17 | 17 | if problem==nil |
|
18 | 18 | puts "Problem #{old_problem_name} does not exist." |
|
19 | 19 | return |
|
20 | 20 | end |
|
21 | 21 | |
|
22 | 22 | puts "Problem: #{old_problem_name} -> #{new_problem_name}" |
|
23 | 23 | |
@@ -51,25 +51,25 | |||
|
51 | 51 | When using with -f, that file should contain, for each line, the old |
|
52 | 52 | problem name and its new name. |
|
53 | 53 | |
|
54 | 54 | This script should be called at the judge root dir where dirs 'ev' and |
|
55 | 55 | 'ev-exam' are. |
|
56 | 56 | USAGE |
|
57 | 57 | end |
|
58 | 58 | |
|
59 | 59 | def valid_problem_name(name) |
|
60 | 60 | if name.length==0: |
|
61 | 61 | return false |
|
62 | 62 | else |
|
63 |
- return |
|
|
63 | + return (/^[a-zA-Z0-9_\-]+$/ === name) | |
|
64 | 64 | end |
|
65 | 65 | end |
|
66 | 66 | |
|
67 | 67 | if (ARGV.length!=2) |
|
68 | 68 | usage |
|
69 | 69 | exit(0) |
|
70 | 70 | end |
|
71 | 71 | |
|
72 | 72 | if ARGV[0]=='-f' and !FileTest.exists?(ARGV[1]) |
|
73 | 73 | puts "File #{ARGV[1]} does not exist." |
|
74 | 74 | usage |
|
75 | 75 | exit(0) |
You need to be logged in to leave comments.
Login now