From 260bd9bc61fb669950e83448688923e323aaae09 Mon Sep 17 00:00:00 2001 From: Jake Zaia Date: Fri, 18 Oct 2019 17:34:21 -0400 Subject: [PATCH 1/2] Add EOF characters to right spot in ascii art files --- src/asciiArt/bat.txt | 2 +- src/asciiArt/dolphin.txt | 2 +- src/asciiArt/fish.txt | 2 +- src/asciiArt/llama.txt | 2 +- src/asciiArt/pig.txt | 2 +- src/asciiArt/python.txt | 2 +- src/asciiArt/roo.txt | 2 +- src/asciiArt/sheep.txt | 2 +- src/asciiArt/snake.txt | 2 +- src/asciiArt/squirrel.txt | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/asciiArt/bat.txt b/src/asciiArt/bat.txt index 4f368b9..285d10f 100644 --- a/src/asciiArt/bat.txt +++ b/src/asciiArt/bat.txt @@ -5,4 +5,4 @@ \_ / `;=/ " \=;` \ _/ `\__| \___/ |__/` \(_|_)/ - " ` " \ No newline at end of file + " ` " diff --git a/src/asciiArt/dolphin.txt b/src/asciiArt/dolphin.txt index 1d81e45..3f4bcc8 100644 --- a/src/asciiArt/dolphin.txt +++ b/src/asciiArt/dolphin.txt @@ -4,4 +4,4 @@ \' ~-`\._ |/~` . . . . . . . -._.`(._.`(_.`(._.`(._.`(._.`(._.`(._ \ No newline at end of file +._.`(._.`(_.`(._.`(._.`(._.`(._.`(._ diff --git a/src/asciiArt/fish.txt b/src/asciiArt/fish.txt index 1d52a9b..e6e8717 100644 --- a/src/asciiArt/fish.txt +++ b/src/asciiArt/fish.txt @@ -10,4 +10,4 @@ ) ) / `, .' ( ( `, .' ( ( }/ ) ) }/ ) ) ' ( ( ' -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \ No newline at end of file +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/asciiArt/llama.txt b/src/asciiArt/llama.txt index b6eea2a..5dc043c 100644 --- a/src/asciiArt/llama.txt +++ b/src/asciiArt/llama.txt @@ -4,4 +4,4 @@ // ** ll ll---ll\ llama~ ll ll || || - ^^ ^^ '' '' \ No newline at end of file + ^^ ^^ '' '' diff --git a/src/asciiArt/pig.txt b/src/asciiArt/pig.txt index 9971bc7..54172e9 100644 --- a/src/asciiArt/pig.txt +++ b/src/asciiArt/pig.txt @@ -7,4 +7,4 @@ "--.~~~ __/ { } \ } '"ii"/ \_ \ | __~ "; >" / / ""\ |" / / - ^^" ^^ ^^" \ No newline at end of file + ^^" ^^ ^^" diff --git a/src/asciiArt/python.txt b/src/asciiArt/python.txt index b74497e..fa8c413 100644 --- a/src/asciiArt/python.txt +++ b/src/asciiArt/python.txt @@ -10,4 +10,4 @@ \ \_/ ____ \ / \ \ / \ \ / /\\ \ / \ \/ / V - \_____/ \___/ \ No newline at end of file + \_____/ \___/ diff --git a/src/asciiArt/roo.txt b/src/asciiArt/roo.txt index 52d1823..c99db76 100644 --- a/src/asciiArt/roo.txt +++ b/src/asciiArt/roo.txt @@ -5,4 +5,4 @@ __/ _\ // '~( '~ )// _\ '}/ - \"--~(/ \ No newline at end of file + \"--~(/ diff --git a/src/asciiArt/sheep.txt b/src/asciiArt/sheep.txt index dde6f6f..8922e70 100644 --- a/src/asciiArt/sheep.txt +++ b/src/asciiArt/sheep.txt @@ -7,4 +7,4 @@ `. )._\ (\ |// `-,// ]|| //" - hjw "" "" \ No newline at end of file + hjw "" "" diff --git a/src/asciiArt/snake.txt b/src/asciiArt/snake.txt index 0cc2c30..ea0ef8a 100644 --- a/src/asciiArt/snake.txt +++ b/src/asciiArt/snake.txt @@ -11,4 +11,4 @@ (^^^^\ __ _,-'^^^^^`. _,'^^) \^^^^`._,-'^^`-._.'^^^^__^^^^ `--'^^^_/ \^^^^^ ^^^_^^^^^^^_,-' `.^^^^^^^^_/ hjw - `.____,-' `-.__.' `-.___.' `97 \ No newline at end of file + `.____,-' `-.__.' `-.___.' `97 diff --git a/src/asciiArt/squirrel.txt b/src/asciiArt/squirrel.txt index 5cd3bbd..0ddc60f 100644 --- a/src/asciiArt/squirrel.txt +++ b/src/asciiArt/squirrel.txt @@ -8,4 +8,4 @@ \=' .-' _`\ { `'`;/ `, } _\ ; } - /__`;-...'--' \ No newline at end of file + /__`;-...'--' From b6187f48c01ea5fd76737d093e077c591e9647bb Mon Sep 17 00:00:00 2001 From: Jake Zaia Date: Fri, 18 Oct 2019 17:37:02 -0400 Subject: [PATCH 2/2] Fix quote.py to not crash when given an invalid filename --- src/quote.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/quote.py b/src/quote.py index 934fe63..f7bb8b3 100644 --- a/src/quote.py +++ b/src/quote.py @@ -37,9 +37,13 @@ def print_message(message, ascii_file = None): if ascii_file != None: filepath = '/'.join(INPUT_FILE.split('/')[:-1]) filepath += "/asciiArt/" + ascii_file - f = open(filepath, 'r') - print(f.read()) - f.close() + if (os.path.exists(filepath)): + f = open(filepath, 'r') + print(f.read()) + f.close() + else: + print(module.input_file_with_new_line( + ASCII_ART[random.randint(0,(len(ASCII_ART) -1))])) else: print(module.input_file_with_new_line( ASCII_ART[random.randint(0,(len(ASCII_ART) -1))]))