X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fsrcformats.py;h=7d7dd940e3837c1c5c99a7f8708ae3663ae53d44;hb=4e9d67806b0cf200b68f2a199dd0fdf183b4c6de;hp=5c9a9e0ecde9a33efeb6c79900584c2038b4f7c7;hpb=324bbf00a048e5d26048d7b9eca335341a0440b1;p=dak.git

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index 5c9a9e0e..7d7dd940 100644
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -1,50 +1,80 @@
 import re
 
+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)
         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
+
+class FormatOne(SourceFormat):
     __metaclass__ = SourceFormat
 
+    name = '1.0'
     format = r'1.0'
 
+    requires = ()
+    disallowed = ('debian_tar', 'more_orig_tar')
+
     @classmethod
-    def reject_msgs(cls, has_native_tar, has_native_tar_gz, has_debian_tar, has_debian_diff, has_orig_tar, has_orig_tar_gz, has_more_orig_tar):
-        if not (has_native_tar_gz or (has_orig_tar_gz and has_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 (has_orig_tar_gz != has_orig_tar) or \
-           (has_native_tar_gz != has_native_tar) or \
-           has_debian_tar or has_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
 
-class FormatThree(object):
+        for msg in super(FormatOne, cls).reject_msgs(has):
+            yield msg
+
+class FormatThree(SourceFormat):
     __metaclass__ = SourceFormat
 
+    name = '3.x (native)'
     format = r'3\.\d+ \(native\)'
 
-    @classmethod
-    def reject_msgs(cls, has_native_tar, has_native_tar_gz, has_debian_tar, has_debian_diff, has_orig_tar, has_orig_tar_gz, has_more_orig_tar):
-        if not has_native_tar:
-            yield "lack required files for format 3.x (native)."
-        if has_orig_tar or has_debian_diff or has_debian_tar or has_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, has_native_tar, has_native_tar_gz, has_debian_tar, has_debian_diff, has_orig_tar, has_orig_tar_gz, has_more_orig_tar):
-        if not(has_orig_tar and has_debian_tar):
-            yield "lack required files for format '3.x (quilt)'."
-        if has_debian_diff or has_native_tar:
-            yield "contains source files not allowed in format 3.x (quilt)"
+    requires = ('orig_tar', 'debian_tar')
+    disallowed = ('debian_diff', 'native_tar')