X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fsrcformats.py;h=ade3c45388b6a32d2e27c27d15a4a33a11e98b5a;hb=68f805c214aa62ccd2e3624ebbc6f323eb8eb6dc;hp=87ba2f89c614bd71c9903a4ff7d05a6ee379179b;hpb=b2d2d87ae436de26dacd15885c6e71309c869180;p=dak.git

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index 87ba2f89..ade3c453 100644
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -1,7 +1,53 @@
 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
+
+def parse_format(txt):
+    """
+    Parse a .changes Format string into a tuple representation for easy
+    comparison.
+
+    >>> parse_format('1.0')
+    (1, 0)
+    >>> parse_format('8.4 (hardy)')
+    (8, 4, 'hardy')
+
+    If the format doesn't match these forms, raises UnknownFormatError.
+    """
+
+    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]
+
+    return format
+
 class SourceFormat(type):
     def __new__(cls, name, bases, attrs):
         klass = super(SourceFormat, cls).__new__(cls, name, bases, attrs)
@@ -17,13 +63,22 @@ class SourceFormat(type):
 
     @classmethod
     def reject_msgs(cls, has):
-        if len(cls.required) != len([x for x in requires if has[x]]):
+        if len(cls.requires) != len([x for x in cls.requires if has[x]]):
             yield "lack of required files for format %s" % cls.name
 
         for key in cls.disallowed:
             if has[key]:
                 yield "contains source files not allowed in format %s" % cls.name
 
+    @classmethod
+    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
 
@@ -37,6 +92,8 @@ class FormatOne(SourceFormat):
     def reject_msgs(cls, has):
         if not (has['native_tar_gz'] or (has['orig_tar_gz'] and has['debian_diff'])):
             yield "no .tar.gz or .orig.tar.gz+.diff.gz in 'Files' field."
+        if has['native_tar_gz'] and has['debian_diff']:
+            yield "native package with diff makes no sense"
         if (has['orig_tar_gz'] != has['orig_tar']) or \
            (has['native_tar_gz'] != has['native_tar']):
             yield "contains source files not allowed in format %s" % cls.name
@@ -44,6 +101,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
 
@@ -53,6 +123,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
 
@@ -61,3 +137,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)