Skip to content

Update backups and shortcut sync so will not fail on "None" in array #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amdoolittle wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update backups and shortcut sync so will not fail on "None" in array #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ice/backups.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
1 change: 1 addition & 0 deletions ice/steam_shortcut_synchronizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down