Fix width for --noweekend option of calw and calm#826
Merged
dbarnett merged 1 commit intoinsanum:mainfrom Jan 29, 2025
Merged
Conversation
day_width was calculated assuming 7 days a week. This is not correct when noweekend is set. days was already calculated in _GraphEvents, so move it to instance level and set it in __init__ and use it to calculate the correct width.
Collaborator
|
Thanks for the fix! |
Contributor
Author
Thanks for the quick merge, and happy to contribute, it's a great tool! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This pull request fixes calculating the width when calw/calm is used with the option
--noweekendDetails
The
day_widthwas calculated assuming 7 days a week. This is of course not correct when--noweekendis set. The variabledayswas already calculated in_GraphEvents, so move it to instance level and set it in__init__()and use it to calculate the correct width.Note that this issue already existed before the width argument was fixed in #825 : e0e126e#diff-bdae32b0ae73657fd85ec3f881c2bcce2a0bfa93febd682ccc2febbb711e9cb6L150
Output before
Using a terminal width of 106 for which can completely fill both for 5 days (
5*20+6 = 106) and 7 days (7*14+8 = 106).Output after