Remove files that are (no longer) generated

[dak.git] / daklib / filewriter.py

diff --git a/daklib/filewriter.py b/daklib/filewriter.py
old mode 100755 (executable)
new mode 100644 (file)
index 3b816ee..6f5da4f
--- a/daklib/filewriter.py
+++ b/daklib/filewriter.py
@@ -27,10 +27,26 @@ Helper code for file writing with optional compression.
 
 from daklib.config import Config
 
-from subprocess import check_call
+from daklib.daksubprocess import check_call
 
+import errno
 import os, os.path
 
+class CompressionMethod(object):
+    def __init__(self, keyword, extension, command):
+        self.keyword = keyword
+        self.extension = extension
+        self.command = command
+
+_compression_methods = (
+    CompressionMethod('bzip2', '.bz2', ['bzip2', '-9']),
+    CompressionMethod('gzip', '.gz', ['gzip', '-9cn', '--rsyncable']),
+    CompressionMethod('xz', '.xz', ['xz', '-c']),
+    # 'none' must be the last compression method as BaseFileWriter
+    # handling it will remove the input file for other compressions
+    CompressionMethod('none', '', None),
+)
+
 class BaseFileWriter(object):
     '''
     Base class for compressed and uncompressed file writing.
@@ -43,14 +59,8 @@ class BaseFileWriter(object):
         include strings for suite, component, architecture and booleans
         uncompressed, gzip, bzip2.
         '''
-        compression = keywords.get('compression', ['none'])
-        self.uncompressed = 'none' in compression
-        self.gzip = 'gzip' in compression
-        self.bzip2 = 'bzip2' in compression
-        self.xz = 'xz' in compression
-        root_dir = Config()['Dir::Root']
-        relative_dir = template % keywords
-        self.path = os.path.join(root_dir, relative_dir)
+        self.compression = keywords.get('compression', ['none'])
+        self.path = template % keywords
 
     def open(self):
         '''
@@ -67,26 +77,34 @@ class BaseFileWriter(object):
     # internal helper function
     def rename(self, filename):
         tempfilename = filename + '.new'
-        os.chmod(tempfilename, 0o664)
+        os.chmod(tempfilename, 0o644)
         os.rename(tempfilename, filename)
 
+    # internal helper function to compress output
+    def compress(self, cmd, suffix, path):
+        in_filename = "{0}.new".format(path)
+        out_filename = "{0}{1}.new".format(path, suffix)
+        if cmd is not None:
+            with open(in_filename, 'r') as in_fh, open(out_filename, 'w') as out_fh:
+                check_call(cmd, stdin=in_fh, stdout=out_fh)
+        self.rename("{0}{1}".format(path, suffix))
+
     def close(self):
         '''
         Closes the file object and does the compression and rename work.
         '''
         self.file.close()
-        if self.gzip:
-            check_call('gzip -9cn --rsyncable <%s.new >%s.gz.new' % (self.path, self.path),
-                shell = True)
-            self.rename('%s.gz' % self.path)
-        if self.bzip2:
-            check_call('bzip2 -9 <%s.new >%s.bz2.new' % (self.path, self.path), shell = True)
-            self.rename('%s.bz2' % self.path)
-        if self.xz:
-            check_call('xz -c <{0}.new >{0}.xz.new'.format(self.path), shell=True)
-            self.rename('{0}.xz'.format(self.path))
-        if self.uncompressed:
-            self.rename(self.path)
+        for method in _compression_methods:
+            if method.keyword in self.compression:
+                self.compress(method.command, method.extension, self.path)
+            else:
+                # Try removing the file that would be generated.
+                # It's not an error if it does not exist.
+                try:
+                    os.unlink("{0}{1}".format(self.path, method.extension))
+                except OSError as e:
+                    if e.errno != errno.ENOENT:
+                        raise
         else:
             os.unlink(self.path + '.new')
 
@@ -102,9 +120,9 @@ class BinaryContentsFileWriter(BaseFileWriter):
         }
         flags.update(keywords)
         if flags['debtype'] == 'deb':
-            template = "dists/%(suite)s/%(component)s/Contents-%(architecture)s"
+            template = "%(archive)s/dists/%(suite)s/%(component)s/Contents-%(architecture)s"
         else: # udeb
-            template = "dists/%(suite)s/%(component)s/Contents-udeb-%(architecture)s"
+            template = "%(archive)s/dists/%(suite)s/%(component)s/Contents-udeb-%(architecture)s"
         BaseFileWriter.__init__(self, template, **flags)
 
 class SourceContentsFileWriter(BaseFileWriter):
@@ -117,7 +135,7 @@ class SourceContentsFileWriter(BaseFileWriter):
             'compression': ['gzip'],
         }
         flags.update(keywords)
-        template = "dists/%(suite)s/%(component)s/Contents-source"
+        template = "%(archive)s/dists/%(suite)s/%(component)s/Contents-source"
         BaseFileWriter.__init__(self, template, **flags)
 
 class PackagesFileWriter(BaseFileWriter):
@@ -127,13 +145,13 @@ class PackagesFileWriter(BaseFileWriter):
         are strings.  Output files are gzip compressed only.
         '''
         flags = {
-            'compression': ['gzip', 'bzip2'],
+            'compression': ['gzip', 'xz'],
         }
         flags.update(keywords)
         if flags['debtype'] == 'deb':
-            template = "dists/%(suite)s/%(component)s/binary-%(architecture)s/Packages"
+            template = "%(archive)s/dists/%(suite)s/%(component)s/binary-%(architecture)s/Packages"
         else: # udeb
-            template = "dists/%(suite)s/%(component)s/debian-installer/binary-%(architecture)s/Packages"
+            template = "%(archive)s/dists/%(suite)s/%(component)s/debian-installer/binary-%(architecture)s/Packages"
         BaseFileWriter.__init__(self, template, **flags)
 
 class SourcesFileWriter(BaseFileWriter):
@@ -143,10 +161,10 @@ class SourcesFileWriter(BaseFileWriter):
         files are gzip compressed only.
         '''
         flags = {
-            'compression': ['gzip', 'bzip2'],
+            'compression': ['gzip', 'xz'],
         }
         flags.update(keywords)
-        template = "dists/%(suite)s/%(component)s/source/Sources"
+        template = "%(archive)s/dists/%(suite)s/%(component)s/source/Sources"
         BaseFileWriter.__init__(self, template, **flags)
 
 class TranslationFileWriter(BaseFileWriter):
@@ -160,5 +178,5 @@ class TranslationFileWriter(BaseFileWriter):
             'language':     'en',
         }
         flags.update(keywords)
-        template = "dists/%(suite)s/%(component)s/i18n/Translation-%(language)s"
+        template = "%(archive)s/dists/%(suite)s/%(component)s/i18n/Translation-%(language)s"
         super(TranslationFileWriter, self).__init__(template, **flags)