RevPiPyLoad Dienste als Gruppe anzeigen

Status der Dienste integriert
FileHandler wurden in Programmfenster nicht geschlossen
programpath.dat wird aufger?umt, wenn RevPi Liste gespeichert wird

doc/mytools.html

@@ -12,7 +12,7 @@ Tools-Sammlung.
 <h3 style="background-color:#FFFFFF;color:#FF0000">
 Global Attributes</h3>
 <table>
-<tr><td>None</td></tr>
+<tr><td>savefile_connections</td></tr><tr><td>savefile_programpath</td></tr>
 </table>
 <h3 style="background-color:#FFFFFF;color:#FF0000">
 Classes</h3>

doc/revpiplclist.html

@@ -10,7 +10,7 @@ revpiplclist</h1>
 <h3 style="background-color:#FFFFFF;color:#FF0000">
 Global Attributes</h3>
 <table>
-<tr><td>_</td></tr><tr><td>savefile</td></tr>
+<tr><td>_</td></tr>
 </table>
 <h3 style="background-color:#FFFFFF;color:#FF0000">
 Classes</h3>

doc/revpiprogram.html

@@ -10,7 +10,7 @@ revpiprogram</h1>
 <h3 style="background-color:#FFFFFF;color:#FF0000">
 Global Attributes</h3>
 <table>
-<tr><td>_</td></tr><tr><td>savefile</td></tr>
+<tr><td>_</td></tr>
 </table>
 <h3 style="background-color:#FFFFFF;color:#FF0000">
 Classes</h3>
@@ -23,7 +23,13 @@ Classes</h3>
 <h3 style="background-color:#FFFFFF;color:#FF0000">
 Functions</h3>
 <table>
-<tr><td>None</td></tr>
+<tr>
+<td><a style="color:#0000FF" href="#_loaddefaults">_loaddefaults</a></td>
+<td>&#220;bernimmt f&#252;r den Pi die letzen Pfade.</td>
+</tr><tr>
+<td><a style="color:#0000FF" href="#_savedefaults">_savedefaults</a></td>
+<td>Schreibt fuer den Pi die letzen Pfade.</td>
+</tr>
 </table>
 <hr /><hr />
 <a NAME="RevPiProgram" ID="RevPiProgram"></a>
@@ -63,12 +69,6 @@ Methods</h3>
 <td><a style="color:#0000FF" href="#RevPiProgram._evt_optup">_evt_optup</a></td>
 <td>Passt je nach gew&#228;hlter Option den Status der Widgets an.</td>
 </tr><tr>
-<td><a style="color:#0000FF" href="#RevPiProgram._loaddefault">_loaddefault</a></td>
-<td>&#220;bernimmt f&#252;r den Pi die letzen Pfade.</td>
-</tr><tr>
-<td><a style="color:#0000FF" href="#RevPiProgram._savedefaults">_savedefaults</a></td>
-<td>Schreibt fuer den Pi die letzen Pfade.</td>
-</tr><tr>
 <td><a style="color:#0000FF" href="#RevPiProgram.check_replacedir">check_replacedir</a></td>
 <td>Gibt das rootdir von einem entpackten Verzeichnis zurueck.</td>
 </tr><tr>
@@ -139,34 +139,7 @@ RevPiProgram._evt_optup</h3>
 <b>_evt_optup</b>(<i>text=""</i>)
 <p>
 Passt je nach gew&#228;hlter Option den Status der Widgets an.
