giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove duplicate factory defaults saving code in App

This commit is contained in:
David Robertson 2020-04-28 03:36:15 +01:00
parent e3ffa30518
commit 723e242c2b
3 changed files with 6 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
FlatCAMApp.py
View File

@ -1098,10 +1098,6 @@ class App(QtCore.QObject):
# ###########################################################################################################
if self.defaults["first_run"] is True:
self.save_factory_defaults(silent_message=False)
# and then make the factory_defaults.FlatConfig file read_only so it can't be modified after creation.
filename_factory = self.data_path + '/factory_defaults.FlatConfig'
os.chmod(filename_factory, S_IREAD | S_IRGRP | S_IROTH)
# ONLY AT FIRST STARTUP INIT THE GUI LAYOUT TO 'COMPACT'
initial_lay = 'compact'
@ -4367,63 +4363,7 @@ class App(QtCore.QObject):
self.defaults["global_toolbar_view"] = tb_status
def save_factory_defaults(self, silent_message=False, data_path=None):
"""
Saves application factory default options
``self.defaults`` to factory_defaults.FlatConfig.
It's a one time job done just after the first install.
:param silent_message: whether to display a message in status bar or not; boolean
:param data_path: the path where to save the default preferences file (factory_defaults.FlatConfig)
When the application is portable it should be a mobile location.
:return: None
"""
self.report_usage("save_factory_defaults")
if data_path is None:
data_path = self.data_path
# Read options from file
try:
f_f_def = open(data_path + "/factory_defaults.FlatConfig")
factory_defaults_file_content = f_f_def.read()
f_f_def.close()
except Exception:
e = sys.exc_info()[0]
App.log.error("Could not load factory defaults file.")
App.log.error(str(e))
self.inform.emit('[ERROR_NOTCL] %s' % _("Could not load factory defaults file."))
return
try:
factory_defaults = json.loads(factory_defaults_file_content)
except Exception:
e = sys.exc_info()[0]
App.log.error("Failed to parse factory defaults file.")
App.log.error(str(e))
if silent_message is False:
self.inform.emit('[ERROR_NOTCL] %s' % _("Failed to parse factory defaults file."))
return
# Update options
self.defaults_read_form()
factory_defaults.update(self.defaults)
self.propagate_defaults(silent=True)
# Save update options
try:
f_f_def_s = open(data_path + "/factory_defaults.FlatConfig", "w")
json.dump(factory_defaults, f_f_def_s, default=to_dict, indent=2, sort_keys=True)
f_f_def_s.close()
except Exception as e:
log.debug("App.save_factory_default() save update --> %s" % str(e))
if silent_message is False:
self.inform.emit('[ERROR_NOTCL] %s' % _("Failed to write factory defaults to file."))
return
if silent_message is False:
self.inform.emit(_("Factory defaults saved."))
def final_save(self):
"""
@ -4626,7 +4566,6 @@ class App(QtCore.QObject):
# save the current defaults to the new defaults file
self.save_defaults(silent=True, data_path=current_data_path)
self.save_factory_defaults(silent_message=True, data_path=current_data_path)
else:
data[line_no] = 'portable=False\n'

6
FlatCAMCommon.py
View File

@ -31,8 +31,7 @@ class GracefulException(Exception):
class LoudDict(dict):
"""
A Dictionary with a callback for
item changes.
A Dictionary with a callback for item changes.
"""
def __init__(self, *args, **kwargs):
@ -41,8 +40,7 @@ class LoudDict(dict):
def __setitem__(self, key, value):
"""
Overridden __setitem__ method. Will emit 'changed(QString)'
if the item was changed, with key as parameter.
Overridden __setitem__ method. Will emit 'changed(QString)' if the item was changed, with key as parameter.
"""
if key in self and self.__getitem__(key) == value:
return

4
defaults.py
View File

@ -753,6 +753,10 @@ class FlatCAMDefaults:
@classmethod
def save_factory_defaults_file(cls, file_path: str):
"""
Writes the factory defaults to a file at the given path, overwriting any existing file.
Sets the file to be read only.
"""
# Delete any existing factory defaults file
if os.path.isfile(file_path):
os.chmod(file_path, stat.S_IRWXO | stat.S_IWRITE | stat.S_IWGRP)