punky
/
botany
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Update garden data structutre and file permissions

pull/1/head
Jake Funke 2017-03-10 20:01:48 +00:00
parent b01b39b00e
commit d269e3391f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
botany.py
View File

@ -393,19 +393,22 @@ class DataManager(object):
age_formatted = self.plant_age_convert(this_plant) age_formatted = self.plant_age_convert(this_plant)
this_plant_id = this_plant.plant_id this_plant_id = this_plant.plant_id
plant_info = ( plant_info = {
this_plant.owner, "owner":this_plant.owner,
this_plant.parse_plant(), "description":this_plant.parse_plant(),
age_formatted, "age":age_formatted,
this_plant.ticks, "score":this_plant.ticks,
this_plant.dead, "dead":this_plant.dead,
) }
if os.path.isfile(self.garden_file_path): if os.path.isfile(self.garden_file_path):
# garden file exists: load data # garden file exists: load data
with open(self.garden_file_path, 'rb') as f: with open(self.garden_file_path, 'rb') as f:
this_garden = pickle.load(f) this_garden = pickle.load(f)
new_file_check = False new_file_check = False
# TODO: it would be smart to lock this file down somehow, write to
# it only through the software (to prevent tampering)
os.chmod(self.garden_file_path, 0666)
else: else:
# create empty garden list # create empty garden list
this_garden = {} this_garden = {}
@ -415,7 +418,7 @@ class DataManager(object):
this_garden[this_plant_id] = plant_info this_garden[this_plant_id] = plant_info
# if plant ticks for id is greater than current ticks of plant id # if plant ticks for id is greater than current ticks of plant id
else: else:
current_plant_ticks = this_garden[this_plant_id][3] current_plant_ticks = this_garden[this_plant_id]["score"]
if this_plant.ticks > current_plant_ticks: if this_plant.ticks > current_plant_ticks:
this_garden[this_plant_id] = plant_info this_garden[this_plant_id] = plant_info
with open(self.garden_file_path, 'wb') as f: with open(self.garden_file_path, 'wb') as f: