Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Refactoring/dry #224

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[WIP] Refactoring/dry #224

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d640e08
DRY
mondaini Oct 27, 2018
6ec5036
Merge branch 'master' of https://github.com/yoda-pa/yoda into refacto…
mondaini Oct 27, 2018
1b24024
Merge branch 'master' into refactoring/dry
mondaini Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
218 changes: 80 additions & 138 deletions modules/diary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,41 +300,83 @@ def complete_task():
)


def _date_task_number(list_of_files):
not_valid_date_number = 1
click.echo("Select the date:- \n")
click.echo("--------------------")
click.echo("Number | Date ")
click.echo("--------------------")
for i, some_file in enumerate(range(0, len(list_of_files))):
click.echo(str(i) + " |" + list_of_files[some_file][0:10])
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

for i, some_file in enumerate(list_of_files):
    click.echo(str(i) + "      |" + some_file[:10])

while not_valid_date_number:
click.echo(chalk.blue("Enter the number to select the date"))
selected_date = int(input())
if selected_date > len(list_of_files):
click.echo(chalk.red("Please Enter a valid date number!"))
else:
SELECTED_DATE_PATH = os.path.join(
DIARY_CONFIG_FOLDER_PATH + "/" + list_of_files[selected_date - 1]
)
with open(SELECTED_DATE_PATH) as selected_task:
contents = yaml.load(selected_task)
click.echo("\nTasks for " + list_of_files[some_file][0:10])
click.echo("-----------------------")
click.echo("Number | Time | Task")
click.echo("-------|---------|-----")
for i, entry in enumerate(contents["entries"]):
time = entry["time"]
text = entry["text"] + " " + entry.get("hashtags", "")
text = text if entry["status"] == 0 else strike(text)
click.echo(" " + str(i) + " | " + time + ": " + text)
not_valid_date_number = 0


def _date_note_number(list_of_files):
not_valid_date_number = 1
contents = None
SELECTED_DATE_PATH = None

click.echo("Select the date:- \n")
click.echo("--------------------")
click.echo("Number | Date ")
click.echo("--------------------")
for i, some_file in enumerate(range(0, len(list_of_files))):
click.echo(str(i) + " |" + list_of_files[some_file][0:10])
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above?

while not_valid_date_number:
click.echo(chalk.blue("Enter the number to select the date"))
selected_date = int(input())
if selected_date > len(list_of_files):
click.echo(chalk.red("Please Enter a valid Date number!"))
else:
SELECTED_DATE_PATH = os.path.join(
DIARY_CONFIG_FOLDER_PATH + "/" + list_of_files[selected_date - 1]
)
with open(SELECTED_DATE_PATH) as selected_note:
contents = yaml.load(selected_note)
click.echo("\nNotes for " + list_of_files[some_file][0:10])
click.echo("----------------")
click.echo("Number | Time | Title | Text")
click.echo("-------|---------|------------|-----")
for i, entry in enumerate(contents["entries"]):
entry["index"] = str(i)
time = entry["time"]
note_title = entry["title"]
text = entry["text"]
click.echo(
"{index} |{time} | {title} | {text}".format(**entry)
)
not_valid_date_number = 0
return contents, SELECTED_DATE_PATH


