From 215ca959ebaaf8b61b44b74ef78955dee2a72cd8 Mon Sep 17 00:00:00 2001 From: Ivan Maslov Date: Sat, 9 Nov 2019 00:01:59 +0300 Subject: [PATCH] v1.0.16 #Rename GUI to UIDesktop #TODO Delete Robot.py (write 64,32 from UIDesktop) --- .../INSTALLER | 0 .../pyOpenRPA-1.0.16.dist-info}/METADATA | 2 +- .../pyOpenRPA-1.0.16.dist-info}/RECORD | 18 +++--- .../WHEEL | 0 .../top_level.txt | 0 .../Lib/site-packages/pyOpenRPA/Robot.py | 12 ++-- .../pyOpenRPA/{GUI.py => UIDesktop.py} | 2 +- .../Lib/site-packages/pyOpenRPA/__init__.py | 6 +- .../INSTALLER | 0 .../pyOpenRPA-1.0.16.dist-info}/METADATA | 2 +- .../pyOpenRPA-1.0.16.dist-info}/RECORD | 18 +++--- .../WHEEL | 0 .../top_level.txt | 0 .../Lib/site-packages/pyOpenRPA/Robot.py | 12 ++-- .../pyOpenRPA/{GUI.py => UIDesktop.py} | 2 +- .../Lib/site-packages/pyOpenRPA/__init__.py | 6 +- Robot/pyOpenRPA.egg-info/PKG-INFO | 2 +- Robot/pyOpenRPA.egg-info/SOURCES.txt | 2 +- .../inspectionProfiles/profiles_settings.xml | 6 ++ Robot/pyOpenRPA/.idea/misc.xml | 4 ++ Robot/pyOpenRPA/.idea/modules.xml | 8 +++ Robot/pyOpenRPA/.idea/pyOpenRPA.iml | 11 ++++ Robot/pyOpenRPA/.idea/vcs.xml | 6 ++ Robot/pyOpenRPA/.idea/workspace.xml | 60 +++++++++++++++++++ Robot/pyOpenRPA/Robot.py | 12 ++-- Robot/pyOpenRPA/{GUI.py => UIDesktop.py} | 2 +- Robot/pyOpenRPA/__init__.py | 6 +- Studio/.idea/.gitignore | 3 + Studio/.idea/Studio.iml | 11 ++++ .../inspectionProfiles/profiles_settings.xml | 6 ++ Studio/.idea/misc.xml | 4 ++ Studio/.idea/modules.xml | 8 +++ Studio/.idea/vcs.xml | 6 ++ Studio/Studio.py | 3 +- v1.0.15 => v1.0.16 | 0 35 files changed, 186 insertions(+), 54 deletions(-) rename Resources/WPy32-3720/python-3.7.2/Lib/site-packages/{pyOpenRPA-1.0.15.dist-info => pyOpenRPA-1.0.16.dist-info}/INSTALLER (100%) rename Resources/{WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.15.dist-info => WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.16.dist-info}/METADATA (99%) rename Resources/{WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.15.dist-info => WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.16.dist-info}/RECORD (62%) rename Resources/WPy32-3720/python-3.7.2/Lib/site-packages/{pyOpenRPA-1.0.15.dist-info => pyOpenRPA-1.0.16.dist-info}/WHEEL (100%) rename Resources/WPy32-3720/python-3.7.2/Lib/site-packages/{pyOpenRPA-1.0.15.dist-info => pyOpenRPA-1.0.16.dist-info}/top_level.txt (100%) rename Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/{GUI.py => UIDesktop.py} (99%) rename Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/{pyOpenRPA-1.0.15.dist-info => pyOpenRPA-1.0.16.dist-info}/INSTALLER (100%) rename Resources/{WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.15.dist-info => WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.16.dist-info}/METADATA (99%) rename Resources/{WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.15.dist-info => WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.16.dist-info}/RECORD (62%) rename Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/{pyOpenRPA-1.0.15.dist-info => pyOpenRPA-1.0.16.dist-info}/WHEEL (100%) rename Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/{pyOpenRPA-1.0.15.dist-info => pyOpenRPA-1.0.16.dist-info}/top_level.txt (100%) rename Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/{GUI.py => UIDesktop.py} (99%) create mode 100644 Robot/pyOpenRPA/.idea/inspectionProfiles/profiles_settings.xml create mode 100644 Robot/pyOpenRPA/.idea/misc.xml create mode 100644 Robot/pyOpenRPA/.idea/modules.xml create mode 100644 Robot/pyOpenRPA/.idea/pyOpenRPA.iml create mode 100644 Robot/pyOpenRPA/.idea/vcs.xml create mode 100644 Robot/pyOpenRPA/.idea/workspace.xml rename Robot/pyOpenRPA/{GUI.py => UIDesktop.py} (99%) create mode 100644 Studio/.idea/.gitignore create mode 100644 Studio/.idea/Studio.iml create mode 100644 Studio/.idea/inspectionProfiles/profiles_settings.xml create mode 100644 Studio/.idea/misc.xml create mode 100644 Studio/.idea/modules.xml create mode 100644 Studio/.idea/vcs.xml rename v1.0.15 => v1.0.16 (100%) diff --git a/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/INSTALLER b/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/INSTALLER similarity index 100% rename from Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/INSTALLER rename to Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/INSTALLER diff --git a/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/METADATA b/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/METADATA similarity index 99% rename from Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/METADATA rename to Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/METADATA index b41a9476..3bdfbf7e 100644 --- a/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/METADATA +++ b/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/METADATA @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pyOpenRPA -Version: 1.0.15 +Version: 1.0.16 Summary: First open source RPA platform for business Home-page: https://gitlab.com/UnicodeLabs/OpenRPA Author: Ivan Maslov diff --git a/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/RECORD b/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/RECORD similarity index 62% rename from Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/RECORD rename to Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/RECORD index 07ef7d0a..17780b15 100644 --- a/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/RECORD +++ b/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/RECORD @@ -1,23 +1,23 @@ -pyOpenRPA-1.0.15.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -pyOpenRPA-1.0.15.dist-info/METADATA,sha256=OVAh2YFn_pseeM5KBSk8G19yTsO-jBMZDY8i9S8saJs,3510 -pyOpenRPA-1.0.15.dist-info/RECORD,, -pyOpenRPA-1.0.15.dist-info/WHEEL,sha256=qB97nP5e4MrOsXW5bIU5cUn_KSVr10EV0l-GCHG9qNs,97 -pyOpenRPA-1.0.15.dist-info/top_level.txt,sha256=RPzwQXgYBRo_m5L3ZLs6Voh8aEkMeT29Xsul1w1qE0g,10 +pyOpenRPA-1.0.16.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 +pyOpenRPA-1.0.16.dist-info/METADATA,sha256=IxqPZ8XpKYmxZBKQJFZR1j41tmovw8AqcFBpZv03ubY,3510 +pyOpenRPA-1.0.16.dist-info/RECORD,, +pyOpenRPA-1.0.16.dist-info/WHEEL,sha256=qB97nP5e4MrOsXW5bIU5cUn_KSVr10EV0l-GCHG9qNs,97 +pyOpenRPA-1.0.16.dist-info/top_level.txt,sha256=RPzwQXgYBRo_m5L3ZLs6Voh8aEkMeT29Xsul1w1qE0g,10 pyOpenRPA/Clipboard.py,sha256=q76X8L21zJwcwdoJJNPeCEwAV30xS6ylHP1WwvtxoWI,722 -pyOpenRPA/GUI.py,sha256=SzbCIZMAf53vEM5cwY55itseM5gcMSowF7POo2KwyeM,68726 pyOpenRPA/IntegrationOrchestrator.py,sha256=T1g1jJM7_JMTSVP50DTM5WHrMh1w8wovvcBXl1nEokU,2656 pyOpenRPA/JSONNormalize.py,sha256=aIuVzuZDazhxkCOzoOjfhHVz66mp2FWdfPv5E7KWF5Y,3890 pyOpenRPA/ProcessCommunicator.py,sha256=eT_NgoAQBUxSu9alCGxuauuussrP50HDoiBA9JcUkOc,8114 -pyOpenRPA/Robot.py,sha256=a_xiI4SuSpGFAfnSrvhL8qeuFVHrBUEGOFwelRWIvTA,9407 +pyOpenRPA/Robot.py,sha256=41eZQMflqf7B8GnTn1mTJ_Dm8-k8CfSRFy1_He6ZLME,9471 +pyOpenRPA/UIDesktop.py,sha256=AJPHt5z2W4AL9xsM1-YptCjFOUO-dj5kQVraelux_yU,68732 pyOpenRPA/ValueVerify.py,sha256=ObskxU4fOMoCGw74_nzYt6-a5jjrAckb3sdBLYyhYxY,777 pyOpenRPA/Window.py,sha256=UJl-sg4RvvJ35aG9jZOzqGVwE15XK7qPHqoOBD13xFk,431 -pyOpenRPA/__init__.py,sha256=wJLBEdKdtm0jeWLL-KyBrTN2vfDK75uF0qGpoGQHQgI,372 +pyOpenRPA/__init__.py,sha256=BTpZhIhxiw-a5cDUoMZxNpPiTEAvRV6v09sDC0MtRVI,399 pyOpenRPA/__pycache__/Clipboard.cpython-37.pyc,, -pyOpenRPA/__pycache__/GUI.cpython-37.pyc,, pyOpenRPA/__pycache__/IntegrationOrchestrator.cpython-37.pyc,, pyOpenRPA/__pycache__/JSONNormalize.cpython-37.pyc,, pyOpenRPA/__pycache__/ProcessCommunicator.cpython-37.pyc,, pyOpenRPA/__pycache__/Robot.cpython-37.pyc,, +pyOpenRPA/__pycache__/UIDesktop.cpython-37.pyc,, pyOpenRPA/__pycache__/ValueVerify.cpython-37.pyc,, pyOpenRPA/__pycache__/Window.cpython-37.pyc,, pyOpenRPA/__pycache__/__init__.cpython-37.pyc,, diff --git a/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/WHEEL b/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/WHEEL similarity index 100% rename from Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/WHEEL rename to Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/WHEEL diff --git a/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/top_level.txt b/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/top_level.txt similarity index 100% rename from Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/top_level.txt rename to Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/top_level.txt diff --git a/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/Robot.py b/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/Robot.py index da848224..8aabbbf1 100644 --- a/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/Robot.py +++ b/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/Robot.py @@ -63,9 +63,9 @@ logging.basicConfig(filename="Reports\ReportRobotRun_"+datetime.datetime.now().s #Start childprocess - GUI Module 32 bit if not os.path.isfile("..\\Resources\\WPy32-3720\\python-3.7.2\\OpenRPARobotGUIx32.exe"): shutil.copyfile('..\\Resources\\WPy32-3720\\python-3.7.2\\python.exe',"..\\Resources\\WPy32-3720\\python-3.7.2\\OpenRPARobotGUIx32.exe") -mProcessGUI_x32 = subprocess.Popen(['..\\Resources\\WPy32-3720\\python-3.7.2\\OpenRPARobotGUIx32.exe','..\\Robot\\GUI.py','release'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) +mProcessGUI_x32 = subprocess.Popen(['..\\Resources\\WPy32-3720\\python-3.7.2\\OpenRPARobotGUIx32.exe','..\\Robot\\pyOpenRPA\\UIDesktop.py','release'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) #Start childprocess - GUI Module 64 bit - uncomment after WPy64 installation -ProcessCommunicator.ProcessChildSendObject(mProcessGUI_x32,{"ModuleName":"GUI","ActivityName":"Get_OSBitnessInt","ArgumentList":[],"ArgumentDict":{}}) +ProcessCommunicator.ProcessChildSendObject(mProcessGUI_x32,{"ModuleName":"UIDesktop","ActivityName":"Get_OSBitnessInt","ArgumentList":[],"ArgumentDict":{}}) lOSBitness = ProcessCommunicator.ProcessChildReadWaitObject(mProcessGUI_x32)["Result"] lProcessBitnessStr = str(struct.calcsize("P") * 8) @@ -74,15 +74,15 @@ mProcessGUI_x64= None if lOSBitness == 64: if not os.path.isfile("..\\Resources\\WPy64-3720\\python-3.7.2.amd64\\OpenRPARobotGUIx64.exe"): shutil.copyfile('..\\Resources\\WPy64-3720\\python-3.7.2.amd64\\python.exe',"..\\Resources\\WPy64-3720\\python-3.7.2.amd64\\OpenRPARobotGUIx64.exe") - mProcessGUI_x64 = subprocess.Popen(['..\\Resources\\WPy64-3720\\python-3.7.2.amd64\\OpenRPARobotGUIx64.exe','..\\Robot\\GUI.py','release'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) + mProcessGUI_x64 = subprocess.Popen(['..\\Resources\\WPy64-3720\\python-3.7.2.amd64\\OpenRPARobotGUIx64.exe','..\\Robot\\pyOpenRPA\\UIDesktop.py','release'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) #################### #Section: Activity #################### def ActivityRun(inActivitySpecificationDict): - #Выполнить отправку в модуль GUI, если ModuleName == "GUI" + #Выполнить отправку в модуль UIDesktop, если ModuleName == "UIDesktop" #pdb.set_trace() - if inActivitySpecificationDict["ModuleName"] == "GUI": + if inActivitySpecificationDict["ModuleName"] == "UIDesktop": if "ArgumentList" not in inActivitySpecificationDict: inActivitySpecificationDict["ArgumentList"]=[] if "ArgumentDict" not in inActivitySpecificationDict: @@ -105,7 +105,7 @@ def ActivityRun(inActivitySpecificationDict): #Отправить запрос в дочерний процесс, который отвечает за работу с Windows окнами #pdb.set_trace() #Внимание! Проверка разрядности специально делается на процессе 64 бита, тк процесс 32 бита зависает на 35 итерации проверки - ProcessCommunicator.ProcessChildSendObject(mProcessGUI_x64,{"ModuleName":"GUI","ActivityName":"UIOSelector_Get_BitnessInt","ArgumentList":[inActivitySpecificationDict["ArgumentList"][0]],"ArgumentDict":inActivitySpecificationDict["ArgumentDict"]}) + ProcessCommunicator.ProcessChildSendObject(mProcessGUI_x64,{"ModuleName":"UIDesktop","ActivityName":"UIOSelector_Get_BitnessInt","ArgumentList":[inActivitySpecificationDict["ArgumentList"][0]],"ArgumentDict":inActivitySpecificationDict["ArgumentDict"]}) #Получить ответ от дочернего процесса lResponseObject=ProcessCommunicator.ProcessChildReadWaitObject(mProcessGUI_x64) #pdb.set_trace() diff --git a/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/GUI.py b/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/UIDesktop.py similarity index 99% rename from Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/GUI.py rename to Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/UIDesktop.py index 05b139a5..1ee13e6a 100644 --- a/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/GUI.py +++ b/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/UIDesktop.py @@ -39,7 +39,7 @@ mRobotLogger.addHandler(mRobotLoggerFH) #logging.basicConfig(filename="Reports\ReportRobotGUIRun_"+datetime.datetime.now().strftime("%Y_%m_%d")+".log", level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s") #####Внимание####### -#TODO В перспективе нужно реализовать алгоритм определения разрядности не в Robot.py, а в GUI.py, тк начинают появляться функции, на входе в которые еще неизвестна разрядность элемента + селектор может охватить сразу два элемента из 2-х разных разрядностей - обрабатываться это должно непосредственно при выполнении +#TODO В перспективе нужно реализовать алгоритм определения разрядности не в Robot.py, а в UIDesktop.py, тк начинают появляться функции, на входе в которые еще неизвестна разрядность элемента + селектор может охватить сразу два элемента из 2-х разных разрядностей - обрабатываться это должно непосредственно при выполнении #################################### #Info: GUI module of the Robot app (OpenRPA - Robot) diff --git a/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/__init__.py b/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/__init__.py index f69e75bb..b5a1d769 100644 --- a/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/__init__.py +++ b/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/__init__.py @@ -3,12 +3,12 @@ r""" The OpenRPA package (from UnicodeLabs) """ -__version__ = 'v1.0.15' +__version__ = 'v1.0.16' __all__ = [ - 'GUI','Clipboard','IntegrationOrchestrator','Window', 'ProcessCommunicator' + 'UIDesktop.py', 'Clipboard', 'IntegrationOrchestrator', 'Window', 'ProcessCommunicator', 'Robot' ] __author__ = 'Ivan Maslov ' -from . import GUI +from . import UIDesktop from . import Clipboard from . import IntegrationOrchestrator from . import Window diff --git a/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/INSTALLER b/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/INSTALLER similarity index 100% rename from Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/INSTALLER rename to Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/INSTALLER diff --git a/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/METADATA b/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/METADATA similarity index 99% rename from Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/METADATA rename to Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/METADATA index b41a9476..3bdfbf7e 100644 --- a/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/METADATA +++ b/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/METADATA @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pyOpenRPA -Version: 1.0.15 +Version: 1.0.16 Summary: First open source RPA platform for business Home-page: https://gitlab.com/UnicodeLabs/OpenRPA Author: Ivan Maslov diff --git a/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/RECORD b/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/RECORD similarity index 62% rename from Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/RECORD rename to Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/RECORD index 07ef7d0a..17780b15 100644 --- a/Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/RECORD +++ b/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/RECORD @@ -1,23 +1,23 @@ -pyOpenRPA-1.0.15.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -pyOpenRPA-1.0.15.dist-info/METADATA,sha256=OVAh2YFn_pseeM5KBSk8G19yTsO-jBMZDY8i9S8saJs,3510 -pyOpenRPA-1.0.15.dist-info/RECORD,, -pyOpenRPA-1.0.15.dist-info/WHEEL,sha256=qB97nP5e4MrOsXW5bIU5cUn_KSVr10EV0l-GCHG9qNs,97 -pyOpenRPA-1.0.15.dist-info/top_level.txt,sha256=RPzwQXgYBRo_m5L3ZLs6Voh8aEkMeT29Xsul1w1qE0g,10 +pyOpenRPA-1.0.16.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 +pyOpenRPA-1.0.16.dist-info/METADATA,sha256=IxqPZ8XpKYmxZBKQJFZR1j41tmovw8AqcFBpZv03ubY,3510 +pyOpenRPA-1.0.16.dist-info/RECORD,, +pyOpenRPA-1.0.16.dist-info/WHEEL,sha256=qB97nP5e4MrOsXW5bIU5cUn_KSVr10EV0l-GCHG9qNs,97 +pyOpenRPA-1.0.16.dist-info/top_level.txt,sha256=RPzwQXgYBRo_m5L3ZLs6Voh8aEkMeT29Xsul1w1qE0g,10 pyOpenRPA/Clipboard.py,sha256=q76X8L21zJwcwdoJJNPeCEwAV30xS6ylHP1WwvtxoWI,722 -pyOpenRPA/GUI.py,sha256=SzbCIZMAf53vEM5cwY55itseM5gcMSowF7POo2KwyeM,68726 pyOpenRPA/IntegrationOrchestrator.py,sha256=T1g1jJM7_JMTSVP50DTM5WHrMh1w8wovvcBXl1nEokU,2656 pyOpenRPA/JSONNormalize.py,sha256=aIuVzuZDazhxkCOzoOjfhHVz66mp2FWdfPv5E7KWF5Y,3890 pyOpenRPA/ProcessCommunicator.py,sha256=eT_NgoAQBUxSu9alCGxuauuussrP50HDoiBA9JcUkOc,8114 -pyOpenRPA/Robot.py,sha256=a_xiI4SuSpGFAfnSrvhL8qeuFVHrBUEGOFwelRWIvTA,9407 +pyOpenRPA/Robot.py,sha256=41eZQMflqf7B8GnTn1mTJ_Dm8-k8CfSRFy1_He6ZLME,9471 +pyOpenRPA/UIDesktop.py,sha256=AJPHt5z2W4AL9xsM1-YptCjFOUO-dj5kQVraelux_yU,68732 pyOpenRPA/ValueVerify.py,sha256=ObskxU4fOMoCGw74_nzYt6-a5jjrAckb3sdBLYyhYxY,777 pyOpenRPA/Window.py,sha256=UJl-sg4RvvJ35aG9jZOzqGVwE15XK7qPHqoOBD13xFk,431 -pyOpenRPA/__init__.py,sha256=wJLBEdKdtm0jeWLL-KyBrTN2vfDK75uF0qGpoGQHQgI,372 +pyOpenRPA/__init__.py,sha256=BTpZhIhxiw-a5cDUoMZxNpPiTEAvRV6v09sDC0MtRVI,399 pyOpenRPA/__pycache__/Clipboard.cpython-37.pyc,, -pyOpenRPA/__pycache__/GUI.cpython-37.pyc,, pyOpenRPA/__pycache__/IntegrationOrchestrator.cpython-37.pyc,, pyOpenRPA/__pycache__/JSONNormalize.cpython-37.pyc,, pyOpenRPA/__pycache__/ProcessCommunicator.cpython-37.pyc,, pyOpenRPA/__pycache__/Robot.cpython-37.pyc,, +pyOpenRPA/__pycache__/UIDesktop.cpython-37.pyc,, pyOpenRPA/__pycache__/ValueVerify.cpython-37.pyc,, pyOpenRPA/__pycache__/Window.cpython-37.pyc,, pyOpenRPA/__pycache__/__init__.cpython-37.pyc,, diff --git a/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/WHEEL b/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/WHEEL similarity index 100% rename from Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/WHEEL rename to Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/WHEEL diff --git a/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/top_level.txt b/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/top_level.txt similarity index 100% rename from Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.15.dist-info/top_level.txt rename to Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.16.dist-info/top_level.txt diff --git a/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/Robot.py b/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/Robot.py index da848224..8aabbbf1 100644 --- a/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/Robot.py +++ b/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/Robot.py @@ -63,9 +63,9 @@ logging.basicConfig(filename="Reports\ReportRobotRun_"+datetime.datetime.now().s #Start childprocess - GUI Module 32 bit if not os.path.isfile("..\\Resources\\WPy32-3720\\python-3.7.2\\OpenRPARobotGUIx32.exe"): shutil.copyfile('..\\Resources\\WPy32-3720\\python-3.7.2\\python.exe',"..\\Resources\\WPy32-3720\\python-3.7.2\\OpenRPARobotGUIx32.exe") -mProcessGUI_x32 = subprocess.Popen(['..\\Resources\\WPy32-3720\\python-3.7.2\\OpenRPARobotGUIx32.exe','..\\Robot\\GUI.py','release'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) +mProcessGUI_x32 = subprocess.Popen(['..\\Resources\\WPy32-3720\\python-3.7.2\\OpenRPARobotGUIx32.exe','..\\Robot\\pyOpenRPA\\UIDesktop.py','release'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) #Start childprocess - GUI Module 64 bit - uncomment after WPy64 installation -ProcessCommunicator.ProcessChildSendObject(mProcessGUI_x32,{"ModuleName":"GUI","ActivityName":"Get_OSBitnessInt","ArgumentList":[],"ArgumentDict":{}}) +ProcessCommunicator.ProcessChildSendObject(mProcessGUI_x32,{"ModuleName":"UIDesktop","ActivityName":"Get_OSBitnessInt","ArgumentList":[],"ArgumentDict":{}}) lOSBitness = ProcessCommunicator.ProcessChildReadWaitObject(mProcessGUI_x32)["Result"] lProcessBitnessStr = str(struct.calcsize("P") * 8) @@ -74,15 +74,15 @@ mProcessGUI_x64= None if lOSBitness == 64: if not os.path.isfile("..\\Resources\\WPy64-3720\\python-3.7.2.amd64\\OpenRPARobotGUIx64.exe"): shutil.copyfile('..\\Resources\\WPy64-3720\\python-3.7.2.amd64\\python.exe',"..\\Resources\\WPy64-3720\\python-3.7.2.amd64\\OpenRPARobotGUIx64.exe") - mProcessGUI_x64 = subprocess.Popen(['..\\Resources\\WPy64-3720\\python-3.7.2.amd64\\OpenRPARobotGUIx64.exe','..\\Robot\\GUI.py','release'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) + mProcessGUI_x64 = subprocess.Popen(['..\\Resources\\WPy64-3720\\python-3.7.2.amd64\\OpenRPARobotGUIx64.exe','..\\Robot\\pyOpenRPA\\UIDesktop.py','release'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) #################### #Section: Activity #################### def ActivityRun(inActivitySpecificationDict): - #Выполнить отправку в модуль GUI, если ModuleName == "GUI" + #Выполнить отправку в модуль UIDesktop, если ModuleName == "UIDesktop" #pdb.set_trace() - if inActivitySpecificationDict["ModuleName"] == "GUI": + if inActivitySpecificationDict["ModuleName"] == "UIDesktop": if "ArgumentList" not in inActivitySpecificationDict: inActivitySpecificationDict["ArgumentList"]=[] if "ArgumentDict" not in inActivitySpecificationDict: @@ -105,7 +105,7 @@ def ActivityRun(inActivitySpecificationDict): #Отправить запрос в дочерний процесс, который отвечает за работу с Windows окнами #pdb.set_trace() #Внимание! Проверка разрядности специально делается на процессе 64 бита, тк процесс 32 бита зависает на 35 итерации проверки - ProcessCommunicator.ProcessChildSendObject(mProcessGUI_x64,{"ModuleName":"GUI","ActivityName":"UIOSelector_Get_BitnessInt","ArgumentList":[inActivitySpecificationDict["ArgumentList"][0]],"ArgumentDict":inActivitySpecificationDict["ArgumentDict"]}) + ProcessCommunicator.ProcessChildSendObject(mProcessGUI_x64,{"ModuleName":"UIDesktop","ActivityName":"UIOSelector_Get_BitnessInt","ArgumentList":[inActivitySpecificationDict["ArgumentList"][0]],"ArgumentDict":inActivitySpecificationDict["ArgumentDict"]}) #Получить ответ от дочернего процесса lResponseObject=ProcessCommunicator.ProcessChildReadWaitObject(mProcessGUI_x64) #pdb.set_trace() diff --git a/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/GUI.py b/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/UIDesktop.py similarity index 99% rename from Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/GUI.py rename to Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/UIDesktop.py index 05b139a5..1ee13e6a 100644 --- a/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/GUI.py +++ b/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/UIDesktop.py @@ -39,7 +39,7 @@ mRobotLogger.addHandler(mRobotLoggerFH) #logging.basicConfig(filename="Reports\ReportRobotGUIRun_"+datetime.datetime.now().strftime("%Y_%m_%d")+".log", level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s") #####Внимание####### -#TODO В перспективе нужно реализовать алгоритм определения разрядности не в Robot.py, а в GUI.py, тк начинают появляться функции, на входе в которые еще неизвестна разрядность элемента + селектор может охватить сразу два элемента из 2-х разных разрядностей - обрабатываться это должно непосредственно при выполнении +#TODO В перспективе нужно реализовать алгоритм определения разрядности не в Robot.py, а в UIDesktop.py, тк начинают появляться функции, на входе в которые еще неизвестна разрядность элемента + селектор может охватить сразу два элемента из 2-х разных разрядностей - обрабатываться это должно непосредственно при выполнении #################################### #Info: GUI module of the Robot app (OpenRPA - Robot) diff --git a/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/__init__.py b/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/__init__.py index f69e75bb..b5a1d769 100644 --- a/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/__init__.py +++ b/Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/__init__.py @@ -3,12 +3,12 @@ r""" The OpenRPA package (from UnicodeLabs) """ -__version__ = 'v1.0.15' +__version__ = 'v1.0.16' __all__ = [ - 'GUI','Clipboard','IntegrationOrchestrator','Window', 'ProcessCommunicator' + 'UIDesktop.py', 'Clipboard', 'IntegrationOrchestrator', 'Window', 'ProcessCommunicator', 'Robot' ] __author__ = 'Ivan Maslov ' -from . import GUI +from . import UIDesktop from . import Clipboard from . import IntegrationOrchestrator from . import Window diff --git a/Robot/pyOpenRPA.egg-info/PKG-INFO b/Robot/pyOpenRPA.egg-info/PKG-INFO index 6d0c75ba..0040b9bd 100644 --- a/Robot/pyOpenRPA.egg-info/PKG-INFO +++ b/Robot/pyOpenRPA.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pyOpenRPA -Version: 1.0.15 +Version: 1.0.16 Summary: First open source RPA platform for business Home-page: https://gitlab.com/UnicodeLabs/OpenRPA Author: Ivan Maslov diff --git a/Robot/pyOpenRPA.egg-info/SOURCES.txt b/Robot/pyOpenRPA.egg-info/SOURCES.txt index 5df32d3a..c13476a1 100644 --- a/Robot/pyOpenRPA.egg-info/SOURCES.txt +++ b/Robot/pyOpenRPA.egg-info/SOURCES.txt @@ -1,10 +1,10 @@ setup.py pyOpenRPA/Clipboard.py -pyOpenRPA/GUI.py pyOpenRPA/IntegrationOrchestrator.py pyOpenRPA/JSONNormalize.py pyOpenRPA/ProcessCommunicator.py pyOpenRPA/Robot.py +pyOpenRPA/UIDesktop.py pyOpenRPA/ValueVerify.py pyOpenRPA/Window.py pyOpenRPA/__init__.py diff --git a/Robot/pyOpenRPA/.idea/inspectionProfiles/profiles_settings.xml b/Robot/pyOpenRPA/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 00000000..105ce2da --- /dev/null +++ b/Robot/pyOpenRPA/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/Robot/pyOpenRPA/.idea/misc.xml b/Robot/pyOpenRPA/.idea/misc.xml new file mode 100644 index 00000000..30b95ec7 --- /dev/null +++ b/Robot/pyOpenRPA/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Robot/pyOpenRPA/.idea/modules.xml b/Robot/pyOpenRPA/.idea/modules.xml new file mode 100644 index 00000000..b92a96a1 --- /dev/null +++ b/Robot/pyOpenRPA/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Robot/pyOpenRPA/.idea/pyOpenRPA.iml b/Robot/pyOpenRPA/.idea/pyOpenRPA.iml new file mode 100644 index 00000000..67116063 --- /dev/null +++ b/Robot/pyOpenRPA/.idea/pyOpenRPA.iml @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Robot/pyOpenRPA/.idea/vcs.xml b/Robot/pyOpenRPA/.idea/vcs.xml new file mode 100644 index 00000000..b2bdec2d --- /dev/null +++ b/Robot/pyOpenRPA/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Robot/pyOpenRPA/.idea/workspace.xml b/Robot/pyOpenRPA/.idea/workspace.xml new file mode 100644 index 00000000..cab20100 --- /dev/null +++ b/Robot/pyOpenRPA/.idea/workspace.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 1573232487805 + + + + + + + \ No newline at end of file diff --git a/Robot/pyOpenRPA/Robot.py b/Robot/pyOpenRPA/Robot.py index da848224..8aabbbf1 100644 --- a/Robot/pyOpenRPA/Robot.py +++ b/Robot/pyOpenRPA/Robot.py @@ -63,9 +63,9 @@ logging.basicConfig(filename="Reports\ReportRobotRun_"+datetime.datetime.now().s #Start childprocess - GUI Module 32 bit if not os.path.isfile("..\\Resources\\WPy32-3720\\python-3.7.2\\OpenRPARobotGUIx32.exe"): shutil.copyfile('..\\Resources\\WPy32-3720\\python-3.7.2\\python.exe',"..\\Resources\\WPy32-3720\\python-3.7.2\\OpenRPARobotGUIx32.exe") -mProcessGUI_x32 = subprocess.Popen(['..\\Resources\\WPy32-3720\\python-3.7.2\\OpenRPARobotGUIx32.exe','..\\Robot\\GUI.py','release'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) +mProcessGUI_x32 = subprocess.Popen(['..\\Resources\\WPy32-3720\\python-3.7.2\\OpenRPARobotGUIx32.exe','..\\Robot\\pyOpenRPA\\UIDesktop.py','release'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) #Start childprocess - GUI Module 64 bit - uncomment after WPy64 installation -ProcessCommunicator.ProcessChildSendObject(mProcessGUI_x32,{"ModuleName":"GUI","ActivityName":"Get_OSBitnessInt","ArgumentList":[],"ArgumentDict":{}}) +ProcessCommunicator.ProcessChildSendObject(mProcessGUI_x32,{"ModuleName":"UIDesktop","ActivityName":"Get_OSBitnessInt","ArgumentList":[],"ArgumentDict":{}}) lOSBitness = ProcessCommunicator.ProcessChildReadWaitObject(mProcessGUI_x32)["Result"] lProcessBitnessStr = str(struct.calcsize("P") * 8) @@ -74,15 +74,15 @@ mProcessGUI_x64= None if lOSBitness == 64: if not os.path.isfile("..\\Resources\\WPy64-3720\\python-3.7.2.amd64\\OpenRPARobotGUIx64.exe"): shutil.copyfile('..\\Resources\\WPy64-3720\\python-3.7.2.amd64\\python.exe',"..\\Resources\\WPy64-3720\\python-3.7.2.amd64\\OpenRPARobotGUIx64.exe") - mProcessGUI_x64 = subprocess.Popen(['..\\Resources\\WPy64-3720\\python-3.7.2.amd64\\OpenRPARobotGUIx64.exe','..\\Robot\\GUI.py','release'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) + mProcessGUI_x64 = subprocess.Popen(['..\\Resources\\WPy64-3720\\python-3.7.2.amd64\\OpenRPARobotGUIx64.exe','..\\Robot\\pyOpenRPA\\UIDesktop.py','release'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) #################### #Section: Activity #################### def ActivityRun(inActivitySpecificationDict): - #Выполнить отправку в модуль GUI, если ModuleName == "GUI" + #Выполнить отправку в модуль UIDesktop, если ModuleName == "UIDesktop" #pdb.set_trace() - if inActivitySpecificationDict["ModuleName"] == "GUI": + if inActivitySpecificationDict["ModuleName"] == "UIDesktop": if "ArgumentList" not in inActivitySpecificationDict: inActivitySpecificationDict["ArgumentList"]=[] if "ArgumentDict" not in inActivitySpecificationDict: @@ -105,7 +105,7 @@ def ActivityRun(inActivitySpecificationDict): #Отправить запрос в дочерний процесс, который отвечает за работу с Windows окнами #pdb.set_trace() #Внимание! Проверка разрядности специально делается на процессе 64 бита, тк процесс 32 бита зависает на 35 итерации проверки - ProcessCommunicator.ProcessChildSendObject(mProcessGUI_x64,{"ModuleName":"GUI","ActivityName":"UIOSelector_Get_BitnessInt","ArgumentList":[inActivitySpecificationDict["ArgumentList"][0]],"ArgumentDict":inActivitySpecificationDict["ArgumentDict"]}) + ProcessCommunicator.ProcessChildSendObject(mProcessGUI_x64,{"ModuleName":"UIDesktop","ActivityName":"UIOSelector_Get_BitnessInt","ArgumentList":[inActivitySpecificationDict["ArgumentList"][0]],"ArgumentDict":inActivitySpecificationDict["ArgumentDict"]}) #Получить ответ от дочернего процесса lResponseObject=ProcessCommunicator.ProcessChildReadWaitObject(mProcessGUI_x64) #pdb.set_trace() diff --git a/Robot/pyOpenRPA/GUI.py b/Robot/pyOpenRPA/UIDesktop.py similarity index 99% rename from Robot/pyOpenRPA/GUI.py rename to Robot/pyOpenRPA/UIDesktop.py index 05b139a5..1ee13e6a 100644 --- a/Robot/pyOpenRPA/GUI.py +++ b/Robot/pyOpenRPA/UIDesktop.py @@ -39,7 +39,7 @@ mRobotLogger.addHandler(mRobotLoggerFH) #logging.basicConfig(filename="Reports\ReportRobotGUIRun_"+datetime.datetime.now().strftime("%Y_%m_%d")+".log", level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s") #####Внимание####### -#TODO В перспективе нужно реализовать алгоритм определения разрядности не в Robot.py, а в GUI.py, тк начинают появляться функции, на входе в которые еще неизвестна разрядность элемента + селектор может охватить сразу два элемента из 2-х разных разрядностей - обрабатываться это должно непосредственно при выполнении +#TODO В перспективе нужно реализовать алгоритм определения разрядности не в Robot.py, а в UIDesktop.py, тк начинают появляться функции, на входе в которые еще неизвестна разрядность элемента + селектор может охватить сразу два элемента из 2-х разных разрядностей - обрабатываться это должно непосредственно при выполнении #################################### #Info: GUI module of the Robot app (OpenRPA - Robot) diff --git a/Robot/pyOpenRPA/__init__.py b/Robot/pyOpenRPA/__init__.py index f69e75bb..b5a1d769 100644 --- a/Robot/pyOpenRPA/__init__.py +++ b/Robot/pyOpenRPA/__init__.py @@ -3,12 +3,12 @@ r""" The OpenRPA package (from UnicodeLabs) """ -__version__ = 'v1.0.15' +__version__ = 'v1.0.16' __all__ = [ - 'GUI','Clipboard','IntegrationOrchestrator','Window', 'ProcessCommunicator' + 'UIDesktop.py', 'Clipboard', 'IntegrationOrchestrator', 'Window', 'ProcessCommunicator', 'Robot' ] __author__ = 'Ivan Maslov ' -from . import GUI +from . import UIDesktop from . import Clipboard from . import IntegrationOrchestrator from . import Window diff --git a/Studio/.idea/.gitignore b/Studio/.idea/.gitignore new file mode 100644 index 00000000..0e40fe8f --- /dev/null +++ b/Studio/.idea/.gitignore @@ -0,0 +1,3 @@ + +# Default ignored files +/workspace.xml \ No newline at end of file diff --git a/Studio/.idea/Studio.iml b/Studio/.idea/Studio.iml new file mode 100644 index 00000000..67116063 --- /dev/null +++ b/Studio/.idea/Studio.iml @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Studio/.idea/inspectionProfiles/profiles_settings.xml b/Studio/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 00000000..105ce2da --- /dev/null +++ b/Studio/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/Studio/.idea/misc.xml b/Studio/.idea/misc.xml new file mode 100644 index 00000000..30b95ec7 --- /dev/null +++ b/Studio/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Studio/.idea/modules.xml b/Studio/.idea/modules.xml new file mode 100644 index 00000000..bf3239e6 --- /dev/null +++ b/Studio/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Studio/.idea/vcs.xml b/Studio/.idea/vcs.xml new file mode 100644 index 00000000..6c0b8635 --- /dev/null +++ b/Studio/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Studio/Studio.py b/Studio/Studio.py index ee831cda..519adde6 100644 --- a/Studio/Studio.py +++ b/Studio/Studio.py @@ -8,8 +8,7 @@ import os import ProcessCommunicator import sys import traceback -sys.path.append('../Robot') -import Robot +from pyOpenRPA import Robot # HTTPRequestHandler class class testHTTPServer_RequestHandler(BaseHTTPRequestHandler): diff --git a/v1.0.15 b/v1.0.16 similarity index 100% rename from v1.0.15 rename to v1.0.16