Commit 373e93dd authored by Jan Tojnar's avatar Jan Tojnar
Browse files

gnomeExtensions/update: Simplify collision calculation 

- Use meaningful variable names in list comprehensions.
- Remove redundant comments.
- Use `setdefault` instead of conditional assignment.
- Move the filtering into the returned list comprehension.
- Rename intermediary variable since we are now filtering in the return statement.
parent 4bd50116

pkgs/desktops/gnome/extensions/update-extensions.py

+9 −11
Original line number Diff line number Diff line
@@ -345,21 +345,19 @@ def find_collisions( 
    versions: list[str],

) -> dict[PackageName, list[Uuid]]:

    package_name_registry_for_versions = [

        v for k, v in package_name_registry.items() if k in versions

        package_name_registry

        for version, package_name_registry in package_name_registry.items()

        if version in versions

    ]

    # Merge all package names into a single dictionary

    package_name_registry_filtered: dict[PackageName, set[Uuid]] = {}

    package_name_registry_merged: dict[PackageName, set[Uuid]] = {}

    for pkgs in package_name_registry_for_versions:

        for pname, uuids in pkgs.items():

            if pname not in package_name_registry_filtered:

                package_name_registry_filtered[pname] = set()

            package_name_registry_filtered[pname].update(uuids)

    # Filter out those that are not duplicates

    package_name_registry_filtered = {

        k: v for k, v in package_name_registry_filtered.items() if len(v) > 1

            package_name_registry_merged.setdefault(pname, set()).update(uuids)

    return {

        pname: list(uuids)

        for pname, uuids in package_name_registry_merged.items()

        if len(uuids) > 1

    }

    # Convert set to list

    return {k: list(v) for k, v in package_name_registry_filtered.items()}





def main() -> None: