Add configurable first day of the week #294
Closed
Conversation
This file contains 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
sandrobonazzola
force-pushed
the
issue_293
branch
from
75af2a3
to
916b30e
Compare
|
@sandrobonazzola thank you for this PR. Can you please add tests to it? |
Fixes psss#293 Signed-off-by: Sandro Bonazzola <[email protected]>
Signed-off-by: Sandro Bonazzola <[email protected]>
sandrobonazzola
force-pushed
the
issue_293
branch
from
916b30e
to
d74d90c
Compare
@kwk done |
kwk
requested changes
Feb 27, 2023
| @@ -267,7 +281,7 @@ def test_get_token_plain_different_name(self): | |||
| token = str(uuid4()) | |||
| config = {"mytoken": token} | |||
| self.assertIsNone(get_token(config)) | |||
| self.assertEqual(get_token(config, token_key="mytoken"), token) | |||
| self.assertEqual(get_token(config, token_key="mytoken"), token) # nosec | |||
There was a problem hiding this comment.
I think this slipped in from your other PR #297 .
Suggested change
| self.assertEqual(get_token(config, token_key="mytoken"), token) # nosec | |
| self.assertEqual(get_token(config, token_key="mytoken"), token) |
| @@ -278,7 +292,7 @@ def test_get_token_file(self): | |||
|
|
|||
| def test_get_token_file_empty(self): | |||
| """ Test getting a token from a file with just whitespace. """ | |||
| token_in_file = " " | |||
| token_in_file = " " # nosec | |||
There was a problem hiding this comment.
I think this slipped in from your other PR #297 .
Suggested change
| token_in_file = " " # nosec | |
| token_in_file = " " |
| @@ -296,7 +310,7 @@ def test_get_token_file_different_name(self): | |||
| token_in_file = str(uuid4()) | |||
| with self.get_token_as_file(token_in_file) as filename: | |||
| config = {"mytoken_file": filename} | |||
| self.assertEqual( | |||
| self.assertEqual( # nosec | |||
There was a problem hiding this comment.
I think this slipped in from your other PR #297 .
Suggested change
| self.assertEqual( # nosec | |
| self.assertEqual( |
| @@ -125,6 +124,17 @@ def quarter(self): | |||
| f"Invalid quarter start '{month}', should be integer.") | |||
| return month | |||
|
|
|||
| @property | |||
| def week(self): | |||
There was a problem hiding this comment.
Why is this called week when it is really the first day of the week?
Suggested change
| def week(self): | |
| def first_day_of_week(self) -> int: |
| """ The first day of the week, 0 (Monday) by default""" | ||
| week = self.parser.get("general", "week", fallback=0) | ||
| try: | ||
| week = int(week) % 7 |
There was a problem hiding this comment.
I would suggest to have a string in the config rather than an int. Transferring to an int internally is fine though. I think of something like this:
#!/bin/env python
WEEKDAYS = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
config_first_day_of_week = "WednES"
# Default first day of the week:
first_day_of_week = 0
# This should allow anything from: "Mon", "mon", "mond", "monda", "monday", "MON",
# but not "mo", "MO" or "M" because it is too short.
if len(config_first_day_of_week) > 3:
for idx, weekday in enumerate(WEEKDAYS):
if weekday.lower().startswith(config_first_day_of_week.lower()):
first_day_of_week = idx
print(first_day_of_week)
|
Sorry, no time to keep working on this, abandoning |
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.
Fixes #293
Add configurable first day of the week:
Signed-off-by: Sandro Bonazzola [email protected]