refactor: improve daemon / server code #85
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The most visible change in this PR is that I changed several function / variable names to improve clarity. I've also added some blank lines in between some lines of code.
Examples:
check_config_xdg()
->fetch_xdg_config_path()
check_keyboard()
->check_device_is_keyboard()
paused
->execution_is_paused
permission_check
is nowcheck_user_permissions
, and it now returns aResult<T, E>
as opposed to exiting the program within the function. I made it so that all calls toexit()
are infn main()
so that contributors can follow the logic of the program better.The
send_command
function was defined inmain
. I moved it outside as function definitions shouldn't go inmain
.There was also improper indentation, which resulted in some unclean closing braces in
main
:Peculiarly, the second line below is inside the
Some((i, Ok(event)))
block yet they're of the same indentation.I found that a large part of the code was under an if let block,
if let InputEventKind::Key(key) = event.kind()
. I turned the if let into a simple guard clause to fix the indentation.