def delete_task():
"""
delete a particular task
"""
delete a particular task
"""
list_of_files = list_of_tasks_files()
if list_of_files:
not_valid_task_number = 1
not_valid_date_number = 1
click.echo("Select the date:- \n")
click.echo("--------------------")
click.echo("Number | Date ")
click.echo("--------------------")
for i, some_file in enumerate(range(0, len(list_of_files))):
click.echo(str(i) + " |" + list_of_files[some_file][0:10])
while not_valid_date_number:
click.echo(chalk.blue("Enter the number to select the date"))
selected_date = int(input())
if selected_date > len(list_of_files):
click.echo(chalk.red("Please Enter a valid task number!"))
else:
SELECTED_DATE_PATH = os.path.join(
DIARY_CONFIG_FOLDER_PATH + "/" + list_of_files[selected_date - 1]
)
with open(SELECTED_DATE_PATH) as selected_task:
contents = yaml.load(selected_task)
click.echo("\nTasks for " + list_of_files[some_file][0:10])
click.echo("----------------")
click.echo("Number | Time | Task")
click.echo("-------|---------|-----")
for i, entry in enumerate(contents["entries"]):
time = entry["time"]
text = entry["text"] + " " + entry.get("hashtags", "")
text = text if entry["status"] == 0 else strike(text)
click.echo(" " + str(i) + " | " + time + ": " + text)
not_valid_date_number = 0
_date_task_number(list_of_files)
while not_valid_task_number:
click.echo(
chalk.blue("Enter the task number that you would like to delete")
Expand All @@ -353,49 +395,13 @@ def delete_task():


def delete_note():

"""
delete a particular note
"""
delete a particular note
"""
list_of_files = list_of_notes_files()
if list_of_files:
not_valid_note_number = 1
not_valid_date_number = 1
click.echo("Select the date:- \n")
click.echo("--------------------")
click.echo("Number | Date ")
click.echo("--------------------")
for i, some_file in enumerate(range(0, len(list_of_files))):
click.echo(str(i) + " |" + list_of_files[some_file][0:10])
while not_valid_date_number:
click.echo(chalk.blue("Enter the number to select the date"))
selected_date = int(input())
if selected_date > len(list_of_files):
click.echo(chalk.red("Please Enter a valid Date number!"))
else:
SELECTED_DATE_PATH = os.path.join(
DIARY_CONFIG_FOLDER_PATH + "/" + list_of_files[selected_date - 1]
)
with open(SELECTED_DATE_PATH) as selected_note:
contents = yaml.load(selected_note)
click.echo("\nNotes for " + list_of_files[some_file][0:10])
click.echo("----------------")
click.echo("Number | Time | Title | Text")
click.echo("-------|---------|------------|-----")
for i, entry in enumerate(contents["entries"]):
time = entry["time"]
note_title = entry["title"]
text = entry["text"]
click.echo(
str(i)
+ " |"
+ time
+ " | "
+ note_title
+ " | "
+ text
)
not_valid_date_number = 0
contents, SELECTED_DATE_PATH = _date_note_number(list_of_files)
while not_valid_note_number:
click.echo(
chalk.blue("Enter the note number that you would like to delete")
Expand Down Expand Up @@ -625,40 +631,12 @@ def get_task_info(timestamp, date):

def update_task():
"""
update a particular task
"""

update a particular task
"""
list_of_files = list_of_tasks_files()
if list_of_files:
not_valid_task_number = 1
not_valid_date_number = 1
click.echo("Select the date:- \n")
click.echo("--------------------")
click.echo("Number | Date ")
click.echo("--------------------")
for i, some_file in enumerate(range(0, len(list_of_files))):
click.echo(str(i) + " |" + list_of_files[some_file][0:10])
while not_valid_date_number:
click.echo(chalk.blue("Enter the number to select the date"))
selected_date = int(input())
if selected_date > len(list_of_files):
click.echo(chalk.red("Please Enter a valid date number!"))
else:
SELECTED_DATE_PATH = os.path.join(
DIARY_CONFIG_FOLDER_PATH + "/" + list_of_files[selected_date - 1]
)
with open(SELECTED_DATE_PATH) as selected_task:
contents = yaml.load(selected_task)
click.echo("\nTasks for " + list_of_files[some_file][0:10])
click.echo("-----------------------")
click.echo("Number | Time | Task")
click.echo("-------|---------|-----")
for i, entry in enumerate(contents["entries"]):
time = entry["time"]
text = entry["text"] + " " + entry.get("hashtags", "")
text = text if entry["status"] == 0 else strike(text)
click.echo(" " + str(i) + " | " + time + ": " + text)
not_valid_date_number = 0
_date_task_number(list_of_files)
while not_valid_task_number:
click.echo(
chalk.blue("Enter the task number that you would like to update")
Expand Down Expand Up @@ -686,42 +664,7 @@ def update_note():
list_of_files = list_of_notes_files()
if list_of_files:
not_valid_note_number = 1
not_valid_date_number = 1
click.echo("Select the date:- \n")
click.echo("--------------------")
click.echo("Number | Date ")
click.echo("--------------------")
for i, some_file in enumerate(range(0, len(list_of_files))):
click.echo(str(i) + " |" + list_of_files[some_file][0:10])
while not_valid_date_number:
click.echo(chalk.blue("Enter the number to select the date"))
selected_date = int(input())
if selected_date > len(list_of_files):
click.echo(chalk.red("Please Enter a valid Date number!"))
else:
SELECTED_DATE_PATH = os.path.join(
DIARY_CONFIG_FOLDER_PATH + "/" + list_of_files[selected_date - 1]
)
with open(SELECTED_DATE_PATH) as selected_note:
contents = yaml.load(selected_note)
click.echo("\nNotes for " + list_of_files[some_file][0:10])
click.echo("------------------------------------")
click.echo("Number | Time | Title | Text")
click.echo("-------|---------|------------|-----")
for i, entry in enumerate(contents["entries"]):
time = entry["time"]
note_title = entry["title"]
text = entry["text"]
click.echo(
str(i)
+ " |"
+ time
+ " | "
+ note_title
+ " | "
+ text
)
not_valid_date_number = 0
contents, SELECTED_DATE_PATH = _date_note_number(list_of_files)
while not_valid_note_number:
click.echo(
chalk.blue("Enter the note number that you would like to update")
Expand All @@ -734,8 +677,7 @@ def update_note():
click.echo(chalk.blue("Enter the new text"))
new_note = input()
contents["entries"][note_to_be_updated - 1]["text"] = new_note
input_data(contents, TODAYS_NOTES_ENTRY_FILE_PATH)

input_data(contents, SELECTED_DATE_PATH)
else:
click.echo(
chalk.red('There are no tasks. Add a new task by entering "yoda diary nt"')
Expand Down