From 4466355318b6eeb7ca8f738c18961ed2eb02cb2d Mon Sep 17 00:00:00 2001 From: Ivan Maslov Date: Mon, 8 Jun 2020 16:32:21 +0300 Subject: [PATCH] # Orchestrator::RobotRDPActive: Dont create RDP is session is exist! --- .../Orchestrator/RobotRDPActive/Processor.py | 46 ++++++++++--------- v1.1.6 => v1.1.7 | 0 2 files changed, 24 insertions(+), 22 deletions(-) rename v1.1.6 => v1.1.7 (100%) diff --git a/Sources/pyOpenRPA/Orchestrator/RobotRDPActive/Processor.py b/Sources/pyOpenRPA/Orchestrator/RobotRDPActive/Processor.py index 20cd033e..39e6d05e 100644 --- a/Sources/pyOpenRPA/Orchestrator/RobotRDPActive/Processor.py +++ b/Sources/pyOpenRPA/Orchestrator/RobotRDPActive/Processor.py @@ -11,28 +11,30 @@ gSettings = None # Gsettings will be initialized after the import module # Create new RDPSession in RobotRDPActive def RDPSessionConnect(inRDPSessionKeyStr, inHostStr, inPortStr, inLoginStr, inPasswordStr): global gSettings - lRDPConfigurationItem = { # Init the configuration item - "Host": inHostStr, # Host address, example "77.77.22.22" - "Port": inPortStr, # RDP Port, example "3389" - "Login": inLoginStr, # Login, example "test" - "Password": inPasswordStr, # Password, example "test" - "Screen": { - "Width": 1680, # Width of the remote desktop in pixels, example 1680 - "Height": 1050, # Height of the remote desktop in pixels, example 1050 - # "640x480" or "1680x1050" or "FullScreen". If Resolution not exists set full screen, example - "FlagUseAllMonitors": False, # True or False, example False - "DepthBit": "32" # "32" or "24" or "16" or "15", example "32" - }, - "SharedDriveList": ["c"], # List of the Root sesion hard drives, example ["c"] - ###### Will updated in program ############ - "SessionHex": "77777sdfsdf77777dsfdfsf77777777", # Hex is created when robot runs, example "" - "SessionIsWindowExistBool": False, # Flag if the RDP window is exist, old name "FlagSessionIsActive". Check every n seconds , example False - "SessionIsWindowResponsibleBool": False, # Flag if RDP window is responsible (recieve commands). Check every nn seconds. If window is Responsible - window is Exist too , example False - "SessionIsIgnoredBool": False # Flag to ignore RDP window False - dont ignore, True - ignore, example False - } - gSettings["RobotRDPActive"]["RDPList"][inRDPSessionKeyStr] = lRDPConfigurationItem # Add item in RDPList - Connector.Session(lRDPConfigurationItem) # Create the RDP session - Connector.SystemRDPWarningClickOk() # Click all warning messages + # ATTENTION - dont connect if RDP session is exist + if inRDPSessionKeyStr not in gSettings["RobotRDPActive"]["RDPList"]: + lRDPConfigurationItem = { # Init the configuration item + "Host": inHostStr, # Host address, example "77.77.22.22" + "Port": inPortStr, # RDP Port, example "3389" + "Login": inLoginStr, # Login, example "test" + "Password": inPasswordStr, # Password, example "test" + "Screen": { + "Width": 1680, # Width of the remote desktop in pixels, example 1680 + "Height": 1050, # Height of the remote desktop in pixels, example 1050 + # "640x480" or "1680x1050" or "FullScreen". If Resolution not exists set full screen, example + "FlagUseAllMonitors": False, # True or False, example False + "DepthBit": "32" # "32" or "24" or "16" or "15", example "32" + }, + "SharedDriveList": ["c"], # List of the Root sesion hard drives, example ["c"] + ###### Will updated in program ############ + "SessionHex": "77777sdfsdf77777dsfdfsf77777777", # Hex is created when robot runs, example "" + "SessionIsWindowExistBool": False, # Flag if the RDP window is exist, old name "FlagSessionIsActive". Check every n seconds , example False + "SessionIsWindowResponsibleBool": False, # Flag if RDP window is responsible (recieve commands). Check every nn seconds. If window is Responsible - window is Exist too , example False + "SessionIsIgnoredBool": False # Flag to ignore RDP window False - dont ignore, True - ignore, example False + } + gSettings["RobotRDPActive"]["RDPList"][inRDPSessionKeyStr] = lRDPConfigurationItem # Add item in RDPList + Connector.Session(lRDPConfigurationItem) # Create the RDP session + Connector.SystemRDPWarningClickOk() # Click all warning messages return True # Disconnect the RDP session diff --git a/v1.1.6 b/v1.1.7 similarity index 100% rename from v1.1.6 rename to v1.1.7