-</p><a NAME="RevPiProgram._loaddefault" ID="RevPiProgram._loaddefault"></a>
-<h3 style="background-color:#FFFFFF;color:#FF0000">
-RevPiProgram._loaddefault</h3>
-<b>_loaddefault</b>(<i>full=False</i>)
-<p>
-&#220;bernimmt f&#252;r den Pi die letzen Pfade.
-</p><dl>
-<dt><i>full</i></dt>
-<dd>
-Einstellungen f&#252;r alle Verbindungen laden
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-dict() mit Einstellungen
-</dd>
-</dl><a NAME="RevPiProgram._savedefaults" ID="RevPiProgram._savedefaults"></a>
-<h3 style="background-color:#FFFFFF;color:#FF0000">
-RevPiProgram._savedefaults</h3>
-<b>_savedefaults</b>(<i></i>)
-<p>
-Schreibt fuer den Pi die letzen Pfade.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-True, bei erfolgreicher Verarbeitung
-</dd>
-</dl><a NAME="RevPiProgram.check_replacedir" ID="RevPiProgram.check_replacedir"></a>
+</p><a NAME="RevPiProgram.check_replacedir" ID="RevPiProgram.check_replacedir"></a>
 <h3 style="background-color:#FFFFFF;color:#FF0000">
 RevPiProgram.check_replacedir</h3>
 <b>check_replacedir</b>(<i>rootdir</i>)
@@ -244,5 +217,44 @@ RevPiProgram.setpictoryrsc</h3>
 &#220;bertr&#228;gt die angegebene piCtory-Konfiguration.
 </p>
 <div align="right"><a style="color:#0000FF" href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="_loaddefaults" ID="_loaddefaults"></a>
+<h2 style="background-color:#FFFFFF;color:#0000FF">_loaddefaults</h2>
+<b>_loaddefaults</b>(<i>revpiname=None</i>)
+<p>
+&#220;bernimmt f&#252;r den Pi die letzen Pfade.
+</p><dl>
+<dt><i>revpiname</i></dt>
+<dd>
+Einstellungen nur f&#252;r RevPi laden
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+<class 'dict'> mit Einstellungen
+</dd>
+</dl>
+<div align="right"><a style="color:#0000FF" href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="_savedefaults" ID="_savedefaults"></a>
+<h2 style="background-color:#FFFFFF;color:#0000FF">_savedefaults</h2>
+<b>_savedefaults</b>(<i>revpiname, settings</i>)
+<p>
+Schreibt fuer den Pi die letzen Pfade.
+</p><dl>
+<dt><i>revpiname</i></dt>
+<dd>
+Einstellungen sind f&#252;r diesen RevPi
+</dd><dt><i>settings</i></dt>
+<dd>
+<class 'dict'> mit Einstellungen
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+True, bei erfolgreicher Verarbeitung
+</dd>
+</dl>
+<div align="right"><a style="color:#0000FF" href="#top">Up</a></div>
 <hr />
 </body></html>

revpipycontrol.api

@@ -20,6 +20,8 @@ aclmanager.AclManager?1(master, minlevel, maxlevel, acl_str="", readonly=False)
 aclmanager._?8
 mytools.addroot?4(filename)
 mytools.gettrans?4(proglang=None)
+mytools.savefile_connections?7
+mytools.savefile_programpath?7
 revpicheckclient.RevPiCheckClient.__chval?6(device, io, event=None)
 revpicheckclient.RevPiCheckClient.__hidewin?6(win, event=None)
 revpicheckclient.RevPiCheckClient.__saveoldvalue?6(event, tkvar)
@@ -91,13 +93,10 @@ revpiplclist.RevPiPlcList.root?7
 revpiplclist.RevPiPlcList?1(master)
 revpiplclist._?8
 revpiplclist.get_connections?4()
-revpiplclist.savefile?7
 revpiprogram.RevPiProgram._checkclose?5(event=None)
 revpiprogram.RevPiProgram._createwidgets?5()
 revpiprogram.RevPiProgram._evt_optdown?5(text="")
 revpiprogram.RevPiProgram._evt_optup?5(text="")
-revpiprogram.RevPiProgram._loaddefault?5(full=False)
-revpiprogram.RevPiProgram._savedefaults?5()
 revpiprogram.RevPiProgram.check_replacedir?4(rootdir)
 revpiprogram.RevPiProgram.create_filelist?4(rootdir)
 revpiprogram.RevPiProgram.getpictoryrsc?4()
