Implement setting country from main settings

Author: ManuelMcLure

octoprint_netconnectd/__init__.py

@@ -51,7 +51,6 @@ def hostname(self):
 
     def on_settings_save(self, data):
         octoprint.plugin.SettingsPlugin.on_settings_save(self, data)
-        self.country = self._settings.get(["country"])
         self.address = self._settings.get(["socket"])
 
     def get_settings_defaults(self):
@@ -78,6 +77,7 @@ def get_api_commands(self):
             configure_wifi=[],
             forget_wifi=[],
             reset=[],
+            set_country=[],
         )
 
     def is_api_adminonly(self):
@@ -97,6 +97,7 @@ def on_api_get(self, request):
             data = self._get_country_list()
             countries = data["countries"]
             country = data["country"]
+            self.country = data["country"]
         except Exception as e:
             return jsonify(dict(error=str(e)))
 
@@ -154,6 +155,9 @@ def on_api_command(self, command, data, adminRequired=True):
             elif command == "stop_ap":
                 self._stop_ap()
 
+            elif command == "set_country":
+                self._set_country(data["country"])
+
             self._analytics.write_wifi_config_command(command, success=True)
 
         except RuntimeError as e:
@@ -254,6 +258,12 @@ def _stop_ap(self):
         if not flag:
             raise RuntimeError("Error while stopping ap: " + content)
 
+    def _set_country(self, country_code):
+        payload = {"country_code": country_code}
+        flag, content = self._send_message("set_country", payload)
+        if not flag:
+            raise RuntimeError("Error while setting country: " + content)
+
     def _send_message(self, message, data):
         obj = dict()
         obj[message] = data

octoprint_netconnectd/static/js/netconnectd.js

@@ -349,6 +349,15 @@ $(function() {
             }, 80000);
         };
 
+	self.selectedValueChanged = function(context) {
+            if (!self.canRun()) return;
+
+	    country = context.country();
+	    if (country) {
+		self._postCommand("set_country", {country: country});
+	    }
+	};
+
         self.sendReset = function() {
             if (!self.canRun()) return;
 

octoprint_netconnectd/templates/netconnectd_settings.jinja2

@@ -14,7 +14,9 @@
 		optionsText: 'country',
 		optionsValue: 'code',
 		optionsCaption: 'Select Country...',
-		value: country"></select>
+		value: country,
+		event: {change: selectedValueChanged}">
+	    </select>
 	</div>
     </div>
     <div class="pull-right" data-bind="visible: enableQualitySorting">