Merge branch 'main' into libadwaita-1.4

src/importer/sources/bottles_source.py

@@ -19,7 +19,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from pathlib import Path
-from time import time
 from typing import NamedTuple
 
 import yaml
@@ -38,17 +37,17 @@ class BottlesSourceIterable(SourceIterable):
 
         data = self.source.locations.data["library.yml"].read_text("utf-8")
         library: dict = yaml.safe_load(data)
-        added_time = int(time())
 
         for entry in library.values():
             # Build game
             values = {
                 "source": self.source.source_id,
-                "added": added_time,
+                "added": shared.import_time,
                 "name": entry["name"],
                 "game_id": self.source.game_id_format.format(game_id=entry["id"]),
-                "executable": self.source.executable_format.format(
-                    bottle_name=entry["bottle"]["name"], game_name=entry["name"]
+                "executable": self.source.make_executable(
+                    bottle_name=entry["bottle"]["name"],
+                    game_name=entry["name"],
                 ),
             }
             game = Game(values)
@@ -73,7 +72,6 @@ class BottlesSourceIterable(SourceIterable):
                 image_path = bottles_location / bottle_path / "grids" / image_name
                 additional_data = {"local_image_path": image_path}
 
-            # Produce game
             yield (game, additional_data)