annabunches/inara_updater
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up settings code so we can apply changes without restarting.

Browse Source
This commit is contained in:
Anna Rose 2016-01-23 22:24:45 -05:00
parent c93cf8e1e6
commit 4fdd7ba705
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
update_inara.py
View File

@ -28,6 +28,7 @@ def update_inara(inara_session):
class UpdateWindow(object): class UpdateWindow(object):
def __init__(self, parent, settings): def __init__(self, parent, settings):
self.parent = parent self.parent = parent
self.settings = settings
self.frame = tk.Frame(parent) self.frame = tk.Frame(parent)
self.frame.pack(expand=True, fill=tk.BOTH) self.frame.pack(expand=True, fill=tk.BOTH)
@ -41,21 +42,32 @@ class UpdateWindow(object):
self.update_button.grid(row=1, column=0, pady=10) self.update_button.grid(row=1, column=0, pady=10)
config_button = tk.Button(self.frame, text="Config", height=1, width=2, config_button = tk.Button(self.frame, text="Config", height=1, width=2,
command=lambda: utils.update_settings(True, parent, settings)) command=self._update_settings)
config_button.grid(row=1, column=1, sticky=tk.E+tk.S, padx=5, pady=5) config_button.grid(row=1, column=1, sticky=tk.E+tk.S, padx=5, pady=5)
try: self._try_login()
self.session = do_logins(settings)
except:
self.update_button['state'] = tk.DISABLED
self.message.set("Error logging in. Double-check your config,\nthen restart the program.")
def _update_inara(self): def _update_inara(self):
self.message.set("Updating, please wait...") self.message.set("Updating, please wait...")
self.parent.update() self.parent.update()
update_inara(self.session) try:
self.message.set("Update successful! (Last update: %s)" % update_inara(self.session)
datetime.now().isoformat(' ')[:16]) self.message.set("Update successful! (Last update: %s)" %
datetime.now().isoformat(' ')[:16])
except:
self.message.set("Error updating! Double-check your config,\nor try again later.")
def _update_settings(self):
self.settings = utils.update_settings(True, self.parent, self.settings)
self._try_login()
def _try_login(self):
try:
self.session = do_logins(self.settings)
self.update_button['state'] = tk.NORMAL
except:
self.update_button['state'] = tk.DISABLED
self.message.set("Error logging in. Double-check your config!")
def main(): def main():