Skip to content

shortcuts: do not escape commas in service shortcuts #555

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
bmrips wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

shortcuts: do not escape commas in service shortcuts #555

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
12 changes: 4 additions & 8 deletions modules/shortcuts.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,26 +93,22 @@
mkGlobalShortcutFor =
group: _action: skey:
let
# Keys are expected to be a list:
keys =
if !builtins.isList skey then
[ skey ]
else if skey == [ ] then
[ "none" ]
else
skey;

# Don't allow un-escaped commas:
escape = lib.escape [ "," ];
keysStr = builtins.concatStringsSep "\t" (map escape keys);
mkKeysString = lib.concatStringsSep "\t";
in

# If the shortcut is not in the "services" group, we have to sanitize it.
# If the shortcut is not in the "services" group, we have to sanitise it.
if lib.hasPrefix "services/" group then
keysStr
mkKeysString keys
else
lib.concatStringsSep "," [
keysStr
(mkKeysString (map (lib.escape [ "," ]) keys))
"" # List of default keys, not needed.
"" # Display string, not needed.
];
Expand Down
Loading