Merge branch 'master' of https://github.com/johnathan79717/codeforces-parser

Author: matthias

README.md

@@ -1,4 +1,4 @@
-Codeforces Parser v1.4.1
+Codeforces Parser v1.5
 =================
 
 Summary
@@ -11,15 +11,15 @@ This is a python program that parses the sample tests from the contest problem p
 You can also find this article here, [http://codeforces.com/blog/entry/10416](http://codeforces.com/blog/entry/10416)
 
 ### Example:
-`./parse.py contest_number (e.g. ./parse.py 464)`
+`./parse.py contest_number (e.g. ./parse.py 513)`
 
-Where `464` is the contest number, not the round number! Check the URL of the contest on your browser, that is the number you are supposed to use.
+Where `512` is the contest number, not the round number! Check the URL of the contest on your browser, that is the number you are supposed to use.
 
 ### Effect:
 
-##### What will happen, for example, if `./parse.py 464` is executed?
+##### What will happen, for example, if `./parse.py 512` is executed?
 
-1. Directories `464/A`, `464/B`, `464/C`, `464/D` and so on are created depending on the contest number of problems.
+1. Directories `512/A`, `512/B`, `512/C`, `512/D` and so on are created depending on the contest number of problems.
 2. For each problem, `main.cc` is copied and renamed to the problem letter to the corresponding directory. **You can put the path of your usual template in `parse.py:20`**.
 3. Problem page is downloaded from Codeforces website, and parsed. Sample input/output files are generated, e.g. `input1`, `output1`, `input2`, `output2` and so on. You can create your own test cases after that, just keep the same naming format as others test cases.
 4. A script `test.sh` is generated. You can use it to compile and run the sample tests after you finish coding. Just run `./test.sh` in the problem directory.
@@ -28,6 +28,7 @@ Where `464` is the contest number, not the round number! Check the URL of the co
 
 1. Compilation: `g++ -g -std=c++0x -Wall $DBG main.cc`. **You can change the compile options in `parse.py:21`**. Variable $DBG is set to -DDEBUG if you start "./test.sh -d", otherwise it is empty. This allows for compilation with and without debug macros.
 2. Run each sample tests on your program (`a.out`), and check the output by `diff`. If it's correct, print **Accepted**, or else print the sample test that went wrong.
+3. Please note that for problems with multiple correct answers it might say that your output is incorrect.
 
 ### Collaborators and Versions:
 
@@ -38,6 +39,9 @@ Where `464` is the contest number, not the round number! Check the URL of the co
 If you have any suggestions and/or bugs drop a message!
 
 ##### Versions Changes:
++ **1.5:**
+Added debug flag (-d) to enable DEBUG macro (read above for details).
+Fixed problems parsing for problem names that are not called A, B, etc. Such as A1, A2..
 + **1.4.1:**
 Minor fixes, such as typos, bugs and special characters handling.
 + **1.4:**

parse.py

@@ -28,7 +28,7 @@
 MY_OUTPUT='my_output'
 
 # Do not modify these!
-VERSION='CodeForces Parser v1.4.1: https://github.com/johnathan79717/codeforces-parser'
+VERSION='CodeForces Parser v1.5: https://github.com/johnathan79717/codeforces-parser'
 RED_F='\033[31m'
 GREEN_F='\033[32m'
 BOLD='\033[1m'
@@ -90,6 +90,7 @@ def __init__(self, contest):
         self.start_contest = False
         self.start_problem = False
         self.name = ''
+        self.problem_name = ''
         self.problems = []
         self.problem_names = []
 
@@ -98,7 +99,7 @@ def handle_starttag(self, tag, attrs):
                 self.start_contest = True
         elif tag == 'option':
             if len(attrs) == 1:
-                regexp = re.compile(r"u'[A-Z]'")
+                regexp = re.compile(r"u'[A-Z].*'")
                 string = str(attrs[0])
                 search = regexp.search(string)
                 if search is not None:
@@ -109,20 +110,23 @@ def handle_endtag(self, tag):
         if tag == 'a' and self.start_contest:
             self.start_contest = False
         elif self.start_problem:
+            self.problem_names.append(self.problem_name)
+            self.problem_name = ''
             self.start_problem = False
 
     def handle_data(self, data):
         if self.start_contest:
             self.name = data
         elif self.start_problem:
-            self.problem_names.append(data)
+            self.problem_name += data
 
 # Parses each problem page.
 def parse_problem(folder, contest, problem):
     url = 'http://codeforces.com/contest/%s/problem/%s' % (contest, problem)
     html = urlopen(url).read()
     parser = CodeforcesProblemParser(folder)
-    parser.feed(html.decode('utf-8').encode('utf-8')) # Should fix special chars problems.
+    parser.feed(html.decode('utf-8')) 
+    # .encode('utf-8') Should fix special chars problems?
     return parser.num_tests
 
 # Parses the contest page.  
@@ -194,7 +198,7 @@ def generate_test_script(folder, num_tests, problem):
 def main():
     print (VERSION)
     if(len(argv) < 2):
-        print('USAGE: ./parse.py 435')
+        print('USAGE: ./parse.py 512')
         return
     contest = argv[1]