@@ -108,7 +107,8 @@ revpiprogram.RevPiProgram.plcupload?4()
 revpiprogram.RevPiProgram.setpictoryrsc?4(filename=None)
 revpiprogram.RevPiProgram?1(master, xmlcli, xmlmode, revpi)
 revpiprogram._?8
-revpiprogram.savefile?7
+revpiprogram._loaddefaults?5(revpiname=None)
+revpiprogram._savedefaults?5(revpiname, settings)
 revpipycontrol.RevPiPyControl._btnstate?5()
 revpipycontrol.RevPiPyControl._closeall?5()
 revpipycontrol.RevPiPyControl._closeapp?5(event=None)

revpipycontrol/mytools.py

@@ -9,8 +9,20 @@
 import gettext
 import locale
 import sys
+from os import environ
 from os.path import dirname
 from os.path import join as pathjoin
+from sys import platform
+
+# Systemwerte und SaveFiles
+if platform == "linux":
+    homedir = environ["HOME"]
+else:
+    homedir = environ["APPDATA"]
+savefile_connections = pathjoin(
+    homedir, ".revpipyplc", "connections.dat")
+savefile_programpath = pathjoin(
+    homedir, ".revpipyplc", "programpath.dat")
 
 
 def addroot(filename):

revpipycontrol/revpioption.py

@@ -162,7 +162,6 @@ class RevPiOption(tkinter.Frame):
         self.var_pythonver = tkinter.IntVar(prog)
         self.var_startpy = tkinter.StringVar(prog)
         self.var_startargs = tkinter.StringVar(prog)
-        self.var_slave = tkinter.BooleanVar(prog)
         self.var_slaveacl = tkinter.StringVar(prog)
 
         self.var_pythonver.set(3)
@@ -210,39 +209,54 @@ class RevPiOption(tkinter.Frame):
         txt["textvariable"] = self.var_startargs
         txt.grid(columnspan=2, **cpadw)
 
-        # Row 6
-        ckb_slave = tkinter.Checkbutton(prog, justify="left")
+        # Gruppe Services
+        services = tkinter.LabelFrame(self)
+        services["text"] = _("RevPiPyLoad server services")
+        services.grid(columnspan=2, pady=2, sticky="we")
+
+        self.var_slave = tkinter.BooleanVar(services)
+        self.var_xmlon = tkinter.BooleanVar(services)
+        self.var_xmlacl = tkinter.StringVar(services)
+
+        # RevPiSlave Service
+        row = 0
+        ckb_slave = tkinter.Checkbutton(services, justify="left")
         ckb_slave["state"] = xmlstate
         ckb_slave["text"] = _("Use RevPi as PLC-Slave")
         ckb_slave["variable"] = self.var_slave
         ckb_slave.grid(column=0, **cpadw)
 
-        btn_slaveacl = tkinter.Button(prog, justify="center")
+        btn_slaveacl = tkinter.Button(services, justify="center")
         btn_slaveacl["command"] = self.btn_slaveacl
         btn_slaveacl["text"] = _("Edit ACL")
-        btn_slaveacl.grid(column=1, row=6, **cpade)
+        btn_slaveacl.grid(column=1, row=row, **cpade)
 
-        # Gruppe XMLRPC
-        xmlrpc = tkinter.LabelFrame(self)
-        xmlrpc["text"] = _("XML-RPC server")
-        xmlrpc.grid(columnspan=2, pady=2, sticky="we")
+        row = 1
+        lbl = tkinter.Label(services)
+        lbl["text"] = _("RevPi-Slave service is:")
+        lbl.grid(column=0, **cpade)
 
-        self.var_xmlon = tkinter.BooleanVar(xmlrpc)
-        self.var_xmlacl = tkinter.StringVar(xmlrpc)
+        status = self.xmlcli.plcslaverunning()
+        lbl = tkinter.Label(services)
+        lbl["fg"] = "green" if status else "red"
+        lbl["text"] = _("running") if status else _("stopped")
+        lbl.grid(column=1, row=row, **cpadwe)
 
