Haldis/haldis
5
0
Fork 0
Code Issues 39 Pull requests Projects Releases Packages Wiki Activity

Fixed little issues, working fine now

Browse source
This commit is contained in:
Wout Schellaert 2015-04-04 14:26:09 +02:00
parent 81913d2d1b
commit dd97b036b5
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
database/create_database.py
View file

@ -2,7 +2,7 @@ from app import db
from database import add_oceans_garden, add_admins, add_simpizza from database import add_oceans_garden, add_admins, add_simpizza
locations = {"Admins": add_admins.add(), "Ocean's Garden": add_oceans_garden.add(), "SimPizza": add_simpizza.add()} entry_sets = {"Admins": add_admins.add, "Ocean's Garden": add_oceans_garden.add, "SimPizza": add_simpizza.add}
yes = ["yes", "y", "Y"] yes = ["yes", "y", "Y"]
no = ["no", "n", "N"] no = ["no", "n", "N"]
@ -19,21 +19,21 @@ def check_if_overwrite():
def add_all(): def add_all():
for loc in locations.keys(): for entry_set in entry_sets.keys():
print("Adding {}.".format(loc)) print("Adding {}.".format(entry_set))
locations[loc]() entry_sets[entry_set]()
def recreate_from_scratch(): def recreate_from_scratch():
confirmation = "Are you very very sure? (Will delete previous entry's!) (y/N) " confirmation = "Are you very very sure? (Will delete previous entry's!) (y/N) "
check = "I acknowledge any repercussions!" check = "I acknowledge any repercussions!"
if input(confirmation) in yes and input('Type: "{}" ').format(check) == check: if input(confirmation) in yes and input("Type: '{}' ".format(check)) == check:
print("Overwriting the database!") print("Overwriting the database!")
add_all() add_all()
def add_to_current(): def add_to_current():
available = [loc for loc in locations.keys()] available = [entry_set for entry_set in entry_sets]
def add_numbers(): def add_numbers():
return " ".join(["{}({}), ".format(loc, i) for i, loc in enumerate(available)]).rstrip(", ") return " ".join(["{}({}), ".format(loc, i) for i, loc in enumerate(available)]).rstrip(", ")
@ -48,7 +48,7 @@ def add_to_current():
elif answer in [str(x) for x in range(len(available))]: elif answer in [str(x) for x in range(len(available))]:
answer = int(answer) answer = int(answer)
print("Adding {}.".format(available[answer])) print("Adding {}.".format(available[answer]))
locations[available[answer]]() entry_sets[str(available[answer])]()
del available[answer] del available[answer]
else: else:
print("Not a valid answer.") print("Not a valid answer.")