-
-
Notifications
You must be signed in to change notification settings - Fork 70
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Backwards compatibility for package name changes (#109)
Signed-off-by: Scott Rushworth <openhab@5iver.com>
- Loading branch information
Scott Rushworth
authored
May 20, 2019
1 parent
9c8027e
commit 3f93b71
Showing
31 changed files
with
579 additions
and
451 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
Community/ideAlarm/automation/lib/python/community/idealarm/__init__.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 0 additions & 55 deletions
55
Core/automation/jsr223/core/components/100_ShutdownTrigger.py
This file was deleted.
Oops, something went wrong.
49 changes: 25 additions & 24 deletions
49
Core/automation/jsr223/core/components/100_StartupTrigger.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,56 @@ | ||
| from org.eclipse.smarthome.automation import Visibility | ||
| from org.eclipse.smarthome.automation.handler import TriggerHandler | ||
| scriptExtension.importPreset(None) | ||
|
|
||
| import traceback | ||
|
|
||
| try: | ||
| from org.openhab.core.automation.handler import TriggerHandler | ||
| except: | ||
| from org.eclipse.smarthome.automation.handler import TriggerHandler | ||
|
|
||
| import core | ||
| from core.jsr223 import scope | ||
| from core.log import logging, LOG_PREFIX | ||
|
|
||
| log = logging.getLogger(LOG_PREFIX + ".core.StartupTrigger") | ||
|
|
||
| scriptExtension.importPreset("RuleSimple") | ||
| scriptExtension.importPreset("RuleSupport") | ||
| scriptExtension.importPreset("RuleFactories") | ||
|
|
||
| class _StartupTriggerHandlerFactory(TriggerHandlerFactory): | ||
|
|
||
| class Handler(TriggerHandler): | ||
| def __init__(self, trigger): | ||
| self.trigger = trigger | ||
|
|
||
| def setRuleEngineCallback(self, rule_engine_callback): | ||
| rule_engine_callback.triggered(self.trigger, {'startup': True}) | ||
| def setCallback(self, callback): | ||
| from threading import Timer | ||
| startTimer = Timer(1, lambda: callback.triggered(self.trigger, {'startup': True})) | ||
| startTimer.start() | ||
|
|
||
| def dispose(self): | ||
| pass | ||
|
|
||
| def get(self, trigger): | ||
| return _StartupTriggerHandlerFactory.Handler(trigger) | ||
| return self.Handler(trigger) | ||
|
|
||
| def ungetHandler(self, module, ruleUID, handler): | ||
| pass | ||
|
|
||
| def dispose(self): | ||
| pass | ||
|
|
||
| core.STARTUP_MODULE_ID = "jsr223.StartupTrigger" | ||
|
|
||
| def scriptLoaded(*args): | ||
| automationManager.addTriggerHandler( | ||
| core.STARTUP_MODULE_ID, | ||
| _StartupTriggerHandlerFactory()) | ||
| def scriptLoaded(id): | ||
| automationManager.addTriggerHandler(core.STARTUP_MODULE_ID, _StartupTriggerHandlerFactory()) | ||
| log.info("TriggerHandler added [{}]".format(core.STARTUP_MODULE_ID)) | ||
|
|
||
| automationManager.addTriggerType(TriggerType( | ||
| core.STARTUP_MODULE_ID, | ||
| [], | ||
| "the rule is activated", | ||
| "Triggers when a rule is activated the first time", | ||
| set(), | ||
| Visibility.VISIBLE, | ||
| [])) | ||
| automationManager.addTriggerType(TriggerType(core.STARTUP_MODULE_ID, None, | ||
| "System started or rule saved", | ||
| "Triggers when the rule is added, which occurs when the system has started or the rule has been saved", | ||
| None, Visibility.VISIBLE, None)) | ||
| log.info("TriggerType added [{}]".format(core.STARTUP_MODULE_ID)) | ||
|
|
||
| def scriptUnloaded(): | ||
| automationManager.removeHandler(core.STARTUP_MODULE_ID) | ||
| automationManager.removeModuleType(core.STARTUP_MODULE_ID) | ||
| log.info("TriggerType and TriggerHandler removed [{}]".format(core.STARTUP_MODULE_ID)) | ||
| log.info("TriggerType and TriggerHandler removed") |
61 changes: 39 additions & 22 deletions
61
Core/automation/jsr223/core/components/200_JythonBindingInfoProvider.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,49 @@ | ||
| from org.eclipse.smarthome.core.binding import BindingInfoProvider | ||
| scriptExtension.importPreset(None) | ||
|
|
||
| import core | ||
| from distutils.log import info | ||
|
|
||
| class JythonBindingInfoProvider(BindingInfoProvider): | ||
| def __init__(self): | ||
| self.binding_infos = {} | ||
|
|
||
| def getBindingInfo(self, id, locale): | ||
| return self.binding_infos.get(id, None) | ||
|
|
||
| def getBindingInfos(self, locale): | ||
| return set(self.binding_infos.values()) | ||
| provider_class = None | ||
| try: | ||
| from org.openhab.core.binding import BindingInfoProvider | ||
| provider_class = "org.openhab.core.binding.BindingInfoProvider" | ||
| except: | ||
| from org.eclipse.smarthome.core.binding import BindingInfoProvider | ||
| provider_class = "org.eclipse.smarthome.core.binding.BindingInfoProvider" | ||
|
|
||
| def add(self, info): | ||
| self.binding_infos[info.id] = info | ||
| import core | ||
| from core.log import logging, LOG_PREFIX | ||
|
|
||
| try: | ||
| class JythonBindingInfoProvider(BindingInfoProvider): | ||
| def __init__(self): | ||
| self.binding_infos = {} | ||
|
|
||
| def getBindingInfo(self, id, locale): | ||
| return self.binding_infos.get(id, None) | ||
|
|
||
| def remove(self, info): | ||
| if info.id in self.binding_infos: | ||
| del self.binding_infos[info.id] | ||
| def getBindingInfos(self, locale): | ||
| return set(self.binding_infos.values()) | ||
|
|
||
| def add(self, info): | ||
| self.binding_infos[info.id] = info | ||
|
|
||
| core.JythonBindingInfoProvider = JythonBindingInfoProvider() | ||
| def remove(self, info): | ||
| if info.id in self.binding_infos: | ||
| del self.binding_infos[info.id] | ||
|
|
||
| core.JythonBindingInfoProvider = JythonBindingInfoProvider() | ||
| except: | ||
| core.JythonBindingInfoProvider = None | ||
| import traceback | ||
| logging.getLogger(LOG_PREFIX + ".core.JythonBindingInfoProvider").warn(traceback.format_exc()) | ||
|
|
||
| def scriptLoaded(id): | ||
| core.osgi.register_service( | ||
| core.JythonBindingInfoProvider, | ||
| ["org.eclipse.smarthome.core.binding.BindingInfoProvider"]) | ||
| if core.JythonBindingInfoProvider is not None: | ||
| core.osgi.register_service(core.JythonBindingInfoProvider, [provider_class]) | ||
| logging.getLogger(LOG_PREFIX + ".core.JythonBindingInfoProvider.scriptLoaded").debug("Registered service") | ||
|
|
||
| def scriptUnloaded(): | ||
| core.osgi.unregister_service(core.JythonBindingInfoProvider) | ||
| delattr(core, 'JythonBindingInfoProvider') | ||
| if core.JythonBindingInfoProvider is not None: | ||
| core.osgi.unregister_service(core.JythonBindingInfoProvider) | ||
| core.JythonBindingInfoProvider = None | ||
| logging.getLogger(LOG_PREFIX + ".core.JythonBindingInfoProvider.scriptUnloaded").debug("Unregistered service") |
Oops, something went wrong.