beremiz

MQTT: WIP fix modified status not being set when adding and modifying topics or attributes.

23 months ago, Edouard Tisserant
1479acf750e2
Parents 0145c60b9560
Children 87f11a874477
MQTT: WIP fix modified status not being set when adding and modifying topics or attributes.

Fix loading of CSV that was not applying model types, and that not checking conformance either.
1 files changed, 35 insertions(+), 12 deletions(-)
  • +35 -12
    mqtt/mqtt_client_gen.py
    • --- a/mqtt/mqtt_client_gen.py Tue Jul 23 15:30:04 2024 +0200
    +++ b/mqtt/mqtt_client_gen.py Tue Jul 23 17:05:59 2024 +0200
    @@ -101,7 +101,9 @@
    self.log("{} is invalid for IdType\n".format(value))
    return False
    - self.data[row][col] = v
    + line = self.data[row]
    + line[col] = v
    + self.data[row] = line
    return True
    # Report how many columns this model provides data for.
    @@ -238,7 +240,7 @@
    self.change_callback = change_callback
    self.dsc = lstcoldsc[direction]
    - def append(self, value):
    + def _filter_line(self, value):
    v = dict(list(zip(self.dsc.lstcolnames, value)))
    if type(v["Location"]) != int:
    @@ -250,31 +252,48 @@
    holes = set(range(greatest)) - iecnums
    v["Location"] = min(holes) if holes else greatest+1
    - if v["QoS"] not in QoS_values:
    - self.log("Unknown QoS\n".format(value))
    - return False
    -
    try:
    for t,n in zip(self.dsc.lstcoltypess, self.dsc.lstcolnames):
    v[n] = t(v[n])
    except ValueError:
    self.log("MQTT topic {} (Location={}) has invalid type\n".format(v["Topic"],v["Location"]))
    - return False
    + return None
    +
    + if v["QoS"] not in QoS_values:
    + self.log("Unknown QoS\n".format(value))
    + return None
    if len(self)>0 and v["Topic"] in list(zip(*self))[self.dsc.lstcolnames.index("Topic")]:
    self.log("MQTT topic {} (Location={}) already in the list\n".format(v["Topic"],v["Location"]))
    - return False
    + return None
    +
    + return [v[n] for n in self.dsc.lstcolnames]
    - list.append(self, [v[n] for n in self.dsc.lstcolnames])
    + def insert(self, row, value):
    + v = self._filter_line(value)
    + if v is not None:
    + list.insert(self, row, v)
    + self.change_callback()
    + return True
    + return False
    - self.change_callback()
    + def append(self, value):
    + v = self._filter_line(value)
    + if v is not None:
    + list.append(self, v)
    + self.change_callback()
    + return True
    + return False
    - return True
    + def __setitem__(self, index, value):
    + list.__setitem__(self, index, value)
    + self.change_callback()
    def __delitem__(self, index):
    list.__delitem__(self, index)
    self.change_callback()
    +
    class MQTTClientModel(dict):
    def __init__(self, log, change_callback = lambda : None):
    super(MQTTClientModel, self).__init__()
    @@ -290,7 +309,11 @@
    for row in reader:
    direction = row[0]
    # avoids calling change callback when loading CSV
    - list.append(self[direction],row[1:])
    + l = self[direction]
    + v = l._filter_line(row[1:])
    + if v is not None:
    + list.append(l,v)
    + # TODO be verbose in case of malformed CSV
    def SaveCSV(self,path):
    with open(path, 'w') as csvfile: