From 0fc1073303b5b66e66d328fe36813b00ead9fa46 Mon Sep 17 00:00:00 2001 From: buzzCraft <67235613+buzzCraft@users.noreply.github.com> Date: Mon, 15 Mar 2021 17:44:17 +0100 Subject: [PATCH 1/4] Checking for ticker before calling view and candle --- terminal.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/terminal.py b/terminal.py index e30805c294c..ca674938bf8 100644 --- a/terminal.py +++ b/terminal.py @@ -119,12 +119,19 @@ def main(): main_cmd = True elif ns_known_args.opt == "candle": - candle( - s_ticker, (datetime.now() - timedelta(days=180)).strftime("%Y-%m-%d") - ) + if s_ticker: + candle( + s_ticker, (datetime.now() - timedelta(days=180)).strftime("%Y-%m-%d") + ) + else: + print("No ticker selected. Use 'load ticker' to load the ticker you want to look at.") + main_cmd = True elif ns_known_args.opt == "view": - view(l_args, s_ticker, s_start, s_interval, df_stock) + if s_ticker: + view(l_args, s_ticker, s_start, s_interval, df_stock) + else: + print("No ticker selected. Use 'load ticker' to load the ticker you want to look at.") main_cmd = True elif ns_known_args.opt == "export": From b39706d8732b71f31013cfa3c16f4daf226eb482 Mon Sep 17 00:00:00 2001 From: buzzCraft <67235613+buzzCraft@users.noreply.github.com> Date: Mon, 15 Mar 2021 17:55:20 +0100 Subject: [PATCH 2/4] Update terminal.py --- terminal.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/terminal.py b/terminal.py index ca674938bf8..d001dad2711 100644 --- a/terminal.py +++ b/terminal.py @@ -119,17 +119,21 @@ def main(): main_cmd = True elif ns_known_args.opt == "candle": + if s_ticker: candle( s_ticker, (datetime.now() - timedelta(days=180)).strftime("%Y-%m-%d") ) + else: print("No ticker selected. Use 'load ticker' to load the ticker you want to look at.") main_cmd = True elif ns_known_args.opt == "view": + if s_ticker: view(l_args, s_ticker, s_start, s_interval, df_stock) + else: print("No ticker selected. Use 'load ticker' to load the ticker you want to look at.") main_cmd = True From f2f2e15d9083dfabc55f1be5c35365dd9513f2d4 Mon Sep 17 00:00:00 2001 From: buzzCraft <67235613+buzzCraft@users.noreply.github.com> Date: Mon, 15 Mar 2021 19:24:37 +0100 Subject: [PATCH 3/4] Update terminal.py --- terminal.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/terminal.py b/terminal.py index d001dad2711..26bfa5b7277 100644 --- a/terminal.py +++ b/terminal.py @@ -122,20 +122,25 @@ def main(): if s_ticker: candle( - s_ticker, (datetime.now() - timedelta(days=180)).strftime("%Y-%m-%d") + s_ticker, + (datetime.now() - timedelta(days=180)).strftime("%Y-%m-%d"), ) - else: - print("No ticker selected. Use 'load ticker' to load the ticker you want to look at.") + else: + print( + "No ticker selected. Use 'load ticker' to load the ticker you want to look at." + ) main_cmd = True elif ns_known_args.opt == "view": if s_ticker: view(l_args, s_ticker, s_start, s_interval, df_stock) - - else: - print("No ticker selected. Use 'load ticker' to load the ticker you want to look at.") + + else: + print( + "No ticker selected. Use 'load ticker' to load the ticker you want to look at." + ) main_cmd = True elif ns_known_args.opt == "export": From fe75614887dbf404eaacc270a36d9f82b3736052 Mon Sep 17 00:00:00 2001 From: buzzCraft <67235613+buzzCraft@users.noreply.github.com> Date: Mon, 15 Mar 2021 20:30:17 +0100 Subject: [PATCH 4/4] Fixed the change request --- terminal.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/terminal.py b/terminal.py index 26bfa5b7277..0d114f028fa 100644 --- a/terminal.py +++ b/terminal.py @@ -130,7 +130,8 @@ def main(): print( "No ticker selected. Use 'load ticker' to load the ticker you want to look at." ) - main_cmd = True + + main_cmd = True elif ns_known_args.opt == "view":