[elbe-devel] [PATCH 05/10] elbepack: packers: add a helper to find packed image

[Thomas Weißschuh]

To make other parts of ELBE more flexible add a helper which can find the
actual packed image file from a generic image name from the ELBE XML.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh at linutronix.de>
---
 elbepack/packers.py | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/elbepack/packers.py b/elbepack/packers.py
index 505de5cca0b249aa0aecac6689e83bbc1fc28b74..cdb90b9d8dd9357824ec8ed222fbfb3f225a3cc6 100644
--- a/elbepack/packers.py
+++ b/elbepack/packers.py
@@ -15,12 +15,19 @@ class Packer(abc.ABC):
     def pack_file(self, _builddir, _fname):
         ...
 
+    @abc.abstractmethod
+    def packed_filename(self, fname):
+        ...
+
 
 class NoPacker(Packer):
 
     def pack_file(self, _builddir, fname):
         return fname
 
+    def packed_filename(self, fname):
+        return fname
+
 
 class InPlacePacker(Packer):
 
@@ -39,6 +46,9 @@ class InPlacePacker(Packer):
             # exist anymore
             return None
 
+        return self.packed_filename(fname)
+
+    def packed_filename(self, fname):
         return fname + self.suffix
 
 
@@ -69,6 +79,9 @@ class TarArchiver(Packer):
             # the sparsity.
             return None
 
+        return self.packed_filename(fname)
+
+    def packed_filename(self, fname):
         return fname + self.suffix
 
 
@@ -78,13 +91,16 @@ class AndroidSparsePacker(Packer):
             fpath = os.path.join(builddir, fname)
             do(['img2simg', fpath, fpath + '.simg'])
             do(['rm', '-f', fpath])
-            return fname + '.simg'
+            return self.packed_filename(fname)
         except subprocess.CalledProcessError:
             # in case of an error, we just return None
             # which means, that the orig file does not
             # exist anymore
             return None
 
+    def packed_filename(self, fname):
+        return fname + '.simg'
+
 
 packers = {'none': NoPacker(),
            'gzip': InPlacePacker(['gzip', '-f'], '.gz'),
@@ -97,3 +113,11 @@ packers = {'none': NoPacker(),
            }
 
 default_packer = packers['tarxz']
+
+
+def find_packed_image(directory, image):
+    for packer in packers.values():
+        packed_filename = packer.packed_filename(image)
+        img_name = directory / packed_filename
+        if img_name.exists():
+            return img_name

-- 
2.48.1