Skip to content

Commit

Permalink
window uses config class
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Robinson committed Apr 19, 2021
1 parent 5ebf19c commit 3ea3cc1
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 49 deletions.
8 changes: 8 additions & 0 deletions src/config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,11 @@ def get_property(self, key):
config = configparser.ConfigParser()
config.read(self.config_file)
return config["settings"][key]

def set_property(self, key, val):
config = configparser.ConfigParser()
config.read(self.config_file)
config["settings"][key] = val
with open(self.config_file, "w") as f:
config.write(f)

6 changes: 1 addition & 5 deletions src/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ def __init__(self):
def do_activate(self):
win = self.props.active_window
if not win:
win = SigloWindow(
application=self,
mode=self.conf.get_property("mode"),
deploy_type=self.conf.get_property("deploy_type"),
)
win = SigloWindow(application=self)
win.present()
self.manager = InfiniTimeManager()
info_prefix = "[INFO ] Done Scanning"
Expand Down
70 changes: 26 additions & 44 deletions src/window.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from .ble_dfu import InfiniTimeDFU
from .unpacker import Unpacker
from .quick_deploy import *
from .config import config


@Gtk.Template(resource_path="/org/gnome/siglo/window.ui")
Expand All @@ -33,23 +34,22 @@ class SigloWindow(Gtk.ApplicationWindow):
ota_pick_asset_combobox = Gtk.Template.Child()
deploy_type_switch = Gtk.Template.Child()

def __init__(self, mode, deploy_type, **kwargs):
def __init__(self, **kwargs):
self.ble_dfu = None
self.ota_file = None
self.manager = None
self.asset = None
self.asset_download_url = None
self.tag = None
self.mode = mode
self.deploy_type = deploy_type
self.conf = config()
super().__init__(**kwargs)
GObject.threads_init()
if mode == "multi":
if self.conf.get_property("mode") == "multi":
self.auto_switch_mode = True
self.multi_device_switch.set_active(True)
if deploy_type == "quick":
if self.conf.get_property("deploy_type") == "quick":
self.full_list = get_quick_deploy_list()
if deploy_type == "manual":
if self.conf.get_property("deploy_type") == "manual":
self.auto_switch_deploy_type = True
self.deploy_type_switch.set_active(True)

Expand Down Expand Up @@ -114,10 +114,10 @@ def done_scanning_singleton(self, manager, info_prefix):
)
self.scan_pass_box.set_visible(True)
self.ota_picked_box.set_visible(True)
if self.deploy_type == "quick":
if self.conf.get_property("deploy_type") == "quick":
self.auto_bbox_scan_pass.set_visible(True)
self.populate_tagbox()
if self.deploy_type == "manual":
if self.conf.get_property("deploy_type") == "manual":
self.bbox_scan_pass.set_visible(True)
else:
info_suffix += "\n[INFO ] Scan Failed"
Expand All @@ -139,9 +139,9 @@ def multi_listbox_row_selected(self, list_box, row):
)
self.scan_pass_box.set_visible(True)
self.ota_picked_box.set_visible(True)
if self.deploy_type == "manual":
if self.conf.get_property("deploy_type") == "manual":
self.bbox_scan_pass.set_visible(True)
if self.deploy_type == "quick":
if self.conf.get_property("deploy_type") == "quick":
self.auto_bbox_scan_pass.set_visible(True)
self.populate_tagbox()
self.multi_device_listbox.set_visible(False)
Expand Down Expand Up @@ -179,9 +179,9 @@ def rescan_button_clicked(self, widget):
self.manager.scan_for_infinitime()
except gatt.errors.NotReady:
info_prefix = "[WARN ] Bluetooth is disabled"
if self.mode == "singleton":
if self.conf.get_property("mode") == "singleton":
self.done_scanning_singleton(self.manager, info_prefix)
if self.mode == "multi":
if self.conf.get_property("mode") == "multi":
self.done_scanning_multi(self.manager, info_prefix)

