From b56c85bb4056d33e4f63c276078ab9e5601eb5f0 Mon Sep 17 00:00:00 2001
From: James Ennis <james.ennis@codethink.co.uk>
Date: Mon, 9 Sep 2019 11:45:23 +0100
Subject: _stream.py: Handle tar compression mode in separate function

This patch introduces a local _handle_compression() function,
which returns a string representing the "mode" of tarfile
compression required by the TarFile object.

In addition to this, _export_artifact() has been changed
so that it now uses this new function

See: https://docs.python.org/3/library/tarfile.html#tarfile.open
---
 src/buildstream/_stream.py | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/buildstream/_stream.py b/src/buildstream/_stream.py
index aed21e1fd..288940c7e 100644
--- a/src/buildstream/_stream.py
+++ b/src/buildstream/_stream.py
@@ -597,9 +597,10 @@ class Stream():
                     raise StreamError("Failed to checkout files: '{}'"
                                       .format(e)) from e
         else:
-            if location == '-':
-                mode = 'w|' + compression
-                with target.timed_activity("Creating tarball"):
+            to_stdout = location == '-'
+            mode = _handle_compression(compression, to_stream=to_stdout)
+            with target.timed_activity("Creating tarball"):
+                if to_stdout:
                     # Save the stdout FD to restore later
                     saved_fd = os.dup(sys.stdout.fileno())
                     try:
@@ -610,10 +611,7 @@ class Stream():
                         # No matter what, restore stdout for further use
                         os.dup2(saved_fd, sys.stdout.fileno())
                         os.close(saved_fd)
-            else:
-                mode = 'w:' + compression
-                with target.timed_activity("Creating tarball '{}'"
-                                           .format(location)):
+                else:
                     with tarfile.open(location, mode=mode) as tf:
                         virdir.export_to_tar(tf, '.')
 
@@ -1711,3 +1709,19 @@ class Stream():
         # a new use-case arises.
         #
         raise TypeError("Stream objects should not be pickled.")
+
+
+# _handle_compression()
+#
+# Return the tarfile mode str to be used when creating a tarball
+#
+# Args:
+#    compression (str): The type of compression (either 'gz', 'xz' or 'bz2')
+#    to_stdout (bool): Whether we want to open a stream for writing
+#
+# Returns:
+#    (str): The tarfile mode string
+#
+def _handle_compression(compression, *, to_stream=False):
+    mode_prefix = 'w|' if to_stream else 'w:'
+    return mode_prefix + compression
-- 
cgit v1.2.1