From 70576bd3983ef20e6c2bf2f0efa3e35e25230088 Mon Sep 17 00:00:00 2001 From: Anonymus Raccoon Date: Sun, 26 Apr 2020 15:42:33 +0200 Subject: [PATCH] Cleaning up the file structure --- install.sh | 2 +- run.sh | 3 +++ command_helper.py => src/command_helper.py | 0 main.py => src/main.py | 0 term_utils.py => src/term_utils.py | 0 trick.py => src/trick.py | 1 - {tricks => src/tricks}/anim_ascii.py | 3 +-- nian_cat.py => src/tricks/data/nian_cat.py | 2 -- {data => src/tricks/data}/scenario_resource.py | 2 -- {tricks => src/tricks}/glorify_goose.py | 0 {tricks => src/tricks}/laughing_goose.py | 0 {tricks => src/tricks}/otis_notification.py | 0 {tricks => src/tricks}/random_message.py | 2 +- {tricks => src/tricks}/reflection.py | 0 {tricks => src/tricks}/rotation.py | 0 {tricks => src/tricks}/scenario.py | 4 ++-- 16 files changed, 8 insertions(+), 11 deletions(-) create mode 100755 run.sh rename command_helper.py => src/command_helper.py (100%) rename main.py => src/main.py (100%) rename term_utils.py => src/term_utils.py (100%) rename trick.py => src/trick.py (99%) rename {tricks => src/tricks}/anim_ascii.py (93%) rename nian_cat.py => src/tricks/data/nian_cat.py (99%) rename {data => src/tricks/data}/scenario_resource.py (99%) rename {tricks => src/tricks}/glorify_goose.py (100%) rename {tricks => src/tricks}/laughing_goose.py (100%) rename {tricks => src/tricks}/otis_notification.py (100%) rename {tricks => src/tricks}/random_message.py (90%) rename {tricks => src/tricks}/reflection.py (100%) rename {tricks => src/tricks}/rotation.py (100%) rename {tricks => src/tricks}/scenario.py (89%) diff --git a/install.sh b/install.sh index 5783e7b..da31944 100644 --- a/install.sh +++ b/install.sh @@ -5,4 +5,4 @@ cd AnonymousGoose || (echo "Error installing." ; exit 1) virtualenv venv source venv/bin/activate pip3 install pyxhook simpleaudio -./main.py & \ No newline at end of file +./run.sh \ No newline at end of file diff --git a/run.sh b/run.sh new file mode 100755 index 0000000..a98e837 --- /dev/null +++ b/run.sh @@ -0,0 +1,3 @@ +#!/usr/bin/bash + +./src/main.py "$@" & \ No newline at end of file diff --git a/command_helper.py b/src/command_helper.py similarity index 100% rename from command_helper.py rename to src/command_helper.py diff --git a/main.py b/src/main.py similarity index 100% rename from main.py rename to src/main.py diff --git a/term_utils.py b/src/term_utils.py similarity index 100% rename from term_utils.py rename to src/term_utils.py diff --git a/trick.py b/src/trick.py similarity index 99% rename from trick.py rename to src/trick.py index d0acfd9..ee005d5 100644 --- a/trick.py +++ b/src/trick.py @@ -2,7 +2,6 @@ import random from abc import ABC, abstractmethod - class Trick(ABC): @property @abstractmethod diff --git a/tricks/anim_ascii.py b/src/tricks/anim_ascii.py similarity index 93% rename from tricks/anim_ascii.py rename to src/tricks/anim_ascii.py index 64c13d9..d2a4074 100644 --- a/tricks/anim_ascii.py +++ b/src/tricks/anim_ascii.py @@ -1,5 +1,5 @@ from trick import Trick -from nian_cat import nian +from tricks.data.nian_cat import nian from term_utils import Term import simpleaudio as sa import time @@ -13,7 +13,6 @@ class AnimAsciiTrick(Trick): is_open = True musicobj = sa.WaveObject.from_wave_file("data/nian_gooz.wav") playobj = musicobj.play() - terminal.print("ouioui") while is_open: for frame in nian: is_open = terminal.print(frame) diff --git a/nian_cat.py b/src/tricks/data/nian_cat.py similarity index 99% rename from nian_cat.py rename to src/tricks/data/nian_cat.py index 7aa93c2..1429c7a 100644 --- a/nian_cat.py +++ b/src/tricks/data/nian_cat.py @@ -1,5 +1,3 @@ - - nian = [ """,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,.,,,,,,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,.,.,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/data/scenario_resource.py b/src/tricks/data/scenario_resource.py similarity index 99% rename from data/scenario_resource.py rename to src/tricks/data/scenario_resource.py index 1702cfc..171d8fc 100644 --- a/data/scenario_resource.py +++ b/src/tricks/data/scenario_resource.py @@ -1,5 +1,3 @@ - - intro_text = "\n>$ You have been hacked\n>$ try to escape from the bad virus\n>$ " event1_text = "try to ESCAPE" diff --git a/tricks/glorify_goose.py b/src/tricks/glorify_goose.py similarity index 100% rename from tricks/glorify_goose.py rename to src/tricks/glorify_goose.py diff --git a/tricks/laughing_goose.py b/src/tricks/laughing_goose.py similarity index 100% rename from tricks/laughing_goose.py rename to src/tricks/laughing_goose.py diff --git a/tricks/otis_notification.py b/src/tricks/otis_notification.py similarity index 100% rename from tricks/otis_notification.py rename to src/tricks/otis_notification.py diff --git a/tricks/random_message.py b/src/tricks/random_message.py similarity index 90% rename from tricks/random_message.py rename to src/tricks/random_message.py index 96bb912..b6839bc 100644 --- a/tricks/random_message.py +++ b/src/tricks/random_message.py @@ -1,4 +1,4 @@ -from data.scenario_resource import random_text +from tricks.data.scenario_resource import random_text from term_utils import Term from trick import Trick import random diff --git a/tricks/reflection.py b/src/tricks/reflection.py similarity index 100% rename from tricks/reflection.py rename to src/tricks/reflection.py diff --git a/tricks/rotation.py b/src/tricks/rotation.py similarity index 100% rename from tricks/rotation.py rename to src/tricks/rotation.py diff --git a/tricks/scenario.py b/src/tricks/scenario.py similarity index 89% rename from tricks/scenario.py rename to src/tricks/scenario.py index 809bd18..b2722ae 100644 --- a/tricks/scenario.py +++ b/src/tricks/scenario.py @@ -1,6 +1,6 @@ from trick import Trick -from data.scenario_resource import intro_text -from data.scenario_resource import event1_text +from tricks.data.scenario_resource import intro_text +from tricks.data.scenario_resource import event1_text from term_utils import Term import time