X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fsrcformats.py;h=d26a642b1cedde85081fe7880a10b01e8b462b14;hb=8c266683b16ad4f1ddcf2cc48cc7931ac007af59;hp=735b7b686c26b8f06bf5827c64ee215b1ef78d96;hpb=1b29fb2dc99c4569a9aea6a8652ddecc340730d7;p=dak.git

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index 735b7b68..d26a642b 100644
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -1,10 +1,22 @@
 import re
 
-from regexes import re_verwithext
 from dak_exceptions import UnknownFormatError
 
 srcformats = []
 
+def get_format_from_string(txt):
+    """
+    Returns the SourceFormat class that corresponds to the specified .changes
+    Format value. If the string does not match any class, UnknownFormatError
+    is raised.
+    """
+
+    for format in srcformats:
+        if format.re_format.match(txt):
+            return format
+
+    raise UnknownFormatError, "Unknown format %r" % txt
+
 class SourceFormat(type):
     def __new__(cls, name, bases, attrs):
         klass = super(SourceFormat, cls).__new__(cls, name, bases, attrs)
@@ -28,33 +40,13 @@ class SourceFormat(type):
                 yield "contains source files not allowed in format %s" % cls.name
 
     @classmethod
-    def parse_format(cls, txt, is_a_dsc=False, field='files'):
-        format = re_verwithext.search(txt)
-
-        if format is None:
-            raise UnknownFormatError, txt
-
-        format = format.groups()
-
-        if format[1] is None:
-            format = int(float(format[0])), 0, format[2]
-        else:
-            format = int(format[0]), int(format[1]), format[2]
-
-        if format[2] is None:
-            format = format[:2]
-
-        if is_a_dsc:
-            if format != (1,0) and \
-               format != (3,0,"quilt") and format != (3,0,"native"):
-                raise UnknownFormatError, txt
-        else:
-            if (format < (1,5) or format > (1,8)):
-                raise UnknownFormatError, txt
-            if field != "files" and format < (1,8):
-                raise UnknownFormatError, txt
-
-        return format
+    def validate_format(cls, format, is_a_dsc=False, field='files'):
+        """
+        Raises UnknownFormatError if the specified format tuple is not valid for
+        this format (for example, the format (1, 0) is not valid for the
+        "3.0 (quilt)" format). Return value is undefined in all other cases.
+        """
+        pass
 
 class FormatOne(SourceFormat):
     __metaclass__ = SourceFormat
@@ -78,6 +70,19 @@ class FormatOne(SourceFormat):
         for msg in super(FormatOne, cls).reject_msgs(has):
             yield msg
 
+    @classmethod
+    def validate_format(cls, format, is_a_dsc=False, field='files'):
+        msg = "Invalid format %s definition: %r" % (cls.name, format)
+
+        if is_a_dsc:
+            if format != (1, 0):
+                raise UnknownFormatError, msg
+        else:
+            if (format < (1,5) or format > (1,8)):
+                raise UnknownFormatError, msg
+            if field != "files" and format < (1,8):
+                raise UnknownFormatError, msg
+
 class FormatThree(SourceFormat):
     __metaclass__ = SourceFormat
 
@@ -87,6 +92,12 @@ class FormatThree(SourceFormat):
     requires = ('native_tar',)
     disallowed = ('orig_tar', 'debian_diff', 'debian_tar', 'more_orig_tar')
 
+    @classmethod
+    def validate_format(cls, format, **kwargs):
+        if format != (3, 0, 'native'):
+            raise UnknownFormatError, "Invalid format %s definition: %r" % \
+                (cls.name, format)
+
 class FormatThreeQuilt(SourceFormat):
     __metaclass__ = SourceFormat
 
@@ -95,3 +106,9 @@ class FormatThreeQuilt(SourceFormat):
 
     requires = ('orig_tar', 'debian_tar')
     disallowed = ('debian_diff', 'native_tar')
+
+    @classmethod
+    def validate_format(cls, format, **kwargs):
+        if format != (3, 0, 'quilt'):
+            raise UnknownFormatError, "Invalid format %s definition: %r" % \
+                (cls.name, format)