SolarManager unter Versionsverwaltung

Erster Stand der Hintergrundprozesse, die auf der Synology unter /volume1/homes/wagner/SolarManager laufen: der Manager selbst, die Sammler je Geraet, die MQTT-Bruecke, der Wecker und - neu hinzugezogen - der AutoAction-Runner, der als Hintergrundprozess hierher gehoert und nicht ins Web-Verzeichnis. Zugangsdaten stehen nicht mehr im Quelltext, sondern in config.ini, die nicht mit eingecheckt wird. Vorlage ist config.ini.example, gelesen wird sie von konfig.py. Betroffen waren solarManager.py (Datenbank und Wattpilot), zeit.py, gatherWaterData.py, wecker.py und skoda_testdaten.py, das sich das Passwort bisher aus dem Quelltext eines anderen Moduls herausgesucht hat. Die Kia-Anbindung ist mit dem Fahrzeug entfallen: kiaTest.py, gatherCarData.py und hyundai_kia_connect_api sind nicht mehr dabei, ebenso gatherInverterData.py, auf das nur noch eine auskommentierte Zeile zeigte. Die mitgelieferten Bibliotheken bleiben im Repository - die NAS hat kein pip, sie muessen neben den Skripten liegen. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-09-02 20:46:59 +02:00
commit 79843aa2ae
968 changed files with 261182 additions and 0 deletions
@@ -0,0 +1,464 @@
+#ifndef _MULTIDICT_VIEWS_H
+#define _MULTIDICT_VIEWS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static PyTypeObject multidict_itemsview_type;
+static PyTypeObject multidict_valuesview_type;
+static PyTypeObject multidict_keysview_type;
+
+static PyObject *viewbaseset_richcmp_func;
+static PyObject *viewbaseset_and_func;
+static PyObject *viewbaseset_or_func;
+static PyObject *viewbaseset_sub_func;
+static PyObject *viewbaseset_xor_func;
+
+static PyObject *abc_itemsview_register_func;
+static PyObject *abc_keysview_register_func;
+static PyObject *abc_valuesview_register_func;
+
+static PyObject *itemsview_isdisjoint_func;
+static PyObject *itemsview_repr_func;
+
+static PyObject *keysview_repr_func;
+static PyObject *keysview_isdisjoint_func;
+
+static PyObject *valuesview_repr_func;
+
+typedef struct {
+    PyObject_HEAD
+    PyObject *md;
+} _Multidict_ViewObject;
+
+
+/********** Base **********/
+
+static inline void
+_init_view(_Multidict_ViewObject *self, PyObject *md)
+{
+    Py_INCREF(md);
+    self->md = md;
+}
+
+static inline void
+multidict_view_dealloc(_Multidict_ViewObject *self)
+{
+    PyObject_GC_UnTrack(self);
+    Py_XDECREF(self->md);
+    PyObject_GC_Del(self);
+}
+
+static inline int
+multidict_view_traverse(_Multidict_ViewObject *self, visitproc visit, void *arg)
+{
+    Py_VISIT(self->md);
+    return 0;
+}
+
+static inline int
+multidict_view_clear(_Multidict_ViewObject *self)
+{
+    Py_CLEAR(self->md);
+    return 0;
+}
+
+static inline Py_ssize_t
+multidict_view_len(_Multidict_ViewObject *self)
+{
+    return pair_list_len(&((MultiDictObject*)self->md)->pairs);
+}
+
+static inline PyObject *
+multidict_view_richcompare(PyObject *self, PyObject *other, int op)
+{
+    PyObject *ret;
+    PyObject *op_obj = PyLong_FromLong(op);
+    if (op_obj == NULL) {
+        return NULL;
+    }
+    ret = PyObject_CallFunctionObjArgs(
+        viewbaseset_richcmp_func, self, other, op_obj, NULL);
+    Py_DECREF(op_obj);
+    return ret;
+}
+
+static inline PyObject *
+multidict_view_and(PyObject *self, PyObject *other)
+{
+    return PyObject_CallFunctionObjArgs(
+        viewbaseset_and_func, self, other, NULL);
+}
+
+static inline PyObject *
+multidict_view_or(PyObject *self, PyObject *other)
+{
+    return PyObject_CallFunctionObjArgs(
+        viewbaseset_or_func, self, other, NULL);
+}
+
+static inline PyObject *
+multidict_view_sub(PyObject *self, PyObject *other)
+{
+    return PyObject_CallFunctionObjArgs(
+        viewbaseset_sub_func, self, other, NULL);
+}
+
+static inline PyObject *
+multidict_view_xor(PyObject *self, PyObject *other)
+{
+    return PyObject_CallFunctionObjArgs(
+        viewbaseset_xor_func, self, other, NULL);
+}
+
+static PyNumberMethods multidict_view_as_number = {
+    .nb_subtract = (binaryfunc)multidict_view_sub,
+    .nb_and = (binaryfunc)multidict_view_and,
+    .nb_xor = (binaryfunc)multidict_view_xor,
+    .nb_or = (binaryfunc)multidict_view_or,
+};
+
+/********** Items **********/
+
+static inline PyObject *
+multidict_itemsview_new(PyObject *md)
+{
+    _Multidict_ViewObject *mv = PyObject_GC_New(
+        _Multidict_ViewObject, &multidict_itemsview_type);
+    if (mv == NULL) {
+        return NULL;
+    }
+
+    _init_view(mv, md);
+
+    PyObject_GC_Track(mv);
+    return (PyObject *)mv;
+}
+
+static inline PyObject *
+multidict_itemsview_iter(_Multidict_ViewObject *self)
+{
+    return multidict_items_iter_new((MultiDictObject*)self->md);
+}
+
+static inline PyObject *
+multidict_itemsview_repr(_Multidict_ViewObject *self)
+{
+    return PyObject_CallFunctionObjArgs(
+        itemsview_repr_func, self, NULL);
+}
+
+static inline PyObject *
+multidict_itemsview_isdisjoint(_Multidict_ViewObject *self, PyObject *other)
+{
+    return PyObject_CallFunctionObjArgs(
+        itemsview_isdisjoint_func, self, other, NULL);
+}
+
+PyDoc_STRVAR(itemsview_isdisjoint_doc,
+             "Return True if two sets have a null intersection.");
+
+static PyMethodDef multidict_itemsview_methods[] = {
+    {
+        "isdisjoint",
+        (PyCFunction)multidict_itemsview_isdisjoint,
+        METH_O,
+        itemsview_isdisjoint_doc
+    },
+    {
+        NULL,
+        NULL
+    }   /* sentinel */
+};
+
+static inline int
+multidict_itemsview_contains(_Multidict_ViewObject *self, PyObject *obj)
+{
+    PyObject *akey  = NULL,
+             *aval  = NULL,
+             *bkey  = NULL,
+             *bval  = NULL,
+             *iter  = NULL,
+             *item  = NULL;
+    int ret1, ret2;
+
+    if (!PyTuple_Check(obj) || PyTuple_GET_SIZE(obj) != 2) {
+        return 0;
+    }
+
+    bkey = PyTuple_GET_ITEM(obj, 0);
+    bval = PyTuple_GET_ITEM(obj, 1);
+
+    iter = multidict_itemsview_iter(self);
+    if (iter == NULL) {
+        return 0;
+    }
+
+    while ((item = PyIter_Next(iter)) != NULL) {
+        akey = PyTuple_GET_ITEM(item, 0);
+        aval = PyTuple_GET_ITEM(item, 1);
+
+        ret1 = PyObject_RichCompareBool(akey, bkey, Py_EQ);
+        if (ret1 < 0) {
+            Py_DECREF(iter);
+            Py_DECREF(item);
+            return -1;
+        }
+        ret2 = PyObject_RichCompareBool(aval, bval, Py_EQ);
+        if (ret2 < 0) {
+            Py_DECREF(iter);
+            Py_DECREF(item);
+            return -1;
+        }
+        if (ret1 > 0 && ret2 > 0)
+        {
+            Py_DECREF(iter);
+            Py_DECREF(item);
+            return 1;
+        }
+
+        Py_DECREF(item);
+    }
+
+    Py_DECREF(iter);
+
+    if (PyErr_Occurred()) {
+        return -1;
+    }
+
+    return 0;
+}
+
+static PySequenceMethods multidict_itemsview_as_sequence = {
+    .sq_length = (lenfunc)multidict_view_len,
+    .sq_contains = (objobjproc)multidict_itemsview_contains,
+};
+
+static PyTypeObject multidict_itemsview_type = {
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
+    "multidict._multidict._ItemsView",              /* tp_name */
+    sizeof(_Multidict_ViewObject),                  /* tp_basicsize */
+    .tp_dealloc = (destructor)multidict_view_dealloc,
+    .tp_repr = (reprfunc)multidict_itemsview_repr,
+    .tp_as_number = &multidict_view_as_number,
+    .tp_as_sequence = &multidict_itemsview_as_sequence,
+    .tp_getattro = PyObject_GenericGetAttr,
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
+    .tp_traverse = (traverseproc)multidict_view_traverse,
+    .tp_clear = (inquiry)multidict_view_clear,
+    .tp_richcompare = multidict_view_richcompare,
+    .tp_iter = (getiterfunc)multidict_itemsview_iter,
+    .tp_methods = multidict_itemsview_methods,
+};
+
+
+/********** Keys **********/
+
+static inline PyObject *
+multidict_keysview_new(PyObject *md)
+{
+    _Multidict_ViewObject *mv = PyObject_GC_New(
+        _Multidict_ViewObject, &multidict_keysview_type);
+    if (mv == NULL) {
+        return NULL;
+    }
+
+    _init_view(mv, md);
+
+    PyObject_GC_Track(mv);
+    return (PyObject *)mv;
+}
+
+static inline PyObject *
+multidict_keysview_iter(_Multidict_ViewObject *self)
+{
+    return multidict_keys_iter_new(((MultiDictObject*)self->md));
+}
+
+static inline PyObject *
+multidict_keysview_repr(_Multidict_ViewObject *self)
+{
+    return PyObject_CallFunctionObjArgs(
+        keysview_repr_func, self, NULL);
+}
+
+static inline PyObject *
+multidict_keysview_isdisjoint(_Multidict_ViewObject *self, PyObject *other)
+{
+    return PyObject_CallFunctionObjArgs(
+        keysview_isdisjoint_func, self, other, NULL);
+}
+
+PyDoc_STRVAR(keysview_isdisjoint_doc,
+             "Return True if two sets have a null intersection.");
+
+static PyMethodDef multidict_keysview_methods[] = {
+    {
+        "isdisjoint",
+        (PyCFunction)multidict_keysview_isdisjoint,
+        METH_O,
+        keysview_isdisjoint_doc
+    },
+    {
+        NULL,
+        NULL
+    }   /* sentinel */
+};
+
+static inline int
+multidict_keysview_contains(_Multidict_ViewObject *self, PyObject *key)
+{
+    return pair_list_contains(&((MultiDictObject*)self->md)->pairs, key);
+}
+
+static PySequenceMethods multidict_keysview_as_sequence = {
+    .sq_length = (lenfunc)multidict_view_len,
+    .sq_contains = (objobjproc)multidict_keysview_contains,
+};
+
+static PyTypeObject multidict_keysview_type = {
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
+    "multidict._multidict._KeysView",              /* tp_name */
+    sizeof(_Multidict_ViewObject),                 /* tp_basicsize */
+    .tp_dealloc = (destructor)multidict_view_dealloc,
+    .tp_repr = (reprfunc)multidict_keysview_repr,
+    .tp_as_number = &multidict_view_as_number,
+    .tp_as_sequence = &multidict_keysview_as_sequence,
+    .tp_getattro = PyObject_GenericGetAttr,
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
+    .tp_traverse = (traverseproc)multidict_view_traverse,
+    .tp_clear = (inquiry)multidict_view_clear,
+    .tp_richcompare = multidict_view_richcompare,
+    .tp_iter = (getiterfunc)multidict_keysview_iter,
+    .tp_methods = multidict_keysview_methods,
+};
+
+
+/********** Values **********/
+
+static inline PyObject *
+multidict_valuesview_new(PyObject *md)
+{
+    _Multidict_ViewObject *mv = PyObject_GC_New(
+        _Multidict_ViewObject, &multidict_valuesview_type);
+    if (mv == NULL) {
+        return NULL;
+    }
+
+    _init_view(mv, md);
+
+    PyObject_GC_Track(mv);
+    return (PyObject *)mv;
+}
+
+static inline PyObject *
+multidict_valuesview_iter(_Multidict_ViewObject *self)
+{
+    return multidict_values_iter_new(((MultiDictObject*)self->md));
+}
+
+static inline PyObject *
+multidict_valuesview_repr(_Multidict_ViewObject *self)
+{
+    return PyObject_CallFunctionObjArgs(
+        valuesview_repr_func, self, NULL);
+}
+
+static PySequenceMethods multidict_valuesview_as_sequence = {
+    .sq_length = (lenfunc)multidict_view_len,
+};
+
+static PyTypeObject multidict_valuesview_type = {
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
+    "multidict._multidict._ValuesView",              /* tp_name */
+    sizeof(_Multidict_ViewObject),                   /* tp_basicsize */
+    .tp_dealloc = (destructor)multidict_view_dealloc,
+    .tp_repr = (reprfunc)multidict_valuesview_repr,
+    .tp_as_sequence = &multidict_valuesview_as_sequence,
+    .tp_getattro = PyObject_GenericGetAttr,
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
+    .tp_traverse = (traverseproc)multidict_view_traverse,
+    .tp_clear = (inquiry)multidict_view_clear,
+    .tp_iter = (getiterfunc)multidict_valuesview_iter,
+};
+
+
+static inline int
+multidict_views_init()
+{
+    PyObject *reg_func_call_result = NULL;
+    PyObject *module = PyImport_ImportModule("multidict._multidict_base");
+    if (module == NULL) {
+        goto fail;
+    }
+
+#define GET_MOD_ATTR(VAR, NAME)                 \
+    VAR = PyObject_GetAttrString(module, NAME); \
+    if (VAR == NULL) {                          \
+        goto fail;                              \
+    }
+
+    GET_MOD_ATTR(viewbaseset_richcmp_func, "_viewbaseset_richcmp");
+    GET_MOD_ATTR(viewbaseset_and_func, "_viewbaseset_and");
+    GET_MOD_ATTR(viewbaseset_or_func, "_viewbaseset_or");
+    GET_MOD_ATTR(viewbaseset_sub_func, "_viewbaseset_sub");
+    GET_MOD_ATTR(viewbaseset_xor_func, "_viewbaseset_xor");
+
+    GET_MOD_ATTR(abc_itemsview_register_func, "_abc_itemsview_register");
+    GET_MOD_ATTR(abc_keysview_register_func, "_abc_keysview_register");
+    GET_MOD_ATTR(abc_valuesview_register_func, "_abc_valuesview_register");
+
+    GET_MOD_ATTR(itemsview_repr_func, "_itemsview_isdisjoint");
+    GET_MOD_ATTR(itemsview_repr_func, "_itemsview_repr");
+
+    GET_MOD_ATTR(keysview_repr_func, "_keysview_repr");
+    GET_MOD_ATTR(keysview_isdisjoint_func, "_keysview_isdisjoint");
+
+    GET_MOD_ATTR(valuesview_repr_func, "_valuesview_repr");
+
+    if (PyType_Ready(&multidict_itemsview_type) < 0 ||
+        PyType_Ready(&multidict_valuesview_type) < 0 ||
+        PyType_Ready(&multidict_keysview_type) < 0)
+    {
+        goto fail;
+    }
+
+    // abc.ItemsView.register(_ItemsView)
+    reg_func_call_result = PyObject_CallFunctionObjArgs(
+        abc_itemsview_register_func, (PyObject*)&multidict_itemsview_type, NULL);
+    if (reg_func_call_result == NULL) {
+        goto fail;
+    }
+    Py_DECREF(reg_func_call_result);
+
+    // abc.KeysView.register(_KeysView)
+    reg_func_call_result = PyObject_CallFunctionObjArgs(
+        abc_keysview_register_func, (PyObject*)&multidict_keysview_type, NULL);
+    if (reg_func_call_result == NULL) {
+        goto fail;
+    }
+    Py_DECREF(reg_func_call_result);
+
+    // abc.ValuesView.register(_KeysView)
+    reg_func_call_result = PyObject_CallFunctionObjArgs(
+        abc_valuesview_register_func, (PyObject*)&multidict_valuesview_type, NULL);
+    if (reg_func_call_result == NULL) {
+        goto fail;
+    }
+    Py_DECREF(reg_func_call_result);
+
+    Py_DECREF(module);
+    return 0;
+
+fail:
+    Py_CLEAR(module);
+    return -1;
+
+#undef GET_MOD_ATTR
+}
+
+#ifdef __cplusplus
+}
+#endif
+#endif