-        ckb_xmlon = tkinter.Checkbutton(xmlrpc)
+        # XML-RPC Service
+        row = 2
+        ckb_xmlon = tkinter.Checkbutton(services)
         ckb_xmlon["command"] = self.askxmlon
         ckb_xmlon["state"] = xmlstate
         ckb_xmlon["text"] = _("Activate XML-RPC server on RevPi")
         ckb_xmlon["variable"] = self.var_xmlon
         ckb_xmlon.grid(**cpadw)
 
-        btn_slaveacl = tkinter.Button(xmlrpc, justify="center")
+        btn_slaveacl = tkinter.Button(services, justify="center")
         btn_slaveacl["command"] = self.btn_xmlacl
         btn_slaveacl["text"] = _("Edit ACL")
-        btn_slaveacl.grid(column=1, row=0, **cpade)
+        btn_slaveacl.grid(column=1, row=row, **cpade)
 
-        # Buttons
+        # Buttons am Ende
         btn_save = tkinter.Button(self)
         btn_save["command"] = self._setappdata
         btn_save["state"] = xmlstate

revpipycontrol/revpiplclist.py

@@ -11,26 +11,22 @@ import pickle
 import tkinter
 import tkinter.messagebox as tkmsg
 from mytools import gettrans
-from os import environ, makedirs
-from sys import platform
+from mytools import savefile_connections as savefile
+from revpiprogram import _loaddefaults as programloaddefaults
+from revpiprogram import _savedefaults as programsavedefaults
+from os import makedirs
+
 
 # Übersetzungen laden
 _ = gettrans()
 
-# Systemwerte
-if platform == "linux":
-    homedir = environ["HOME"]
-else:
-    homedir = environ["APPDATA"]
-savefile = os.path.join(homedir, ".revpipyplc", "connections.dat")
-
 
 def get_connections():
     u"""Verbindungen aus Datei laden.
     @return dict() mit Verbindungen"""
     if os.path.exists(savefile):
-        fh = open(savefile, "rb")
-        connections = pickle.load(fh)
+        with open(savefile, "rb") as fh:
+            connections = pickle.load(fh)
         return connections
     else:
         return {}
