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/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 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 diff --git a/nafas/functions.py b/nafas/functions.py index 4aa416c..db95a68 100644 --- a/nafas/functions.py +++ b/nafas/functions.py @@ -4,7 +4,9 @@ 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 SOUND_WARNING_MESSAGE, EXIT_MESSAGE, BAD_INPUT_MESSAGE, PROGRAM_END_MESSAGE +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 @@ -67,13 +69,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 @@ -209,14 +211,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("")) @@ -225,7 +227,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 @@ -328,7 +330,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 691be22..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} @@ -35,6 +39,16 @@ Sequence : {4} """ +MINUTES_TEMPLATE = "{:02.0f} minutes" + +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"