From a64f64909a6173ec1306966ee0081fd6cf858760 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <artem.bityutskiy@intel.com>
Date: Tue, 13 Aug 2013 13:37:39 +0300
Subject: [PATCH] TransRead: uncompress 'tar.xz' files on-the-fly

Change-Id: Ia8ed3c1c276510b3d63e831135f7ad6ce6bc1743
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>
---
 bmaptools/TransRead.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/bmaptools/TransRead.py b/bmaptools/TransRead.py
index a3d34e8..1b9abff 100644
--- a/bmaptools/TransRead.py
+++ b/bmaptools/TransRead.py
@@ -13,7 +13,7 @@
 This module allows opening and reading local and remote files and decompress
 them on-the-fly if needed. Remote files are read using urllib2 (except of
 "ssh://" URLs, which are handled differently). Supported compression types are:
-'bz2', 'gz', 'xz', 'tar.gz', 'tgz', 'tar.bz2'.
+'bz2', 'gz', 'xz', 'tar.gz', 'tgz', 'tar.bz2', 'tar.xz'.
 """
 
 import os
@@ -29,7 +29,8 @@ import urlparse
 # pylint: disable=R0902
 
 # A list of supported compression types
-SUPPORTED_COMPRESSION_TYPES = ('bz2', 'gz', 'xz', 'tar.gz', 'tgz', 'tar.bz2')
+SUPPORTED_COMPRESSION_TYPES = ('bz2', 'gz', 'xz', 'tar.gz', 'tgz', 'tar.bz2',
+                               'tar.xz')
 
 def _fake_seek_forward(file_obj, cur_pos, offset, whence=os.SEEK_SET):
     """
@@ -247,6 +248,7 @@ class TransRead:
         #   o self._transfile_obj is a tarfile member file-like object
         self._file_obj = None
         self._file_obj2 = None
+        self._file_obj3 = None
         self._transfile_obj = None
 
         self._force_fake_seek = False
@@ -270,10 +272,12 @@ class TransRead:
         """The class destructor which closes opened files."""
         if self._transfile_obj:
             self._transfile_obj.close()
-        if self._file_obj:
-            self._file_obj.close()
+        if self._file_obj3:
+            self._file_obj3.close()
         if self._file_obj2:
             self._file_obj2.close()
+        if self._file_obj:
+            self._file_obj.close()
         if self._child_process:
             self._child_process.wait()
 
@@ -320,6 +324,15 @@ class TransRead:
                 self._transfile_obj = _CompressedFile(self._file_obj,
                                               lzma.LZMADecompressor().decompress,
                                               128)
+                if self.name.endswith('.tar.xz'):
+                    import tarfile
+
+                    self._file_obj2 = self._transfile_obj
+                    self._file_obj3 = tarfile.open(fileobj=self._file_obj2,
+                                                   mode='r|*')
+                    member = self._file_obj3.next()
+                    self._transfile_obj = self._file_obj3.extractfile(member)
+                    self.size = member.size
             else:
                 self.is_compressed = False
                 self._transfile_obj = self._file_obj
-- 
2.7.4