cleanups

Author: HolgerHees

conf/html/shared/habpanel/js/helper.js

@@ -1382,78 +1382,6 @@ var mvInitializer = function(){
             };
         }
     })();
-
-    (function() {
-        'use strict';
-        
-        app.directive("mvDetailInfoStatus", detailInfoStatusLinker);
-
-        function detailInfoStatusLinker() {
-            return {
-                restrict: "A",
-                link: function (scope, elem, attrs) 
-                {
-                    let stateItemName = "pOutdoor_Watering_Logic_Program_State";
-                    let circuitItemName = "gOutdoor_Watering_Circuits";
-                    
-                    function getSVG(icon_name)
-                    {
-                        let msg = "<svg style=\"width:16px;height:16px;stroke:var(--sub-icon-color);filter:brightness(150%);\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" viewBox=\"0 0 64 64\">";
-                        msg += "<use xmlns:xlink=\"http://www.w3.org/1999/xlink\" xlink:href=\"/static/shared/habpanel/svg/icons.svg#" + icon_name + "\"></use>";
-                        msg += "</svg>";
-                        return msg;
-                    }
-                    
-                    function updateValue()
-                    {
-                        let msg_r = [];
-                            
-                        if( scope.itemState(circuitItemName) == 'ON' )
-                        {
-                            let programState = scope.itemState(stateItemName);
-                            
-                            if( programState != "läuft nicht" )
-                            {
-                                msg_r.push( "Bewässerung: " + getSVG('self_rain_grayscaled') + " <span class=\"value\">" + programState + "</span>" );
-                            }
-                        }
-                        else
-                        {
-                            //msg_r.push( "Bewässerung: " + getSVG('openhab_rain_colored') + " <span class=\"value\">Garten links gleich fertig</span>" );
-                        }
-
-                        elem[0].innerHTML = "<div>" + msg_r.join("</div><div>") + "</div>";
-                    }
-                    
-                    scope.$$postDigest(function()
-                    {
-                        // register for item usage
-                        //scope.getItem(stateItemName);
-                        //scope.getItem(circuitItemName)
-
-                        scope.addUpdateListener(function( updatedItemName )
-                        {
-                            //console.log("gOutdoor_Watering_Circuits initialized");
-                            if( updatedItemName != null && updatedItemName != stateItemName && updatedItemName != circuitItemName )
-                            {
-                                return;
-                            }
-                            
-                            updateValue();
-                                    
-                            //elem[0].querySelector(".value").innerHTML = "Bewässerung: Garten links gleich fertig";
-                        });
-                        
-                        // getItem triggers a watcher registration process
-                        //if( scope.getItem(circuitItemName) != null )
-                        //{
-                            //updateValue();
-                        //}
-                    });
-                }
-            };
-        }
-    })();
 };
 
 mvInitializer();

python/shared/helper.py

@@ -16,6 +16,7 @@
 from org.slf4j import LoggerFactory
 
 from org.openhab.core.automation import Rule as SmarthomeRule
+#from org.openhab.core.automation.module.script.LifecycleScriptExtensionProvider import LifecycleTracker
 
 from org.openhab.core.types import UnDefType
 from org.openhab.core.persistence.extensions import PersistenceExtensions
@@ -45,10 +46,14 @@
 
 scriptExtension.importPreset("RuleSupport")
 automationManager = scope.get("automationManager")
+lifecycleTracker = scope.get("lifecycleTracker")
 
 scriptExtension.importPreset("RuleSimple")
 SimpleRule = scope.get("SimpleRule")
 
+def scriptUnloaded():
+    log.info("unload")
+
 class rule(object):
     def __init__(self, name = None,profile=None):
         self.name = name
@@ -68,14 +73,9 @@ def init(self, *args, **kwargs):
             self.triggerItems = {}
             _triggers = []
             for trigger in self.triggers:
-                try:
-                    self.triggerItems[ trigger.getConfiguration().get("itemName") ] = True
-                except NotImplementedError:
-                    # openhab 2.4
-                    self.triggerItems[ trigger.trigger.getConfiguration().get("itemName") ] = True
-                    _triggers.append(trigger.trigger)
-            if len(_triggers) > 0:
-                self.triggers = _triggers
+                self.triggerItems[ trigger.trigger.getConfiguration().get("itemName") ] = True
+                _triggers.append(trigger.trigger)
+            self.triggers = _triggers
 
         subclass = type(clazz.__name__, (clazz, SimpleRule), dict(__init__=init))
         subclass.execute = proxy.executeWrapper(clazz.execute)
@@ -187,6 +187,15 @@ def func_wrapper(self, module, input):
 class NotInitialisedException(Exception):
     pass
 
+# could also be solved by storing it in a private cache => https://next.openhab.org/docs/configuration/jsr223.html
+# because Timer & ScheduledFuture are canceled when a private cache is cleaned on unload or refresh
+activeTimer = []
+def cleanTimer():
+    for timer in list(activeTimer):
+        #log.info("cleanup")
+        timer.cancel()
+lifecycleTracker.addDisposeHook(cleanTimer)
+
 def startTimer(log, duration, callback, args=[], kwargs={}, oldTimer = None, groupCount = 0 ):
     if oldTimer != None:
         oldTimer.cancel()
@@ -218,6 +227,7 @@ def __init__(self,log, duration, callback, args=[], kwargs={}):
     def handler(self):
         try:
             self.callback(*self.args, **self.kwargs)
+            activeTimer.remove(self)
         except:
             self.log.error(u"{}".format(traceback.format_exc()))
             raise
@@ -226,6 +236,7 @@ def start(self):
         if not self.timer.isAlive():
             #log.info("timer started")
             self.timer.start()
+            activeTimer.append(self)
         else:
             #log.info("timer already started")
             pass
@@ -234,6 +245,7 @@ def cancel(self):
         if self.timer.isAlive():
             #log.info("timer stopped")
             self.timer.cancel()
+            activeTimer.remove(self)
         else:
             #log.info("timer not alive")
             pass

python/shared/semantic/command_processor.py

@@ -63,7 +63,7 @@ def __init__(self,log,ir):
 
         self.log = log
 
-        self.semantic_model = SemanticModel(ir,SemanticConfig)
+        self.semantic_model = SemanticModel(log, ir,SemanticConfig)
         self.semantic_model.test(self.log)
 
         self.full_phrase_map, self.full_phrase_terms = self.buildSearchMap(self.semantic_model.getSemanticItem(SemanticConfig["main"]["phrase_equipment"]).getChildren())

python/shared/semantic/model/semantic_model.py

@@ -59,7 +59,9 @@ def test(self,log):
         #log.info(u"{}".format(self.semantic_items["pOther_Scene4"].answer))
         pass
 
-    def __init__(self,item_registry,config):
+    def __init__(self,log,item_registry,config):
+        self.log = log
+
         semantic_tags = {}
 
         # maybe it's possible to get the tags from bundle https://github.com/openhab/openhab-core/tree/main/bundles/org.openhab.core.semantics/src/main/resources