X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fsrcformats.py;h=f3afb8dba8b65b04fceca139b79b906b214e3080;hb=b7d36f712210b0efac983da88ae91cdd3fd7f469;hp=0b6b715a7c858b1a17ab425a52b488176a79db1b;hpb=6560a55727d338e41c14f11ba96d5bc86b210080;p=dak.git

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index 0b6b715a..f3afb8db 100644
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -1,50 +1,110 @@
 import re
 
+from regexes import re_verwithext
+from dak_exceptions import UnknownFormatError
+
 srcformats = []
 
+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)
         srcformats.append(klass)
 
+        assert str(klass.name)
+        assert iter(klass.requires)
+        assert iter(klass.disallowed)
+
         klass.re_format = re.compile(klass.format)
 
         return klass
 
-class FormatOne(object):
+    @classmethod
+    def reject_msgs(cls, has):
+        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'):
+        if is_a_dsc:
+            if format != (1,0) and \
+               format != (3,0,"quilt") and format != (3,0,"native"):
+                raise UnknownFormatError, repr(format)
+        else:
+            if (format < (1,5) or format > (1,8)):
+                raise UnknownFormatError, repr(format)
+            if field != "files" and format < (1,8):
+                raise UnknownFormatError, repr(format)
+
+class FormatOne(SourceFormat):
     __metaclass__ = SourceFormat
 
+    name = '1.0'
     format = r'1.0'
 
+    requires = ()
+    disallowed = ('debian_tar', 'more_orig_tar')
+
     @classmethod
-    def reject_msgs(cls, native_tar, native_tar_gz, debian_tar, debian_diff, orig_tar, orig_tar_gz, more_orig_tar):
-        if not (native_tar_gz or (orig_tar_gz and debian_diff)):
+    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 (orig_tar_gz != orig_tar) or \
-           (native_tar_gz != native_tar) or \
-           debian_tar or more_orig_tar:
-            yield "contains source files not allowed in format 1.0"
+        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
+
+        for msg in super(FormatOne, cls).reject_msgs(has):
+            yield msg
 
-class FormatThree(object):
+class FormatThree(SourceFormat):
     __metaclass__ = SourceFormat
 
+    name = '3.x (native)'
     format = r'3\.\d+ \(native\)'
 
-    @classmethod
-    def reject_msgs(cls, native_tar, native_tar_gz, debian_tar, debian_diff, orig_tar, orig_tar_gz, more_orig_tar):
-        if not native_tar:
-            yield "lack required files for format 3.x (native)."
-        if orig_tar or debian_diff or debian_tar or more_orig_tar:
-            yield "contains source files not allowed in format '3.x (native)'"
+    requires = ('native_tar',)
+    disallowed = ('orig_tar', 'debian_diff', 'debian_tar', 'more_orig_tar')
 
-class FormatThreeQuilt(object):
+class FormatThreeQuilt(SourceFormat):
     __metaclass__ = SourceFormat
 
+    name = '3.x (quilt)'
     format = r'3\.\d+ \(quilt\)'
 
-    @classmethod
-    def reject_msgs(cls, native_tar, native_tar_gz, debian_tar, debian_diff, orig_tar, orig_tar_gz, more_orig_tar):
-        if not(orig_tar and debian_tar):
-            yield "lack required files for format '3.x (quilt)'."
-        if debian_diff or native_tar:
-            yield "contains source files not allowed in format 3.x (quilt)"
+    requires = ('orig_tar', 'debian_tar')
+    disallowed = ('debian_diff', 'native_tar')