From dae2f3471a56f3967952e6951f60f523060c89a0 Mon Sep 17 00:00:00 2001

From: Cole Robinson <crobinso@redhat.com>

Date: Wed, 7 Apr 2021 09:51:41 -0400

Subject: [PATCH] urlfetcher: Factor out ISOReader class

This contains all the isoinfo command logic. This will be used

to add an xorriso backend as well

Signed-off-by: Cole Robinson <crobinso@redhat.com>

(cherry picked from commit b13b5e0f5edf8efabae643d28f12693f43f094db)

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1973236

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>

---

 virtinst/install/urlfetcher.py | 64 +++++++++++++++++++++++++---------

 1 file changed, 48 insertions(+), 16 deletions(-)

diff --git a/virtinst/install/urlfetcher.py b/virtinst/install/urlfetcher.py

index f531fe50..3cacab1a 100644

--- a/virtinst/install/urlfetcher.py

+++ b/virtinst/install/urlfetcher.py

@@ -18,6 +18,45 @@ import requests

 from ..logger import log

+#########################

+# isoreader abstraction #

+#########################

+

+class _ISOReader:

+    def __init__(self, location):

+        self._location = location

+

+    def grabFile(self, url):

+        raise NotImplementedError()

+    def hasFile(self, url):

+        raise NotImplementedError()

+

+

+class _ISOinfoReader(_ISOReader):

+    """

+    Handle reading reading files off an iso

+    """

+    def __init__(self, location):

+        super().__init__(location)

+        self._cache_file_list = self._make_file_list()

+

+    def _make_file_list(self):

+        cmd = ["isoinfo", "-J", "-i", self._location, "-f"]

+

+        log.debug("Running isoinfo: %s", cmd)

+        output = subprocess.check_output(cmd, stderr=subprocess.DEVNULL)

+        return output.splitlines(False)

+

+    def grabFile(self, url):

+        cmd = ["isoinfo", "-J", "-i", self._location, "-x", url]

+

+        log.debug("Running isoinfo: %s", cmd)

+        return subprocess.check_output(cmd)

+

+    def hasFile(self, url):

+        return url.encode("ascii") in self._cache_file_list

+

+

 ###########################

 # Fetcher implementations #

 ###########################

@@ -302,39 +341,32 @@ class _LocalURLFetcher(_URLFetcher):

 class _ISOURLFetcher(_URLFetcher):

-    _cache_file_list = None

+    _isoreader = None

     _is_iso = True

     def _make_full_url(self, filename):

         return os.path.join("/", filename)

+    def _get_isoreader(self):

+        if not self._isoreader:

+            self._isoreader = _ISOinfoReader(self.location)

+        return self._isoreader

+

     def _grabber(self, url):

         """

         Use isoinfo to grab the file

         """

         if not self._hasFile(url):

-            raise RuntimeError("isoinfo didn't find file=%s" % url)

-

-        cmd = ["isoinfo", "-J", "-i", self.location, "-x", url]

-

-        log.debug("Running isoinfo: %s", cmd)

-        output = subprocess.check_output(cmd)

+            raise RuntimeError("iso doesn't have file=%s" % url)

+        output = self._get_isoreader().grabFile(url)

         return io.BytesIO(output), len(output)

     def _hasFile(self, url):

         """

         Use isoinfo to list and search for the file

         """

-        if not self._cache_file_list:

-            cmd = ["isoinfo", "-J", "-i", self.location, "-f"]

-

-            log.debug("Running isoinfo: %s", cmd)

-            output = subprocess.check_output(cmd, stderr=subprocess.DEVNULL)

-

-            self._cache_file_list = output.splitlines(False)

-

-        return url.encode("ascii") in self._cache_file_list

+        return self._get_isoreader().hasFile(url)

 class DirectFetcher(_URLFetcher):

-- 

2.31.1