Make critical parsing explicit. See ietf-tools#584

 - Legacy-Id: 2828

Author: emiliosanchez

ietf/submit/forms.py

@@ -72,22 +72,30 @@ def get_fieldsets(self):
                 yield fieldset_dict
 
     def clean_txt(self):
-        parsed_info = PlainParser(self.cleaned_data['txt']).parse()
+        if not self.cleaned_data['txt']:
+            return None
+        parsed_info = PlainParser(self.cleaned_data['txt']).critical_parse()
         if parsed_info.errors:
             raise forms.ValidationError(parsed_info.errors)
 
     def clean_pdf(self):
-        parsed_info = PDFParser(self.cleaned_data['pdf']).parse()
+        if not self.cleaned_data['pdf']:
+            return None
+        parsed_info = PDFParser(self.cleaned_data['pdf']).critical_parse()
         if parsed_info.errors:
             raise forms.ValidationError(parsed_info.errors)
 
     def clean_ps(self):
-        parsed_info = PSParser(self.cleaned_data['ps']).parse()
+        if not self.cleaned_data['ps']:
+            return None
+        parsed_info = PSParser(self.cleaned_data['ps']).critical_parse()
         if parsed_info.errors:
             raise forms.ValidationError(parsed_info.errors)
 
     def clean_xml(self):
-        parsed_info = XMLParser(self.cleaned_data['xml']).parse()
+        if not self.cleaned_data['xml']:
+            return None
+        parsed_info = XMLParser(self.cleaned_data['xml']).critical_parse()
         if parsed_info.errors:
             raise forms.ValidationError(parsed_info.errors)
 

ietf/submit/parsers/base.py

@@ -36,26 +36,13 @@ def __init__(self, fd):
         self.fd = fd
         self.parsed_info = ParseInfo()
 
-    def parse(self):
-        if not self.fd:
-            return self.parsed_info
-        for attr in dir(self):
-            if attr.startswith('parse_critical_'):
-                method = getattr(self, attr, None)
-                if callable(method):
-                    method()
-        # If some critical parsing has returned an error do not continue
-        if self.parsed_info.errors:
-            return self.parsed_info
-        # Continue with non critical parsing, note that they also can return errors
-        for attr in dir(self):
-            if attr.startswith('parse_normal_'):
-                method = getattr(self, attr, None)
-                if callable(method):
-                    method()
+    # If some error is found after this method invocation
+    # no other file parsing is recommended
+    def critical_parse(self):
+        self.parse_invalid_chars_in_filename()
         return self.parsed_info
 
-    def parse_critical_000_invalid_chars_in_filename(self):
+    def parse_invalid_chars_in_filename(self):
         name = self.fd.name
         regexp = re.compile(r'&|\|\/|;|\*|\s|\$')
         chars = regexp.findall(name)

ietf/submit/parsers/pdf_parser.py

@@ -3,6 +3,13 @@
 
 class PDFParser(FileParser):
 
-    def parse_critical_filename_extension(self):
+    # If some error is found after this method invocation
+    # no other file parsing is recommended
+    def critical_parse(self):
+        super(PDFParser, self).critical_parse()
+        self.parse_filename_extension()
+        return self.parsed_info
+
+    def parse_filename_extension(self):
         if not self.fd.name.endswith('.pdf'):
             self.parsed_info.add_error('Format of this document must be PDF')