beremiz: runtime/NevowServer.py@3ca5611d6308 (annotated)

1511 91538d0c242c add copyright notices to python files where there were missing, that Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1453 diff changeset	1	#!/usr/bin/env python
91538d0c242c add copyright notices to python files where there were missing, that Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1453 diff changeset	2	# -- coding: utf-8 --
91538d0c242c add copyright notices to python files where there were missing, that Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1453 diff changeset	3
1667 cefc9219bb48 runtime is licensed under LGPLv2.1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1595 diff changeset	4	# This file is part of Beremiz runtime.
1511 91538d0c242c add copyright notices to python files where there were missing, that Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1453 diff changeset	5	#
91538d0c242c add copyright notices to python files where there were missing, that Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1453 diff changeset	6	# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
1680 6db967480b7d make run Beremiz and PLCOpen Editor, if full path contain non-lating Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1667 diff changeset	7	# Copyright (C) 2017: Andrey Skvortsov
1511 91538d0c242c add copyright notices to python files where there were missing, that Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1453 diff changeset	8	#
1667 cefc9219bb48 runtime is licensed under LGPLv2.1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1595 diff changeset	9	# See COPYING.Runtime file for copyrights details.
1511 91538d0c242c add copyright notices to python files where there were missing, that Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1453 diff changeset	10	#
1667 cefc9219bb48 runtime is licensed under LGPLv2.1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1595 diff changeset	11	# This library is free software; you can redistribute it and/or
cefc9219bb48 runtime is licensed under LGPLv2.1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1595 diff changeset	12	# modify it under the terms of the GNU Lesser General Public
cefc9219bb48 runtime is licensed under LGPLv2.1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1595 diff changeset	13	# License as published by the Free Software Foundation; either
cefc9219bb48 runtime is licensed under LGPLv2.1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1595 diff changeset	14	# version 2.1 of the License, or (at your option) any later version.
cefc9219bb48 runtime is licensed under LGPLv2.1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1595 diff changeset	15
cefc9219bb48 runtime is licensed under LGPLv2.1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1595 diff changeset	16	# This library is distributed in the hope that it will be useful,
1511 91538d0c242c add copyright notices to python files where there were missing, that Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1453 diff changeset	17	# but WITHOUT ANY WARRANTY; without even the implied warranty of
1667 cefc9219bb48 runtime is licensed under LGPLv2.1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1595 diff changeset	18	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
cefc9219bb48 runtime is licensed under LGPLv2.1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1595 diff changeset	19	# Lesser General Public License for more details.
cefc9219bb48 runtime is licensed under LGPLv2.1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1595 diff changeset	20
cefc9219bb48 runtime is licensed under LGPLv2.1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1595 diff changeset	21	# You should have received a copy of the GNU Lesser General Public
cefc9219bb48 runtime is licensed under LGPLv2.1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1595 diff changeset	22	# License along with this library; if not, write to the Free Software
cefc9219bb48 runtime is licensed under LGPLv2.1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1595 diff changeset	23	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1511 91538d0c242c add copyright notices to python files where there were missing, that Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1453 diff changeset	24
1826 91796f408540 fix usage of python2-only print statement Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1782 diff changeset	25
1881 091005ec69c4 fix pylint py3k conversion warning: "(no-absolute-import) import missing `from __future__ import absolute_import`" Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1878 diff changeset	26	from __future__ import absolute_import
1826 91796f408540 fix usage of python2-only print statement Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1782 diff changeset	27	from __future__ import print_function
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	28	import os
2670 fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	29	import collections
2247 921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	30	import platform as platform_module
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	31	from zope.interface import implements
32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	32	from nevow import appserver, inevow, tags, loaders, athena, url, rend
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	33	from nevow.page import renderer
2266 ed415982a9aa NevowServer : Added minimalist css style customization and a link to go to settings page and back dporopat <denis.poropat@smarteh.si> parents: 2219 diff changeset	34	from nevow.static import File
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	35	from formless import annotate
32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	36	from formless import webform
2209 ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	37	from formless import configurable
1439 a68cd4253259 Added stub code for runtime WAMP client. Added runtime command line switch to select WAMP url and Nevow web site port. Web port is now fixed, next port number is not tested if bind fails. Edouard Tisserant parents: 1438 diff changeset	38	from twisted.internet import reactor
2210 81949104291d Nevow based web interface now show simple Log message sending form for basic runtime, and allow extensions to add their own web settings. Edouard Tisserant parents: 2209 diff changeset	39
1919 ccea0fa6ea91 Another set of meaningless changes to satisfy PEP8 and PyLint. Edouard Tisserant parents: 1881 diff changeset	40	import util.paths as paths
2210 81949104291d Nevow based web interface now show simple Log message sending form for basic runtime, and allow extensions to add their own web settings. Edouard Tisserant parents: 2209 diff changeset	41	from runtime.loglevels import LogLevels, LogLevelsDict
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	42
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	43	PAGE_TITLE = 'Beremiz Runtime Web Interface'
32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	44
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	45	xhtml_header = '''<?xml version="1.0" encoding="utf-8"?>
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	46	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	47	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	48	'''
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	49
1453 f31353cac197 Fixed Nevow website startup Edouard Tisserant parents: 1439 diff changeset	50	WorkingDir = None
2210 81949104291d Nevow based web interface now show simple Log message sending form for basic runtime, and allow extensions to add their own web settings. Edouard Tisserant parents: 2209 diff changeset	51	_PySrv = None
1453 f31353cac197 Fixed Nevow website startup Edouard Tisserant parents: 1439 diff changeset	52
1736 7e61baa047f0 clean-up: fix PEP8 E302 expected 2 blank lines, found 1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1682 diff changeset	53
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	54	class PLCHMI(athena.LiveElement):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	55
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	56	initialised = False
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	57
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	58	def HMIinitialised(self, result):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	59	self.initialised = True
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	60
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	61	def HMIinitialisation(self):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	62	self.HMIinitialised(None)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	63
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	64
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	65	class DefaultPLCStartedHMI(PLCHMI):
1878 fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block' Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1870 diff changeset	66	docFactory = loaders.stan(
fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block' Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1870 diff changeset	67	tags.div(render=tags.directive('liveElement'))[
fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block' Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1870 diff changeset	68	tags.h1["PLC IS NOW STARTED"],
fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block' Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1870 diff changeset	69	])
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	70
1736 7e61baa047f0 clean-up: fix PEP8 E302 expected 2 blank lines, found 1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1682 diff changeset	71
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	72	class PLCStoppedHMI(PLCHMI):
1878 fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block' Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1870 diff changeset	73	docFactory = loaders.stan(
fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block' Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1870 diff changeset	74	tags.div(render=tags.directive('liveElement'))[
fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block' Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1870 diff changeset	75	tags.h1["PLC IS STOPPED"],
fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block' Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1870 diff changeset	76	])
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	77
1736 7e61baa047f0 clean-up: fix PEP8 E302 expected 2 blank lines, found 1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1682 diff changeset	78
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	79	class MainPage(athena.LiveElement):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	80	jsClass = u"WebInterface.PLC"
1878 fb73a6b6622d fix pylint warning '(bad-continuation) Wrong hanging indentation before block' Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1870 diff changeset	81	docFactory = loaders.stan(
2266 ed415982a9aa NevowServer : Added minimalist css style customization and a link to go to settings page and back dporopat <denis.poropat@smarteh.si> parents: 2219 diff changeset	82	tags.invisible[
ed415982a9aa NevowServer : Added minimalist css style customization and a link to go to settings page and back dporopat <denis.poropat@smarteh.si> parents: 2219 diff changeset	83	tags.div(render=tags.directive('liveElement'))[
ed415982a9aa NevowServer : Added minimalist css style customization and a link to go to settings page and back dporopat <denis.poropat@smarteh.si> parents: 2219 diff changeset	84	tags.div(id='content')[
ed415982a9aa NevowServer : Added minimalist css style customization and a link to go to settings page and back dporopat <denis.poropat@smarteh.si> parents: 2219 diff changeset	85	tags.div(render=tags.directive('PLCElement'))]
ed415982a9aa NevowServer : Added minimalist css style customization and a link to go to settings page and back dporopat <denis.poropat@smarteh.si> parents: 2219 diff changeset	86	],
ed415982a9aa NevowServer : Added minimalist css style customization and a link to go to settings page and back dporopat <denis.poropat@smarteh.si> parents: 2219 diff changeset	87	tags.a(href='settings')['Settings']])
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	88
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	89	def __init__(self, a, *kw):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	90	athena.LiveElement.__init__(self, a, *kw)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	91	self.pcl_state = False
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	92	self.HMI = None
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	93	self.resetPLCStartedHMI()
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	94
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	95	def setPLCState(self, state):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	96	self.pcl_state = state
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	97	if self.HMI is not None:
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	98	self.callRemote('updateHMI')
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	99
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	100	def setPLCStartedHMI(self, hmi):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	101	self.PLCStartedHMIClass = hmi
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	102
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	103	def resetPLCStartedHMI(self):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	104	self.PLCStartedHMIClass = DefaultPLCStartedHMI
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	105
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	106	def getHMI(self):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	107	return self.HMI
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	108
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	109	def HMIexec(self, function, args, *kwargs):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	110	if self.HMI is not None:
1740 b789b695b5c6 clean-up: fix PEP8 E231 missing whitespace after ':' or ',' Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1736 diff changeset	111	getattr(self.HMI, function, lambda: None)(args, *kwargs)
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	112	athena.expose(HMIexec)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	113
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	114	def resetHMI(self):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	115	self.HMI = None
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	116
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	117	def PLCElement(self, ctx, data):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	118	return self.getPLCElement()
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	119	renderer(PLCElement)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	120
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	121	def getPLCElement(self):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	122	self.detachFragmentChildren()
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	123	if self.pcl_state:
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	124	f = self.PLCStartedHMIClass()
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	125	else:
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	126	f = PLCStoppedHMI()
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	127	f.setFragmentParent(self)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	128	self.HMI = f
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	129	return f
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	130	athena.expose(getPLCElement)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	131
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	132	def detachFragmentChildren(self):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	133	for child in self.liveFragmentChildren[:]:
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	134	child.detach()
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	135
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	136
2209 ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	137	class ConfigurableBindings(configurable.Configurable):
ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	138
ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	139	def __init__(self):
ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	140	configurable.Configurable.__init__(self, None)
ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	141	self.bindingsNames = []
2262 4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	142	self.infostringcount = 0
2209 ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	143
ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	144	def getBindingNames(self, ctx):
ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	145	return self.bindingsNames
ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	146
2262 4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	147	def addInfoString(self, label, value, name=None):
2267 e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	148	if isinstance(value, str):
2262 4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	149	def default(*k):
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	150	return value
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	151	else:
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	152	def default(*k):
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	153	return value()
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	154
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	155	if name is None:
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	156	name = "_infostring_" + str(self.infostringcount)
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	157	self.infostringcount = self.infostringcount + 1
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	158
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	159	def _bind(ctx):
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	160	return annotate.Property(
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	161	name,
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	162	annotate.String(
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	163	label=label,
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	164	default=default,
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	165	immutable=True))
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	166	setattr(self, 'bind_' + name, _bind)
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	167	self.bindingsNames.append(name)
4195545e2d17 NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity. Edouard Tisserant parents: 2260 diff changeset	168
2670 fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	169	def addSettings(self, name, desc, fields, btnlabel, callback):
2209 ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	170	def _bind(ctx):
ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	171	return annotate.MethodBinding(
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	172	'action_' + name,
2247 921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	173	annotate.Method(
921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	174	arguments=[
921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	175	annotate.Argument(*field)
921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	176	for field in fields],
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	177	label=desc),
51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	178	action=btnlabel)
51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	179	setattr(self, 'bind_' + name, _bind)
51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	180
51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	181	setattr(self, 'action_' + name, callback)
2209 ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	182
2670 fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	183	self.bindingsNames.append(name)
2654 7575050a80c5 Add web extension: configure Modbus plugin parameters (currently only supports Modbus clients) Mario de Sousa <msousa@fe.up.pt> parents: 2649 diff changeset	184
2260 74205edac761 Some blank lines to make bitbucket's PEP8 2.2.0 happy Edouard Tisserant parents: 2247 diff changeset	185
2209 ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	186	ConfigurableSettings = ConfigurableBindings()
ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	187
2672 4bc60e426dd6 Runtime extrension web settings: distinguish display string and token when calling NS.newExtensionSetting, thus allowing meaningful name to be displayed instead of an id. Edouard Tisserant parents: 2670 diff changeset	188	def newExtensionSetting(display, token):
2670 fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	189	global extensions_settings_od
fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	190	settings = ConfigurableBindings()
2672 4bc60e426dd6 Runtime extrension web settings: distinguish display string and token when calling NS.newExtensionSetting, thus allowing meaningful name to be displayed instead of an id. Edouard Tisserant parents: 2670 diff changeset	191	extensions_settings_od[token] = (settings, display)
2670 fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	192	return settings
fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	193
2672 4bc60e426dd6 Runtime extrension web settings: distinguish display string and token when calling NS.newExtensionSetting, thus allowing meaningful name to be displayed instead of an id. Edouard Tisserant parents: 2670 diff changeset	194	def removeExtensionSetting(token):
2670 fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	195	global extensions_settings_od
2672 4bc60e426dd6 Runtime extrension web settings: distinguish display string and token when calling NS.newExtensionSetting, thus allowing meaningful name to be displayed instead of an id. Edouard Tisserant parents: 2670 diff changeset	196	extensions_settings_od.pop(token)
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	197
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	198	class ISettings(annotate.TypedInterface):
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	199	platform = annotate.String(label=_("Platform"),
2247 921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	200	default=platform_module.system() +
921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	201	" " + platform_module.release(),
921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	202	immutable=True)
921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	203
2217 a603d1ba287b Added some immutable field (platform) in default runtime web setting page, for the example. Edouard Tisserant parents: 2214 diff changeset	204	# TODO version ?
a603d1ba287b Added some immutable field (platform) in default runtime web setting page, for the example. Edouard Tisserant parents: 2214 diff changeset	205
2247 921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	206	# pylint: disable=no-self-argument
2210 81949104291d Nevow based web interface now show simple Log message sending form for basic runtime, and allow extensions to add their own web settings. Edouard Tisserant parents: 2209 diff changeset	207	def sendLogMessage(
2247 921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	208	ctx=annotate.Context(),
921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	209	level=annotate.Choice(LogLevels,
921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	210	required=True,
921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	211	label=_("Log message level")),
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	212	message=annotate.String(label=_("Message text"))):
2247 921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	213	pass
921ba5658183 pylint on runtime/NevowServer.py Edouard Tisserant parents: 2246 diff changeset	214
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	215	sendLogMessage = annotate.autocallable(sendLogMessage,
51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	216	label=_(
51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	217	"Send a message to the log"),
2210 81949104291d Nevow based web interface now show simple Log message sending form for basic runtime, and allow extensions to add their own web settings. Edouard Tisserant parents: 2209 diff changeset	218	action=_("Send"))
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	219
2260 74205edac761 Some blank lines to make bitbucket's PEP8 2.2.0 happy Edouard Tisserant parents: 2247 diff changeset	220
2219 73042b2d8d65 Added a way for extension to register dedicated URL under settings page URL (i.e. /settings/something) Edouard Tisserant parents: 2217 diff changeset	221	customSettingsURLs = {
73042b2d8d65 Added a way for extension to register dedicated URL under settings page URL (i.e. /settings/something) Edouard Tisserant parents: 2217 diff changeset	222	}
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	223
2670 fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	224	extensions_settings_od = collections.OrderedDict()
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	225
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	226	class SettingsPage(rend.Page):
32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	227	# We deserve a slash
32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	228	addSlash = True
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	229
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	230	# This makes webform_css url answer some default CSS
32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	231	child_webform_css = webform.defaultCSS
2266 ed415982a9aa NevowServer : Added minimalist css style customization and a link to go to settings page and back dporopat <denis.poropat@smarteh.si> parents: 2219 diff changeset	232	child_webinterface_css = File(paths.AbsNeighbourFile(__file__, 'webinterface.css'), 'text/css')
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	233
32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	234	implements(ISettings)
2670 fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	235
fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	236	def __getattr__(self, name):
fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	237	global extensions_settings_od
fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	238	if name.startswith('configurable_'):
2672 4bc60e426dd6 Runtime extrension web settings: distinguish display string and token when calling NS.newExtensionSetting, thus allowing meaningful name to be displayed instead of an id. Edouard Tisserant parents: 2670 diff changeset	239	token = name[13:]
2670 fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	240	def configurable_something(ctx):
2672 4bc60e426dd6 Runtime extrension web settings: distinguish display string and token when calling NS.newExtensionSetting, thus allowing meaningful name to be displayed instead of an id. Edouard Tisserant parents: 2670 diff changeset	241	settings, _display = extensions_settings_od[token]
4bc60e426dd6 Runtime extrension web settings: distinguish display string and token when calling NS.newExtensionSetting, thus allowing meaningful name to be displayed instead of an id. Edouard Tisserant parents: 2670 diff changeset	242	return settings
2670 fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	243	return configurable_something
fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	244	raise AttributeError
fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	245
fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	246	def extensions_settings(self, context, data):
fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	247	""" Project extensions settings
fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	248	Extensions added to Configuration Tree in IDE have their setting rendered here
fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	249	"""
fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	250	global extensions_settings_od
fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	251	res = []
2672 4bc60e426dd6 Runtime extrension web settings: distinguish display string and token when calling NS.newExtensionSetting, thus allowing meaningful name to be displayed instead of an id. Edouard Tisserant parents: 2670 diff changeset	252	for token in extensions_settings_od:
4bc60e426dd6 Runtime extrension web settings: distinguish display string and token when calling NS.newExtensionSetting, thus allowing meaningful name to be displayed instead of an id. Edouard Tisserant parents: 2670 diff changeset	253	_settings, display = extensions_settings_od[token]
4bc60e426dd6 Runtime extrension web settings: distinguish display string and token when calling NS.newExtensionSetting, thus allowing meaningful name to be displayed instead of an id. Edouard Tisserant parents: 2670 diff changeset	254	res += [tags.h2[display], webform.renderForms(token)]
2670 fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	255	return res
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	256
32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	257	docFactory = loaders.stan([tags.html[
2267 e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	258	tags.head[
e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	259	tags.title[_("Beremiz Runtime Settings")],
e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	260	tags.link(rel='stylesheet',
e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	261	type='text/css',
e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	262	href=url.here.child("webform_css")),
e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	263	tags.link(rel='stylesheet',
e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	264	type='text/css',
e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	265	href=url.here.child("webinterface_css"))
e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	266	],
e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	267	tags.body[
e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	268	tags.a(href='/')['Back'],
e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	269	tags.h1["Runtime settings:"],
e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	270	webform.renderForms('staticSettings'),
e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	271	tags.h1["Extensions settings:"],
e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	272	webform.renderForms('dynamicSettings'),
2670 fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	273	extensions_settings
2267 e83aa36b6627 merged Edouard Tisserant parents: 2262 2266 diff changeset	274	]]])
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	275
2209 ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	276	def configurable_staticSettings(self, ctx):
ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	277	return configurable.TypedInterfaceConfigurable(self)
ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	278
ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	279	def configurable_dynamicSettings(self, ctx):
2670 fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	280	""" Runtime Extensions settings
fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	281	Extensions loaded through Beremiz_service -e or optional runtime features render setting forms here
fd348d79a1f3 BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter. Edouard Tisserant parents: 2654 diff changeset	282	"""
2209 ee2675e4778d Now, runtime extensions should be able to add their own settings to web configuration interface. Edouard Tisserant parents: 2208 diff changeset	283	return ConfigurableSettings
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	284
2210 81949104291d Nevow based web interface now show simple Log message sending form for basic runtime, and allow extensions to add their own web settings. Edouard Tisserant parents: 2209 diff changeset	285	def sendLogMessage(self, level, message, **kwargs):
81949104291d Nevow based web interface now show simple Log message sending form for basic runtime, and allow extensions to add their own web settings. Edouard Tisserant parents: 2209 diff changeset	286	level = LogLevelsDict[level]
81949104291d Nevow based web interface now show simple Log message sending form for basic runtime, and allow extensions to add their own web settings. Edouard Tisserant parents: 2209 diff changeset	287	if _PySrv.plcobj is not None:
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	288	_PySrv.plcobj.LogMessage(
51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	289	level, "Web form log message: " + message)
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	290
2219 73042b2d8d65 Added a way for extension to register dedicated URL under settings page URL (i.e. /settings/something) Edouard Tisserant parents: 2217 diff changeset	291	def locateChild(self, ctx, segments):
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	292	if segments[0] in customSettingsURLs:
2219 73042b2d8d65 Added a way for extension to register dedicated URL under settings page URL (i.e. /settings/something) Edouard Tisserant parents: 2217 diff changeset	293	return customSettingsURLs[segments[0]](ctx, segments)
73042b2d8d65 Added a way for extension to register dedicated URL under settings page URL (i.e. /settings/something) Edouard Tisserant parents: 2217 diff changeset	294	return super(SettingsPage, self).locateChild(ctx, segments)
73042b2d8d65 Added a way for extension to register dedicated URL under settings page URL (i.e. /settings/something) Edouard Tisserant parents: 2217 diff changeset	295
1736 7e61baa047f0 clean-up: fix PEP8 E302 expected 2 blank lines, found 1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1682 diff changeset	296
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	297	class WebInterface(athena.LivePage):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	298
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	299	docFactory = loaders.stan([tags.raw(xhtml_header),
1767 c74815729afd clean-up: fix PEP8 E127 continuation line over-indented for visual indent Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1756 diff changeset	300	tags.html(xmlns="http://www.w3.org/1999/xhtml")[
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	301	tags.head(render=tags.directive('liveglue'))[
32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	302	tags.title[PAGE_TITLE],
32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	303	tags.link(rel='stylesheet',
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	304	type='text/css',
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	305	href=url.here.child("webform_css"))
32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	306	],
1767 c74815729afd clean-up: fix PEP8 E127 continuation line over-indented for visual indent Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1756 diff changeset	307	tags.body[
c74815729afd clean-up: fix PEP8 E127 continuation line over-indented for visual indent Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1756 diff changeset	308	tags.div[
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	309	tags.div(
51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	310	render=tags.directive(
51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	311	"MainPage")),
1767 c74815729afd clean-up: fix PEP8 E127 continuation line over-indented for visual indent Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1756 diff changeset	312	]]]])
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	313	MainPage = MainPage()
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	314	PLCHMI = PLCHMI
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	315
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	316	def child_settings(self, context):
32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	317	return SettingsPage()
32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	318
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	319	def __init__(self, plcState=False, a, *kw):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	320	super(WebInterface, self).__init__(a, *kw)
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	321	self.jsModules.mapping[u'WebInterface'] = paths.AbsNeighbourFile(
51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	322	__file__, 'webinterface.js')
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	323	self.plcState = plcState
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	324	self.MainPage.setPLCState(plcState)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	325
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	326	def getHMI(self):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	327	return self.MainPage.getHMI()
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	328
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	329	def LoadHMI(self, hmi, jsmodules):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	330	for name, path in jsmodules.iteritems():
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	331	self.jsModules.mapping[name] = os.path.join(WorkingDir, path)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	332	self.MainPage.setPLCStartedHMI(hmi)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	333
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	334	def UnLoadHMI(self):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	335	self.MainPage.resetPLCStartedHMI()
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	336
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	337	def PLCStarted(self):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	338	self.plcState = True
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	339	self.MainPage.setPLCState(True)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	340
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	341	def PLCStopped(self):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	342	self.plcState = False
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	343	self.MainPage.setPLCState(False)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	344
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	345	def renderHTTP(self, ctx):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	346	"""
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	347	Force content type to fit with SVG
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	348	"""
1870 4d070115b552 fix pylint error '(too-many-function-args) Too many positional arguments for function call' Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1850 diff changeset	349	req = ctx.locate(inevow.IRequest)
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	350	req.setHeader('Content-type', 'application/xhtml+xml')
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	351	return super(WebInterface, self).renderHTTP(ctx)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	352
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	353	def render_MainPage(self, ctx, data):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	354	f = self.MainPage
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	355	f.setFragmentParent(self)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	356	return ctx.tag[f]
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	357
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	358	def child_(self, ctx):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	359	self.MainPage.detachFragmentChildren()
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	360	return WebInterface(plcState=self.plcState)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	361
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	362	def beforeRender(self, ctx):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	363	d = self.notifyOnDisconnect()
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	364	d.addErrback(self.disconnected)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	365
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	366	def disconnected(self, reason):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	367	self.MainPage.resetHMI()
1782 5b6ad7a7fd9d clean-up: fix PEP8 E265 block comment should start with '# ' Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1776 diff changeset	368	# print reason
5b6ad7a7fd9d clean-up: fix PEP8 E265 block comment should start with '# ' Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1776 diff changeset	369	# print "We will be called back when the client disconnects"
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	370
1736 7e61baa047f0 clean-up: fix PEP8 E302 expected 2 blank lines, found 1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1682 diff changeset	371
2311 bef2b4b87370 Beremiz_service now binds both pyro and nevow ports to interface given with '-i' argument. Edouard Tisserant parents: 2267 diff changeset	372	def RegisterWebsite(iface, port):
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	373	website = WebInterface()
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	374	site = appserver.NevowSite(website)
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	375
2311 bef2b4b87370 Beremiz_service now binds both pyro and nevow ports to interface given with '-i' argument. Edouard Tisserant parents: 2267 diff changeset	376	reactor.listenTCP(port, site, interface=iface)
1826 91796f408540 fix usage of python2-only print statement Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1782 diff changeset	377	print(_('HTTP interface port :'), port)
1439 a68cd4253259 Added stub code for runtime WAMP client. Added runtime command line switch to select WAMP url and Nevow web site port. Web port is now fixed, next port number is not tested if bind fails. Edouard Tisserant parents: 1438 diff changeset	378	return website
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	379
2210 81949104291d Nevow based web interface now show simple Log message sending form for basic runtime, and allow extensions to add their own web settings. Edouard Tisserant parents: 2209 diff changeset	380
1831 56b48961cc68 fix (old-style-class) Old-style class defined error for most parts of Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1826 diff changeset	381	class statuslistener(object):
2246 51047284cb0e pep8 on runtime/NevowServer.py Edouard Tisserant parents: 2219 diff changeset	382
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	383	def __init__(self, site):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	384	self.oldstate = None
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	385	self.site = site
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	386
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	387	def listen(self, state):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	388	if state != self.oldstate:
1453 f31353cac197 Fixed Nevow website startup Edouard Tisserant parents: 1439 diff changeset	389	action = {'Started': self.site.PLCStarted,
f31353cac197 Fixed Nevow website startup Edouard Tisserant parents: 1439 diff changeset	390	'Stopped': self.site.PLCStopped}.get(state, None)
1756 08e4394ff4fb clean-up: fix PEP8 E701 multiple statements on one line (colon) Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1746 diff changeset	391	if action is not None:
08e4394ff4fb clean-up: fix PEP8 E701 multiple statements on one line (colon) Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1746 diff changeset	392	action()
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	393	self.oldstate = state
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	394
1736 7e61baa047f0 clean-up: fix PEP8 E302 expected 2 blank lines, found 1 Andrey Skvortsov <andrej.skvortzov@gmail.com> parents: 1682 diff changeset	395
1438 19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	396	def website_statuslistener_factory(site):
19ebe96b41c0 Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup Edouard Tisserant parents: diff changeset	397	return statuslistener(site).listen
2208 32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	398
32dcacb67f7a Embrio of setting form, just to test Edouard Tisserant parents: 1919 diff changeset	399
2210 81949104291d Nevow based web interface now show simple Log message sending form for basic runtime, and allow extensions to add their own web settings. Edouard Tisserant parents: 2209 diff changeset	400	def SetServer(pysrv):
81949104291d Nevow based web interface now show simple Log message sending form for basic runtime, and allow extensions to add their own web settings. Edouard Tisserant parents: 2209 diff changeset	401	global _PySrv
81949104291d Nevow based web interface now show simple Log message sending form for basic runtime, and allow extensions to add their own web settings. Edouard Tisserant parents: 2209 diff changeset	402	_PySrv = pysrv

author	Edouard Tisserant
	Tue, 16 Jun 2020 10:12:21 +0200
changeset 2675	3ca5611d6308
parent 2672	4bc60e426dd6
child 2700	144b149cded4
permissions	-rw-r--r--