sources: transform() is only used in the curl sources, remove from ABC

osbuild/sources.py

@@ -4,7 +4,7 @@ import hashlib
 import json
 import os
 import tempfile
-from typing import ClassVar, Dict, Tuple
+from typing import ClassVar, Dict
 
 from . import host
 from .objectstore import ObjectStore
@@ -105,11 +105,6 @@ class SourceService(host.Service):
         """Returns True if the item to download is in cache. """
         return os.path.isfile(f"{self.cache}/{checksum}")
 
-    # pylint: disable=[no-self-use]
-    def transform(self, checksum, desc) -> Tuple:
-        """Modify the input data before downloading. By default only transforms an item object to a Tupple."""
-        return checksum, desc
-
     @staticmethod
     def load_items(fds):
         with os.fdopen(fds.steal(0)) as f:

sources/org.osbuild.containers-storage

@@ -13,7 +13,6 @@ by osbuild itself.
 Buildhost commands used: `skopeo`.
 """
 
-import concurrent.futures
 import hashlib
 import subprocess as sp
 import sys
@@ -66,11 +65,8 @@ class ContainersStorageSource(sources.SourceService):
         self.exists(checksum, desc)
 
     def fetch_all(self, items) -> None:
-        # prepare each item as a (checksum, desc) tuple (where desc=None)
-        transformed = map(lambda i: self.transform(i, None), items)
-        with concurrent.futures.ThreadPoolExecutor(max_workers=self.max_workers) as executor:
-            for _ in executor.map(self.fetch_one, *zip(*transformed)):
-                pass
+        for checksum in items:
+            self.fetch_one(checksum, None)
 
     def exists(self, checksum, _) -> bool:
         image_id = checksum.split(":")[1]

sources/org.osbuild.inline

@@ -59,9 +59,8 @@ class InlineSource(sources.SourceService):
 
     def fetch_all(self, items: Dict) -> None:
         filtered = filter(lambda i: not self.exists(i[0], i[1]), items.items())  # discards items already in cache
-        transformed = map(lambda i: self.transform(i[0], i[1]), filtered)  # prepare each item to be downloaded
 
-        for args in transformed:
+        for args in filtered:
             self.fetch_one(*args)
 
     def fetch_one(self, checksum, desc):

sources/org.osbuild.ostree

@@ -91,10 +91,9 @@ class OSTreeSource(sources.SourceService):
 
     def fetch_all(self, items: Dict) -> None:
         filtered = filter(lambda i: not self.exists(i[0], i[1]), items.items())  # discards items already in cache
-        transformed = map(lambda i: self.transform(i[0], i[1]), filtered)  # prepare each item to be downloaded
 
         with concurrent.futures.ThreadPoolExecutor(max_workers=self.max_workers) as executor:
-            for _ in executor.map(self.fetch_one, *zip(*transformed)):
+            for _ in executor.map(self.fetch_one, *zip(*filtered)):
                 pass
 
     def fetch_one(self, checksum, desc):

sources/org.osbuild.skopeo

@@ -104,10 +104,9 @@ class SkopeoSource(sources.SourceService):
 
     def fetch_all(self, items: Dict) -> None:
         filtered = filter(lambda i: not self.exists(i[0], i[1]), items.items())  # discards items already in cache
-        transformed = map(lambda i: self.transform(i[0], i[1]), filtered)  # prepare each item to be downloaded
 
         with concurrent.futures.ThreadPoolExecutor(max_workers=self.max_workers) as executor:
-            for _ in executor.map(self.fetch_one, *zip(*transformed)):
+            for _ in executor.map(self.fetch_one, *zip(*filtered)):
                 pass
 
     def fetch_one(self, checksum, desc):

sources/org.osbuild.skopeo-index

@@ -89,10 +89,9 @@ class SkopeoIndexSource(sources.SourceService):
 
     def fetch_all(self, items: Dict) -> None:
         filtered = filter(lambda i: not self.exists(i[0], i[1]), items.items())  # discards items already in cache
-        transformed = map(lambda i: self.transform(i[0], i[1]), filtered)  # prepare each item to be downloaded
 
         with concurrent.futures.ThreadPoolExecutor(max_workers=self.max_workers) as executor:
-            for _ in executor.map(self.fetch_one, *zip(*transformed)):
+            for _ in executor.map(self.fetch_one, *zip(*filtered)):
                 pass
 
     def fetch_one(self, checksum, desc):