Merge pull request smarthomeNG#1030 from Morg42/sm-1

smartmeter: improve webif feedback

Author: Morg42

smartmeter/__init__.py

@@ -210,9 +210,11 @@ def create_items(self, data: dict = {}, file: str = '') -> bool:
             dir = self._sh._items_dir
             file = os.path.join(dir, f'smartmeter-{id}.yaml')
 
+        self.item_file = file
+
         if os.path.exists(file):
             self.logger.warning(f'output file {file} exists, not overwriting.')
-            return False
+            raise FileExistsError
 
         result = {}
         for nr, code in enumerate(data):
@@ -246,7 +248,6 @@ def create_items(self, data: dict = {}, file: str = '') -> bool:
 
         try:
             yaml_save(file, {id: result})
-            self.item_file = file
         except Exception as e:
             self.logger.warning(f'saving item file {file} failed with error: {e}')
             return False

smartmeter/webif/__init__.py

@@ -145,7 +145,13 @@ def submit(self, cmd=None):
             result = self.plugin.query(assign_values=False)
 
         elif cmd == 'create_items':
-            result = {'success': self.plugin.create_items(), 'file': self.plugin.item_file}
+            try:
+                result = {'success': self.plugin.create_items(), 'file': self.plugin.item_file, 'err': ''}
+            except FileExistsError:
+                result = {'success': False, 'file': '', 'err': f'Datei {self.plugin.item_file} bereits vorhanden, bitte erst löschen oder umbennen.'}
+                self.logger.warning(result)
+            except Exception as e:
+                self.logger.error(e)
 
         if result is not None:
             # JSON zurücksenden

smartmeter/webif/templates/index.html

@@ -305,39 +305,43 @@
 				switch (id) {
 					case 'detect':
 					  if (data.discovery_successful) {
-						updateButton(buttonElement, 'btn-success', "true");
-						alert('Ermittlung des Smartmeter-Protokoll erfolgreich!');
-					  shngInsertText('protocol', data.protocol || '', 'headtable');
+							updateButton(buttonElement, 'btn-success', "true");
+							alert('Ermittlung des Smartmeter-Protokoll erfolgreich!');
+						  shngInsertText('protocol', data.protocol || '', 'headtable');
 					  } else {
-						updateButton(buttonElement, 'btn-danger');
-						alert('Ermittlung des Smartmeter-Protokoll fehlgeschlagen!\n' + data.log);
+							updateButton(buttonElement, 'btn-danger');
+							alert('Ermittlung des Smartmeter-Protokoll fehlgeschlagen!\n' + data.log);
 					  }
 					  break;
 
 					case 'query':
 					  if (data) {
-						updateButton(buttonElement, "btn-success");
-						alert('Auslesen des Smartmeter erfolgreich!');
-				
-						for (const obis in data) {
-						  const obis_data = data[obis][0];
-						  const obis_data_formatted = jsonToKeyValueLines(obis_data);
-						  console.log("obis=" + obis, "data=" + obis_data_formatted);
-						  createOrUpdateTableRowObis('obis_data_table', obis, obis_data_formatted); 
-						}
+							updateButton(buttonElement, "btn-success");
+							alert('Auslesen des Smartmeter erfolgreich!');
+					
+							for (const obis in data) {
+							  const obis_data = data[obis][0];
+							  const obis_data_formatted = jsonToKeyValueLines(obis_data);
+							  console.log("obis=" + obis, "data=" + obis_data_formatted);
+							  createOrUpdateTableRowObis('obis_data_table', obis, obis_data_formatted); 
+							}
 					  } else {
-						updateButton(buttonElement, "btn-danger");
-						alert('Auslesen des Smartmeter fehlgeschlagen!');
+							updateButton(buttonElement, "btn-danger");
+							alert('Auslesen des Smartmeter fehlgeschlagen!');
 					  }
 					  break;
 
 					case 'create_items':
 					  if (data.success === true) {
-						updateButton(buttonElement, "btn-success", "true");
-						alert('Item Erstellung erfolgreich, Items geschrieben in ' + data.file + '!');
+							updateButton(buttonElement, "btn-success", "true");
+							alert('Item Erstellung erfolgreich, Items geschrieben in ' + data.file + '!');
 					  } else {
-						updateButton(buttonElement, "btn-danger");
-						alert('Item Erstellung fehlgeschlagen!');
+							updateButton(buttonElement, "btn-danger");
+							if (data.err) {
+								alert(data.err)
+							} else {
+								alert('Item Erstellung fehlgeschlagen!');
+							}
 					  }
 					  shngInsertText('protocol', data.protocol || '', 'headtable');
 					  break;