@@ -151,11 +147,19 @@ class RevPiPlcList(tkinter.Frame):
         @return True, bei erfolgreicher Verarbeitung"""
         try:
             makedirs(os.path.dirname(savefile), exist_ok=True)
-            fh = open(savefile, "wb")
-            pickle.dump(self._connections, fh)
+            with open(savefile, "wb") as fh:
+                pickle.dump(self._connections, fh)
             self.changes = False
         except:
             return False
+
+        # Andere Einstellungen aufräumen
+        dict = programloaddefaults()
+        for revpi in tuple(dict.keys()):
+            if revpi not in self._connections:
+                del dict[revpi]
+        programsavedefaults(None, dict)
+
         return True
 
     def build_listconn(self):

revpipycontrol/revpiprogram.py

@@ -15,22 +15,50 @@ import tkinter.filedialog as tkfd
 import tkinter.messagebox as tkmsg
 import zipfile
 from mytools import gettrans
-from os import environ
+from mytools import savefile_programpath as savefile
 from os import makedirs
 from shutil import rmtree
-from sys import platform
 from tempfile import mkstemp, mkdtemp
 from xmlrpc.client import Binary
 
 # Übersetzung laden
 _ = gettrans()
 
-# Systemwerte
-if platform == "linux":
-    homedir = environ["HOME"]
-else:
-    homedir = environ["APPDATA"]
-savefile = os.path.join(homedir, ".revpipyplc", "programpath.dat")
+
+def _loaddefaults(revpiname=None):
+    u"""Übernimmt für den Pi die letzen Pfade.
+    @param revpiname Einstellungen nur für RevPi laden
+    @return <class 'dict'> mit Einstellungen"""
+    if os.path.exists(savefile):
+        with open(savefile, "rb") as fh:
+            dict_all = pickle.load(fh)
+        if revpiname is None:
+            return dict_all
+        else:
+            return dict_all.get(revpiname, {})
+    return {}
+
+
+def _savedefaults(revpiname, settings):
+    u"""Schreibt fuer den Pi die letzen Pfade.
+
+    @param revpiname Einstellungen sind für diesen RevPi
+    @param settings <class 'dict'> mit Einstellungen
+    @return True, bei erfolgreicher Verarbeitung
+
+    """
+    try:
+        makedirs(os.path.dirname(savefile), exist_ok=True)
+        if revpiname is None:
+            dict_all = settings
+        else:
+            dict_all = _loaddefaults()
+            dict_all[revpiname] = settings
+        with open(savefile, "wb") as fh:
+            pickle.dump(dict_all, fh)
+    except:
+        return False
+    return True
 
 
 class RevPiProgram(tkinter.Frame):
@@ -54,7 +82,7 @@ class RevPiProgram(tkinter.Frame):
         self.xmlstate = "normal" if xmlmode >= 3 else "disabled"
 
         # Letzte Einstellungen übernehmen
-        self.opt = self._loaddefault()
+        self.opt = _loaddefaults()
 
         # Fenster bauen
         self._createwidgets()
@@ -250,33 +278,6 @@ class RevPiProgram(tkinter.Frame):
         else:
             self.ckb_picup["state"] = "normal"
 
-    def _loaddefault(self, full=False):
-        u"""Übernimmt für den Pi die letzen Pfade.
-        @param full Einstellungen für alle Verbindungen laden
-        @return dict() mit Einstellungen"""
-        if os.path.exists(savefile):
-            fh = open(savefile, "rb")
-            dict_all = pickle.load(fh)
-            if full:
-                return dict_all
-            else:
-                return dict_all.get(self.revpi, {})
-        return {}
-
-    def _savedefaults(self):
-        u"""Schreibt fuer den Pi die letzen Pfade.
-        @return True, bei erfolgreicher Verarbeitung"""
-        try:
-            makedirs(os.path.dirname(savefile), exist_ok=True)
-            dict_all = self._loaddefault(full=True)
-            dict_all[self.revpi] = self.opt
-            fh = open(savefile, "wb")
-            pickle.dump(dict_all, fh)
-            self.changes = False
-        except:
-            return False
-        return True
-
     def create_filelist(self, rootdir):
         u"""Erstellt eine Dateiliste von einem Verzeichnis.
         @param rootdir Verzeichnis fuer das eine Liste erstellt werden soll
@@ -338,7 +339,7 @@ class RevPiProgram(tkinter.Frame):
                 )
                 # Einstellungen speichern
                 self.opt["getpictoryrsc_dir"] = os.path.dirname(fh.name)
-                self._savedefaults()
+                self._savedefaults(self.revpi, self.opt)
             finally:
                 fh.close()
 
@@ -369,7 +370,7 @@ class RevPiProgram(tkinter.Frame):
                 )
                 # Einstellungen speichern
                 self.opt["getprocimg_dir"] = os.path.dirname(fh.name)
-                self._savedefaults()
+                self._savedefaults(self.revpi, self.opt)
             finally:
                 fh.close()
 
@@ -417,7 +418,7 @@ class RevPiProgram(tkinter.Frame):
 
                 # Einstellungen speichern
                 self.opt["setpictoryrsc_dir"] = os.path.dirname(fh.name)
-                self._savedefaults()
+                self._savedefaults(self.revpi, self.opt)
             elif ec == -1:
                 tkmsg.showerror(
                     _("Error"),
@@ -575,7 +576,7 @@ class RevPiProgram(tkinter.Frame):
                 )
 
                 # Einstellungen speichern
-                self._savedefaults()
+                self._savedefaults(self.revpi, self.opt)
             finally:
                 fh.close()
 
@@ -751,7 +752,7 @@ class RevPiProgram(tkinter.Frame):
 
             self.opt["typeup"] = self.var_typeup.get()
             self.opt["picup"] = self.var_picup.get()
-            self._savedefaults()
+            self._savedefaults(self.revpi, self.opt)
 
         elif ec == -1:
             tkmsg.showerror(