screenshots: Completely unhardcode architecture

Don't assume screenshots/x86_64 is present, validate what you have at
hand instead. This should also catch issues if appstream ends up being
different for each arch.

Author: barthalion

flatpak_builder_lint/checks/screenshots.py

@@ -53,23 +53,6 @@ def check_repo(self, path: str) -> None:
                 self.errors.add("appstream-missing-screenshots")
                 return
 
-            arches = {ref.split("/")[2] for ref in refs if len(ref.split("/")) == 4}
-            for arch in arches:
-                if f"screenshots/{arch}" not in refs:
-                    self.errors.add("appstream-screenshots-not-mirrored-in-ostree")
-                    return
-
-            ostree_screenshots_cmd = ostree.cli(path, "ls", "-R", "screenshots/x86_64")
-            if ostree_screenshots_cmd["returncode"] != 0:
-                raise RuntimeError("Failed to list screenshots")
-
-            ostree_screenshots = []
-            for ostree_screenshot in ostree_screenshots_cmd["stdout"].splitlines():
-                mode, _, _, _, ostree_screenshot_filename = ostree_screenshot.split()
-                if mode[0] != "-":
-                    continue
-                ostree_screenshots.append(ostree_screenshot_filename[1:])
-
             for screenshot in screenshots:
                 if screenshot.attrib.get("type") != "source":
                     if not screenshot.text.startswith(
@@ -78,9 +61,28 @@ def check_repo(self, path: str) -> None:
                         self.errors.add("appstream-external-screenshot-url")
                         return
 
-                    screenshot_filename = "/".join(screenshot.text.split("/")[5:])
-                    if f"{screenshot_filename}" not in ostree_screenshots:
-                        self.warnings.add(
-                            "appstream-screenshots-files-not-found-in-ostree"
-                        )
-                        return
+            arches = {ref.split("/")[2] for ref in refs if len(ref.split("/")) == 4}
+            for arch in arches:
+                if f"screenshots/{arch}" not in refs:
+                    self.errors.add("appstream-screenshots-not-mirrored-in-ostree")
+                    return
+
+                ostree_screenshots_cmd = ostree.cli(path, "ls", "-R", "screenshots/{arch}")
+                if ostree_screenshots_cmd["returncode"] != 0:
+                    raise RuntimeError("Failed to list screenshots")
+
+                ostree_screenshots = []
+                for ostree_screenshot in ostree_screenshots_cmd["stdout"].splitlines():
+                    mode, _, _, _, ostree_screenshot_filename = ostree_screenshot.split()
+                    if mode[0] != "-":
+                        continue
+                    ostree_screenshots.append(ostree_screenshot_filename[1:])
+
+                for screenshot in screenshots:
+                    if screenshot.attrib.get("type") != "source":
+                        screenshot_filename = "/".join(screenshot.text.split("/")[5:])
+                        if f"{screenshot_filename}" not in ostree_screenshots:
+                            self.warnings.add(
+                                "appstream-screenshots-files-not-found-in-ostree"
+                            )
+                            return

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "flatpak_builder_lint"
-version = "2.0.20"
+version = "2.0.21"
 description = "A linter for flatpak-builder manifests"
 authors = ["Bartłomiej Piotrowski <b@bpiotrowski.pl>"]
 license = "MIT"