Prepare filters' logic.

1 files changed, 15 insertions, 15 deletions

diff --git a/logic/database.gd b/logic/database.gd
index 2285470..47cddbc 100644
--- a/logic/database.gd
+++ b/logic/database.gd
@@ -30,12 +30,12 @@ var staged_idx: int
 var is_pointer_dragging := false
 var pointer_drag_velocity := 0.0
 
-onready var stage: Stage = get_node("/root/main/stage")
-onready var delete_button: Button = get_node("actions/delete")
-onready var edit_button: Button = get_node("actions/edit")
-onready var add_button: Button = get_node("actions/add")
-onready var v_scroll_bar: ScrollBar = get_v_scroll()
-onready var drag_sensor: PointerInputSensor = get_node("drag_sensor")
+onready var stage			:= get_node("/root/main/stage") #as Stage # @DAM Solve cyclic load.
+onready var delete_button	:= get_node("actions/delete") as Button
+onready var edit_button		:= get_node("actions/edit") as Button
+onready var add_button		:= get_node("actions/add") as Button
+onready var v_scroll_bar	:= get_v_scroll() as ScrollBar
+onready var drag_sensor		:= get_node("drag_sensor") as PointerInputSensor
 
 
 func _init():
@@ -53,8 +53,8 @@ func _ready():
 	edit_button.connect("pressed", self, "edit_action")
 	add_button.connect("pressed", self, "add_action")	
 	
-	stage.connect("save", self, "save")
-	stage.connect("discard", self, "discard")
+	stage.connect("save", self, "save_stage")
+	stage.connect("discard", self, "discard_stage")
 	
 	drag_sensor.connect("on_press", self, "pointer_input_handler")
 	drag_sensor.connect("on_drag", self, "pointer_input_handler")
@@ -128,15 +128,15 @@ func scroll_down():
 	v_scroll_bar.value = v_scroll_bar.max_value
 
 
-func save(database_entry: Dictionary):
-	database_entry = instance_entry(database_entry) # @DAM Maybe we could not be creating endless dictionaries?
+func save_stage(entry: Dictionary):
+	entry = instance_entry(entry) # @DAM Maybe we could not be creating endless dictionaries?
 	var next_selected_idx: int
 	if staged_idx >= 0:
-		db[staged_idx] = database_entry
+		db[staged_idx] = entry
 		next_selected_idx = staged_idx
 	else:
-		db.append(database_entry)
-		add_item(get_entry_view(database_entry))
+		db.append(entry)
+		add_item(get_entry_view(entry))
 		call_deferred("scroll_down")
 		next_selected_idx = db.size() - 1
 	
@@ -152,7 +152,7 @@ func save(database_entry: Dictionary):
 	grab_focus()
 
 
-func discard():
+func discard_stage():
 	staged_idx = -1
 	self.visible = true
 	grab_focus()
@@ -163,7 +163,7 @@ func load_database(file_path: String = DATABASE_FILE_PATH):
 	file.open(file_path, File.READ_WRITE)
 	var headers: PoolStringArray
 	var is_first_line := true
-#	while database_file.eof_reached() == false: 								# @DAM Why this?
+#	while file.eof_reached() == false: 								# @DAM Why this?
 	while file.get_position() < file.get_len():
 		var csv_entry := file.get_csv_line()
 		if is_first_line: