p3lib 1.1.70__py3-none-any.whl → 1.1.72__py3-none-any.whl

p3lib/ssh.py

@@ -122,6 +122,7 @@ class SSH(object):
     PRIVATE_KEY_FILE_LIST               = ["id_rsa", "id_dsa", 'id_ecdsa']
     PUBLIC_KEY_FILE_LIST                = ["id_rsa.pub", "id_dsa.pub", 'id_ecdsa.pub']
     LOCAL_SSH_CONFIG_PATH               = os.path.join(os.path.expanduser("~"), ".ssh")
+    DEFAULT_REMOTE_SSH_CONFIG_FOLDER    = "~/.ssh"
     DEFAULT_REMOTE_SSH_AUTH_KEYS_FILE   = "~/.ssh/authorized_keys"
     DROPBEAR_DIR                        = "/etc/dropbear"
     DROPBEAR_AUTH_KEYS_FILE             = "%s/authorized_keys" % (DROPBEAR_DIR)
@@ -520,8 +521,17 @@ class SSH(object):
 
         cmd = "test -d %s" % (SSH.DROPBEAR_DIR)
         rc, stdoutLines, stderrLines = self.runCmd(cmd, throwError=False)
+        # If the ssh server uses dropbear
         if rc == 0:
             authKeysFile = SSH.DROPBEAR_AUTH_KEYS_FILE
+        else:
+            # Check for the users ssh config folder
+            cmd = "test -d %s" % (SSH.DEFAULT_REMOTE_SSH_CONFIG_FOLDER)
+            rc, stdoutLines, stderrLines = self.runCmd(cmd, throwError=False)
+            if rc != 0:
+                # If the remote ssh config folder does not exist, create it
+                cmd = f"mkdir {SSH.DEFAULT_REMOTE_SSH_CONFIG_FOLDER}"
+                rc, stdoutLines, stderrLines = self.runCmd(cmd, throwError=True)
 
         return authKeysFile
 

p3lib/table_plot.py

@@ -131,7 +131,7 @@ class Table2DPlotServer(object):
                         else:
                             errorDict = {Table2DPlotServer.ERROR: f"{Table2DPlotServer.WINDOW_TTLE} must be > 0 and <= 250 characters in length: {wTitle}"}
                         
-                    if Table2DPlotServer.XAXIS_TYPE in rxDict:
+                    elif Table2DPlotServer.XAXIS_TYPE in rxDict:
                         xAxisType = rxDict[Table2DPlotServer.XAXIS_TYPE]
                         if xAxisType in Table2DPlotServer.VALID_X_AXIS_TYPES:
                             self.server.parent.staticPlotParams.xAxisType = xAxisType
@@ -139,70 +139,70 @@ class Table2DPlotServer(object):
                             errorDict = {Table2DPlotServer.ERROR: f"{Table2DPlotServer.XAXIS_TYPE} invalid: {xAxisType}"}
                             
                         
-                    if Table2DPlotServer.PLOT_PANEL_HEIGHT in rxDict:
+                    elif Table2DPlotServer.PLOT_PANEL_HEIGHT in rxDict:
                         pHeight = rxDict[Table2DPlotServer.PLOT_PANEL_HEIGHT]
                         if pHeight > 10 and pHeight < 2048:
                             self.server.parent.staticPlotParams.plotPanelHeight = pHeight
                         else:
                             errorDict = {Table2DPlotServer.ERROR: f"{Table2DPlotServer.PLOT_PANEL_HEIGHT} invalid: {pHeight} must be > 10 and < 2048"}
                         
-                    if Table2DPlotServer.LINE_PLOT in rxDict:
+                    elif Table2DPlotServer.LINE_PLOT in rxDict:
                         lPlot = rxDict[Table2DPlotServer.LINE_PLOT]
                         if lPlot in (True, False):
                             self.server.parent.staticPlotParams.linePlot = lPlot
                         else:
                             errorDict = {Table2DPlotServer.ERROR: f"{Table2DPlotServer.LINE_PLOT} invalid, must be True of False not {lPlot}"}
                         
-                    if Table2DPlotServer.PLOT_LINE_WIDTH in rxDict:
+                    elif Table2DPlotServer.PLOT_LINE_WIDTH in rxDict:
                         plWidth = rxDict[Table2DPlotServer.PLOT_LINE_WIDTH]
                         if plWidth > 0 and plWidth < 100:
                             self.server.parent.staticPlotParams.plotLineWidth = plWidth
                         else:
                             errorDict = {Table2DPlotServer.ERROR: f"{Table2DPlotServer.PLOT_LINE_WIDTH} invalid, must be > 0 and < 100 not {plWidth}"}
                         
-                    if Table2DPlotServer.SCATTER_PLOT_DOT_SIZE in rxDict:
+                    elif Table2DPlotServer.SCATTER_PLOT_DOT_SIZE in rxDict:
                         spDotSize = rxDict[Table2DPlotServer.SCATTER_PLOT_DOT_SIZE]
                         if spDotSize > 0 and spDotSize < 250:
                             self.server.parent.staticPlotParams.scatterPlotDotSize = spDotSize
                         else:
                             errorDict = {Table2DPlotServer.ERROR: f"{Table2DPlotServer.SCATTER_PLOT_DOT_SIZE} invalid, must be > 0 and < 250 not {spDotSize}"}                           
                             
-                    if Table2DPlotServer.THEME in rxDict:
+                    elif Table2DPlotServer.THEME in rxDict:
                         theme = rxDict[Table2DPlotServer.THEME]
                         if theme in Table2DPlotServer.VALID_THEMES:
                             self.server.parent.staticPlotParams.theme = theme
                         else:
                             errorDict = {Table2DPlotServer.ERROR: f"{Table2DPlotServer.XAXIS_TYPE} invalid: {theme}"}
 
-                    if Table2DPlotServer.X_AXIS_NAME in rxDict:
+                    elif Table2DPlotServer.X_AXIS_NAME in rxDict:
                         xAxisName = rxDict[Table2DPlotServer.X_AXIS_NAME]
                         if isinstance(xAxisName,str) and len(xAxisName) > 0 and len(xAxisName) <= 150:
                             self.server.parent.staticPlotParams.xAxisName = xAxisName
                         else:
                             errorDict = {Table2DPlotServer.ERROR: f"{Table2DPlotServer.X_AXIS_NAME} must be > 0 and <= 150 characters in length: {xAxisName}"}
 
-                    if Table2DPlotServer.HTML_FILE in rxDict:
+                    elif Table2DPlotServer.HTML_FILE in rxDict:
                         htmlFile = rxDict[Table2DPlotServer.HTML_FILE]
                         if isinstance(htmlFile,str) and len(htmlFile) > 0 and len(htmlFile) <= 250:
                             self.server.parent.staticPlotParams.htmlFile = htmlFile
                         else:
                             errorDict = {Table2DPlotServer.ERROR: f"{Table2DPlotServer.HTML_FILE} must be > 0 and <= 250 characters in length: {htmlFile}"}
 
-                    if Table2DPlotServer.DISABLE_RESULT in rxDict:
+                    elif Table2DPlotServer.DISABLE_RESULT in rxDict:
                         disableResult = rxDict[Table2DPlotServer.DISABLE_RESULT]
                         if disableResult in (True, False):
                             self.server.parent.staticPlotParams.disableResult = disableResult
                         else:
                             errorDict = {Table2DPlotServer.ERROR: f"{Table2DPlotServer.DISABLE_RESULT} invalid, must be True of False not {disableResult}"}
 
-                    if Table2DPlotServer.RESULT_WIDTH in rxDict:
+                    elif Table2DPlotServer.RESULT_WIDTH in rxDict:
                         resultWidth = rxDict[Table2DPlotServer.RESULT_WIDTH]
                         if resultWidth > 10 and resultWidth < 2048:
                             self.server.parent.staticPlotParams.resultWidth = resultWidth
                         else:
                             errorDict = {Table2DPlotServer.ERROR: f"{Table2DPlotServer.RESULT_WIDTH} invalid: {resultWidth} must be > 10 and < 2048"}
    
-                    if Table2DPlotServer.RESULT_TITLE in rxDict:
+                    elif Table2DPlotServer.RESULT_TITLE in rxDict:
                         resultTitle = rxDict[Table2DPlotServer.RESULT_TITLE]
                         if isinstance(resultTitle,str) and len(resultTitle) > 0 and len(resultTitle) <= 250:
                             self.server.parent.staticPlotParams.resultTitle = resultTitle
@@ -211,14 +211,14 @@ class Table2DPlotServer(object):
                     
                     # Set static parameters stop
                             
-                    if Table2DPlotServer.SET_RESULT in rxDict:
+                    elif Table2DPlotServer.SET_RESULT in rxDict:
                         guiMsg = GUIMessage()
                         guiMsg.type = GUIMessage.RESULT_DATA_TYPE
                         guiMsg.data = rxDict[Table2DPlotServer.SET_RESULT]
                         if self.server.parent._bokeh2DTablePlotter:
                             self.server.parent._bokeh2DTablePlotter.sendMessage(guiMsg)
 
-                    if Table2DPlotServer.TABLE_COLUMNS in rxDict:
+                    elif Table2DPlotServer.TABLE_COLUMNS in rxDict:
                         self.server.parent.createNewPlot(rxDict[Table2DPlotServer.TABLE_COLUMNS])
                         
                     elif Table2DPlotServer.TABLE_ROW in rxDict:

{p3lib-1.1.70.dist-info → p3lib-1.1.72.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.70
+Version: 1.1.72
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/p3lib
 Author: Paul Austen
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: paramiko >=2.9.3
-Requires-Dist: pillow >=9.2.0
+Requires-Dist: paramiko>=2.9.3
+Requires-Dist: pillow>=9.2.0
 
 # A Python3 library
 A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.

{p3lib-1.1.70.dist-info → p3lib-1.1.72.dist-info}/RECORD

@@ -11,11 +11,11 @@ p3lib/mqtt_rpc.py,sha256=6LmFA1kR4HSJs9eWbOJORRHNY01L_lHWjvtE2fmY8P8,10511
 p3lib/netif.py,sha256=3QV5OGdHhELIf4MBj6mx5MNCtVeZ7JXoNEkeu4KzCaE,9796
 p3lib/netplotly.py,sha256=PMDx-w1jtRVW6Od5u_kuKbBxNpTS_Y88mMF60puMxLM,9363
 p3lib/pconfig.py,sha256=_ri9w3aauHXZp8u2YLYHBVroFR_iCqaTCwj_MRa3rHo,30153
-p3lib/ssh.py,sha256=-w_2oQWZaIABanF1lk8fRyMLkJK231Bvy11StgdYqJg,38951
-p3lib/table_plot.py,sha256=z1-cjE879fi2fZ92LybxaP6BcEYp4HJIwzNVDAi8U_E,32140
+p3lib/ssh.py,sha256=JiO9MY98zf3uqbonygJi_F9X0eAAgHAINCTeBuYXpCY,39511
+p3lib/table_plot.py,sha256=dRPZ9rFpwE9Dpyqrvbm5t2spVaPSHrx_B7KvfWVND3g,32166
 p3lib/uio.py,sha256=hMarPnYXnqVF23HUIeDfzREo7TMdBjrupXMY_ffuCbI,23133
-p3lib-1.1.70.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
-p3lib-1.1.70.dist-info/METADATA,sha256=Htc0H5UnbjKtfpJR6SPlJG5JYWUuxQGCOBRfpKsimPk,920
-p3lib-1.1.70.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-p3lib-1.1.70.dist-info/top_level.txt,sha256=SDCpXYh-19yCFp4Z8ZK4B-3J4NvTCJElZ42NPgcR6-U,6
-p3lib-1.1.70.dist-info/RECORD,,
+p3lib-1.1.72.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
+p3lib-1.1.72.dist-info/METADATA,sha256=Ls1Hl5rIvy8fuzOJj1HF2zp3ccNx72WJunsCKmVpgyg,918
+p3lib-1.1.72.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+p3lib-1.1.72.dist-info/top_level.txt,sha256=SDCpXYh-19yCFp4Z8ZK4B-3J4NvTCJElZ42NPgcR6-U,6
+p3lib-1.1.72.dist-info/RECORD,,

{p3lib-1.1.70.dist-info → p3lib-1.1.72.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any