D4
/
d4-core
mirror of https://github.com/D4-project/d4-core
2
0
Fork 0
Code Issues Releases Wiki Activity

fix: [metatypes] add option to save json by uuid

pull/23/head
Terrtia 2019-03-19 14:44:29 +01:00
parent a39d52808c
commit 394ed4cc5e
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/workers/workers_2/meta_types_modules/MetaTypesDefault.py
View File

@ -48,11 +48,11 @@ class MetaTypesDefault:
else: else:
return False return False
def save_json_file(self, json_file): def save_json_file(self, json_file, save_by_uuid=True):
self.set_last_time_saved(time.time()) #time_file self.set_last_time_saved(time.time()) #time_file
self.set_last_saved_date(datetime.datetime.now().strftime("%Y%m%d%H%M%S")) #date_file self.set_last_saved_date(datetime.datetime.now().strftime("%Y%m%d%H%M%S")) #date_file
# update save path # update save path
self.set_save_path( os.path.join(self.get_save_dir(), self.get_filename(file_extention='json')) ) self.set_save_path( os.path.join(self.get_save_dir(save_by_uuid=save_by_uuid), self.get_filename(file_extention='json')) )
# save json # save json
with open(self.get_save_path(), 'w') as f: with open(self.get_save_path(), 'w') as f:
f.write(json.dumps(json_file)) f.write(json.dumps(json_file))
@ -181,15 +181,15 @@ class MetaTypesDefault:
if self.is_file_rotation_mode(): if self.is_file_rotation_mode():
return '{}-{}-{}-{}-{}.{}'.format(self.uuid, self.get_last_saved_year(), self.get_last_saved_month(), self.get_last_saved_day(), self.get_last_saved_hour_minute(), file_extention) return '{}-{}-{}-{}-{}.{}'.format(self.uuid, self.get_last_saved_year(), self.get_last_saved_month(), self.get_last_saved_day(), self.get_last_saved_hour_minute(), file_extention)
def get_save_dir(self): def get_save_dir(self, save_by_uuid=False):
# File Rotation, save data in directory: data/<uuid>/254/<year>/<month>/<day>/ # File Rotation, save data in directory: data/<uuid>/254/<year>/<month>/<day>/
if self.is_file_rotation_mode(): if self.is_file_rotation_mode() or save_by_uuid:
data_directory_uuid_type = os.path.join('../../data', self.get_uuid(), str(TYPE)) data_directory_uuid_type = os.path.join('../../data', self.get_uuid(), str(TYPE))
return os.path.join(data_directory_uuid_type, self.get_last_saved_year(), self.get_last_saved_month(), self.get_last_saved_day() , self.type_name) return os.path.join(data_directory_uuid_type, self.get_last_saved_year(), self.get_last_saved_month(), self.get_last_saved_day() , self.type_name)
# data save in the same directory # data save in the same directory
else: else:
save_dir = os.path.join('../../data/data', self.get_type_name()) save_dir = os.path.join('../../data/datas', self.get_type_name())
if not os.path.isdir(save_dir): if not os.path.isdir(save_dir):
os.makedirs(save_dir) os.makedirs(save_dir)
return save_dir return save_dir