JDM170/SaveWizard
1
0
Fork 0
mirror of https://github.com/JDM170/SaveWizard synced 2025-04-20 22:30:42 +07:00
Code Issues Packages Projects Releases Wiki Activity

Update module_second

Browse Source 
* Fixed adding garage by name
* Make fill_list staticmethod
* Removed comments

Signed-off-by: Lev Rusanov <30170278+JDM170@users.noreply.github.com>
This commit is contained in:
Lev Rusanov
2023-10-21 19:55:03 +07:00
parent b082e6ca3f
commit b3d5776a3b
1 changed files with 28 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
module_second/script.py
View File

@@ -102,13 +102,30 @@ class SecondWindow(QDialog, Ui_SecondWindow):
self.ui.agency_add_all.clicked.connect(self.add_all_da_clicked)
if self.owns:
self.fill_list(self.dealers, self.dealers_file)
self.fill_list(self.agencies, self.agencies_file)
self.fill_list(self.owns, self.dealers, self.dealers_file)
self.fill_list(self.owns, self.agencies, self.agencies_file)
# Checking save-file
self.check_cities()
self.check_dealers()
self.check_agencies()
@staticmethod
def all_cities():
cities = []
for line in util.get_array_items(util.search_line("companies:")):
city = match(r"company.volatile.[a-z0-9_]+[.]([a-z_]+)", line).group(1)
if city not in cities:
cities.append(city)
return cities
@staticmethod
def add_vehicles_and_drivers(start_line, garage_size):
vehicles_array = util.search_line("vehicles:", start=start_line)
drivers_array = util.search_line("drivers:", start=start_line)
for i in range(1, garage_size + 1):
util.add_array_value(vehicles_array, "null")
util.add_array_value(drivers_array + i, "null")
@staticmethod
def purchased_garages():
garages = []
@@ -119,28 +136,10 @@ class SecondWindow(QDialog, Ui_SecondWindow):
return garages
@staticmethod
def add_vehicles_and_drivers(start_line, garage_size):
# vehicles_array = util.search_line_in_unit("vehicles:", start_line)
# drivers_array = util.search_line_in_unit("drivers:", start_line)
vehicles_array = util.search_line("vehicles:", start=start_line)
drivers_array = util.search_line("drivers:", start=start_line)
for i in range(1, garage_size + 1):
util.add_array_value(vehicles_array, "null")
util.add_array_value(drivers_array + i, "null")
@staticmethod
def all_cities():
cities = []
for line in util.get_array_items(util.search_line("companies:")):
city = match(r"company.volatile.[a-z0-9_]+[.]([a-z_]+)", line).group(1)
if city not in cities:
cities.append(city)
return cities
def fill_list(self, array, file):
def fill_list(owns, array, file):
if array is False:
return
for key in self.owns.keys():
for key in owns.keys():
if key not in file:
continue
for value in file[key]:
@@ -163,17 +162,15 @@ class SecondWindow(QDialog, Ui_SecondWindow):
QMessageBox.critical(self, "Error", "Enter city name!")
return
self.ui.garage_edit.setText("")
reg_garage = "garage." + garage
current_status = util.search_line_in_unit("status:", reg_garage)
current_garage = util.search_line("garage : garage." + garage + " {")
if current_garage is None:
QMessageBox.critical(self, "Error", "Garage in \"{}\" not found.".format(garage))
return
current_status = util.search_line_in_unit("status:", "garage." + garage)
if util.get_value(current_status) == "0":
new_status, size = self.check_garage_size()
util.set_value(current_status, new_status)
# vehicles_array = util.search_line_in_unit("vehicles:", reg_garage)
# drivers_array = util.search_line_in_unit("drivers:", reg_garage)
# for i in range(1, size + 1):
# util.add_array_value(vehicles_array, "null")
# util.add_array_value(drivers_array + i, "null")
self.add_vehicles_and_drivers(reg_garage, size)
self.add_vehicles_and_drivers(current_garage, size)
QMessageBox.information(self, "Success", "Garage in \"{}\" successfully unlocked.".format(garage))
else:
QMessageBox.critical(self, "Error", "Garage in \"{}\" already unlocked.".format(garage))
@@ -186,11 +183,6 @@ class SecondWindow(QDialog, Ui_SecondWindow):
current_status = util.search_line("status:", start=current_garage)
if util.get_value(current_status) == "0":
util.set_value(current_status, new_status)
# vehicles_array = util.search_line("vehicles:", start=current_garage)
# drivers_array = util.search_line("drivers:", start=current_garage)
# for i in range(1, size + 1):
# util.add_array_value(vehicles_array, "null")
# util.add_array_value(drivers_array + i, "null")
self.add_vehicles_and_drivers(current_garage, size)
QMessageBox.information(self, "Success", "All garages successfully unlocked.")