From 58d144120d2af52e7a9d9e50f7f4a71b13e02b35 Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Thu, 17 Oct 2024 13:50:51 +0330 Subject: [PATCH 1/5] doc : AUTHORS.md updated --- AUTHORS.md | 4 ++++ README.md | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/AUTHORS.md b/AUTHORS.md index a5d1c55..79308cf 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -6,5 +6,9 @@ # Other Contributors ---------- +- [@sarahfard](https://github.com/sarahfard) ** - [@oscarArismendi](https://github.com/oscarArismendi) + +** Graphic designer + diff --git a/README.md b/README.md index d2a7131..0f49066 100644 --- a/README.md +++ b/README.md @@ -150,7 +150,6 @@ You can also join our discord server
13- Pranayama Breathing Techniques and Tips
-* Logo designed by [Sara Amiri Fard](https://github.com/sarahfard) ## Show Your Support From a0c0b53f4724524d696247096a71b9081b4234c6 Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Thu, 17 Oct 2024 13:54:14 +0330 Subject: [PATCH 2/5] fix : minutes and seconds templates moved to params.py --- nafas/functions.py | 7 ++++--- nafas/params.py | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nafas/functions.py b/nafas/functions.py index 4aa416c..082a5d4 100644 --- a/nafas/functions.py +++ b/nafas/functions.py @@ -5,6 +5,7 @@ from nafas.params import NAFAS_DESCRIPTION, NAFAS_NOTICE, STANDARD_MENU, STANDARD_MENU_ORDER, STEP_MAP from nafas.params import PROGRAMS, PROGRAM_DESCRIPTION, SOUND_MAP, STEP_TEMPLATE, CYCLE_TEMPLATE from nafas.params import SOUND_WARNING_MESSAGE, EXIT_MESSAGE +from nafas.params import MINUTES_TEMPLATE, SECONDS_TEMPLATE import nava import os from warnings import warn @@ -67,13 +68,13 @@ def time_convert(input_time, average=False): _hours, sec = divmod(sec, 3600) minutes, sec = divmod(sec, 60) result = ", ".join([ - "{:02.0f} minutes".format(minutes), - "{:02.0f} seconds".format(sec), + MINUTES_TEMPLATE.format(minutes), + SECONDS_TEMPLATE.format(sec), ]) if average: if sec >= 30: minutes += 1 - result = "{:02.0f} minutes".format(minutes).lstrip("0") + result = MINUTES_TEMPLATE.format(minutes).lstrip("0") return result diff --git a/nafas/params.py b/nafas/params.py index 691be22..750092e 100644 --- a/nafas/params.py +++ b/nafas/params.py @@ -35,6 +35,10 @@ Sequence : {4} """ +MINUTES_TEMPLATE = "{:02.0f} minutes" + +SECONDS_TEMPLATE = "{:02.0f} seconds" + CYCLE_TEMPLATE = "Cycle : {0} (Remaining : {1})" STEP_TEMPLATE = "- {0} for {1} sec" From 61718d5749b660fcf12d5ea6e656c98bf4c62e9f Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Thu, 17 Oct 2024 14:01:14 +0330 Subject: [PATCH 3/5] fix : messages moved to params.py --- nafas/functions.py | 14 +++++++------- nafas/params.py | 10 ++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/nafas/functions.py b/nafas/functions.py index 082a5d4..3506333 100644 --- a/nafas/functions.py +++ b/nafas/functions.py @@ -4,8 +4,8 @@ import time from nafas.params import NAFAS_DESCRIPTION, NAFAS_NOTICE, STANDARD_MENU, STANDARD_MENU_ORDER, STEP_MAP from nafas.params import PROGRAMS, PROGRAM_DESCRIPTION, SOUND_MAP, STEP_TEMPLATE, CYCLE_TEMPLATE -from nafas.params import SOUND_WARNING_MESSAGE, EXIT_MESSAGE -from nafas.params import MINUTES_TEMPLATE, SECONDS_TEMPLATE +from nafas.params import SOUND_WARNING_MESSAGE, EXIT_MESSAGE, BAD_INPUT_MESSAGE, PROGRAM_END_MESSAGE +from nafas.params import MINUTES_TEMPLATE, SECONDS_TEMPLATE, PROGRAM_TIME_TEMPLATE, MENU_TEMPLATE_1, MENU_TEMPLATE_2 import nava import os from warnings import warn @@ -210,14 +210,14 @@ def get_input_standard(input_func=input): for item in STANDARD_MENU_ORDER: exit_flag = False sorted_list = sorted(STANDARD_MENU[item]) - print("- Please choose a {0} : \n".format(item)) + print(MENU_TEMPLATE_1.format(item)) for i in sorted_list: if item == "program": program_name = STANDARD_MENU[item][i] program_average_time = time_average_calc(PROGRAMS[program_name]) - print("{0}- {1} (~ {2})".format(i, program_name, time_convert(program_average_time, True))) + print(PROGRAM_TIME_TEMPLATE.format(i, program_name, time_convert(program_average_time, True))) else: - print("{0}- {1}".format(i, STANDARD_MENU[item][i])) + print(MENU_TEMPLATE_2.format(i, STANDARD_MENU[item][i])) while not exit_flag: try: input_data[item] = int(input_func("")) @@ -226,7 +226,7 @@ def get_input_standard(input_func=input): print("\n" + EXIT_MESSAGE) sys.exit() except Exception: - print("[Error] Bad Input!") + print(BAD_INPUT_MESSAGE) return input_data @@ -329,7 +329,7 @@ def run(program_data, silent=False): time.sleep(1) line() play_sound(get_sound_path(SOUND_MAP['End']), enable=sound_check_flag) - print("Well done!", flush=True) + print(PROGRAM_END_MESSAGE, flush=True) time.sleep(2) diff --git a/nafas/params.py b/nafas/params.py index 750092e..4a16680 100644 --- a/nafas/params.py +++ b/nafas/params.py @@ -22,6 +22,10 @@ EXIT_MESSAGE = "See you. Bye!" +BAD_INPUT_MESSAGE = "[Error] Bad input!" + +PROGRAM_END_MESSAGE = "Well done!" + PROGRAM_DESCRIPTION = """Program Details : Name : {0} @@ -39,6 +43,12 @@ SECONDS_TEMPLATE = "{:02.0f} seconds" +PROGRAM_TIME_TEMPLATE = "{0}- {1} (~ {2})" + +MENU_TEMPLATE_1 = "- Please choose a {0} : \n" + +MENU_TEMPLATE_2 = "{0}- {1}" + CYCLE_TEMPLATE = "Cycle : {0} (Remaining : {1})" STEP_TEMPLATE = "- {0} for {1} sec" From c2c0e49251f66a5dbc701e7bfb825c313f93f25b Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Thu, 17 Oct 2024 14:02:08 +0330 Subject: [PATCH 4/5] doc : CHANGELOG.md updated --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 847a0f6..d48db74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - Restart mode updated - Exit bug fixed +- Messages and templates moved to `params.py` ## [0.7] - 2024-08-27 ### Added - `feature_request.yml` template From 8e4bc8465a32b3dfe822cf509f7d2511754b974e Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Tue, 22 Oct 2024 14:17:49 +0330 Subject: [PATCH 5/5] fix : functions.py import section modified --- nafas/functions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nafas/functions.py b/nafas/functions.py index 3506333..db95a68 100644 --- a/nafas/functions.py +++ b/nafas/functions.py @@ -5,7 +5,8 @@ from nafas.params import NAFAS_DESCRIPTION, NAFAS_NOTICE, STANDARD_MENU, STANDARD_MENU_ORDER, STEP_MAP from nafas.params import PROGRAMS, PROGRAM_DESCRIPTION, SOUND_MAP, STEP_TEMPLATE, CYCLE_TEMPLATE from nafas.params import SOUND_WARNING_MESSAGE, EXIT_MESSAGE, BAD_INPUT_MESSAGE, PROGRAM_END_MESSAGE -from nafas.params import MINUTES_TEMPLATE, SECONDS_TEMPLATE, PROGRAM_TIME_TEMPLATE, MENU_TEMPLATE_1, MENU_TEMPLATE_2 +from nafas.params import MINUTES_TEMPLATE, SECONDS_TEMPLATE, PROGRAM_TIME_TEMPLATE +from nafas.params import MENU_TEMPLATE_1, MENU_TEMPLATE_2 import nava import os from warnings import warn