From 58da7ef32b6416b74f71d5c10919316066b66314 Mon Sep 17 00:00:00 2001 From: Alex Doolittle Date: Sat, 21 Jul 2018 12:30:04 -0700 Subject: [PATCH] Update backups and shortcut sync so will not fail on "None" in array --- ice/backups.py | 5 +++-- ice/steam_shortcut_synchronizer.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ice/backups.py b/ice/backups.py index a6dac13..147968d 100644 --- a/ice/backups.py +++ b/ice/backups.py @@ -63,5 +63,6 @@ def _create_directory_if_needed(directory): # Make sure the user-specific backups dir exists _create_directory_if_needed(os.path.dirname(backup_path)) - - shortcuts.write_shortcuts(backup_path, shortcuts.get_shortcuts(user)) + + shortcuts_list = shortcuts.get_shortcuts(user) + shortcuts.write_shortcuts(backup_path, [x for x in shortcuts_list if x is not None]) diff --git a/ice/steam_shortcut_synchronizer.py b/ice/steam_shortcut_synchronizer.py index 492aa46..d5eb656 100644 --- a/ice/steam_shortcut_synchronizer.py +++ b/ice/steam_shortcut_synchronizer.py @@ -74,6 +74,7 @@ def sync_roms_for_user(self, user, users_roms, consoles, dry_run=False): previous_managed_ids = self.managed_rom_archive.previous_managed_ids(user) logger.debug("Previous managed ids: %s" % previous_managed_ids) current_shortcuts = shortcuts.get_shortcuts(user) + current_shortcuts = [x for x in current_shortcuts if x is not None] unmanaged_shortcuts = self.unmanaged_shortcuts(previous_managed_ids, current_shortcuts, consoles) logger.debug("Unmanaged shortcuts: %s" % unmanaged_shortcuts) current_ice_shortcuts = filter(lambda shortcut: shortcut not in unmanaged_shortcuts, current_shortcuts)