@Gtk.Template.Callback()
Expand All @@ -206,19 +206,19 @@ def ota_file_selected(self, widget):

@Gtk.Template.Callback()
def ota_cancel_button_clicked(self, widget):
if self.deploy_type == "quick":
if self.conf.get_property("deploy_type") == "quick":
self.ota_pick_asset_combobox.remove_all()
self.ota_pick_tag_combobox.remove_all()
self.populate_tagbox()
self.ota_picked_box.set_sensitive(False)
if self.deploy_type == "manual":
if self.conf.get_property("deploy_type") == "manual":
self.main_info.set_text("Choose another OTA File")
self.ota_picked_box.set_visible(False)
self.ota_selection_box.set_visible(True)

@Gtk.Template.Callback()
def flash_it_button_clicked(self, widget):
if self.deploy_type == "quick":
if self.conf.get_property("deploy_type") == "quick":
file_name = "/tmp/" + self.asset
local_filename, headers = urllib.request.urlretrieve(
self.asset_download_url, file_name
Expand Down Expand Up @@ -251,22 +251,13 @@ def flash_it_button_clicked(self, widget):

@Gtk.Template.Callback()
def deploy_type_toggled(self, widget):
if self.deploy_type == "manual" and self.auto_switch_deploy_type:
if self.conf.get_property("deploy_type") == "manual" and self.auto_switch_deploy_type:
self.auto_switch_deploy_type = False
else:
current_deploy_type = self.deploy_type
config = configparser.ConfigParser()
home = str(Path.home())
configDir = home + "/.config/siglo"
configFile = configDir + "/siglo.ini"
if current_deploy_type == "quick":
config["settings"] = {"mode": self.mode, "deploy_type": "manual"}
self.deploy_type = "manual"
if current_deploy_type == "manual":
config["settings"] = {"mode": self.mode, "deploy_type": "quick"}
self.deploy_type = "quick"
with open(configFile, "w") as f:
config.write(f)
if self.conf.get_property("deploy_type") == "quick":
self.conf.set_property("deploy_type", "manual")
if self.conf.get_property("deploy_type") == "manual":
self.conf.set_property("deploy_type", "quick")
self.main_info.set_text("[WARN ] Settings changed, please restart Siglo")
self.rescan_button.set_visible(False)
self.scan_pass_box.set_visible(False)
Expand All @@ -276,22 +267,13 @@ def deploy_type_toggled(self, widget):

@Gtk.Template.Callback()
def mode_toggled(self, widget):
if self.mode == "multi" and self.auto_switch_mode == True:
if self.conf.get_property("mode") == "multi" and self.auto_switch_mode == True:
self.auto_switch_mode = False
else:
current_mode = self.mode
config = configparser.ConfigParser()
home = str(Path.home())
configDir = home + "/.config/siglo"
configFile = configDir + "/siglo.ini"
if current_mode == "singleton":
config["settings"] = {"mode": "multi", "deploy_type": self.deploy_type}
self.mode = "multi"
if current_mode == "multi":
config["settings"] = {"mode": "singleton", "deploy_type": self.deploy_type}
self.mode = "singleton"
with open(configFile, "w") as f:
config.write(f)
if self.conf.get_property("mode") == "singleton":
self.conf.set_property("mode", "multi")
if self.conf.get_property("mode") == "multi":
self.conf.set_property("mode", "singleton")
self.main_info.set_text("[WARN ] Settings changed, please restart Siglo")
self.rescan_button.set_visible(False)
self.scan_pass_box.set_visible(False)
Expand All @@ -317,5 +299,5 @@ def show_complete(self):
self.bt_spinner.set_visible(False)
self.sync_time_button.set_visible(True)
self.dfu_progress_box.set_visible(False)
if (self.deploy_type == "quick"):
if (self.conf.get_property("deploy_type") == "quick"):
self.auto_bbox_scan_pass.set_visible(True)

0 comments on commit 3ea3cc1

Please sign in to comment.