# Add orchestrator/Server unquotes for URL path (need for rus symbols in fila path)

dev-linux
Ivan Maslov 4 years ago
parent b779b6f25a
commit f421aaa2ea

@ -1,6 +1,6 @@
Metadata-Version: 2.1 Metadata-Version: 2.1
Name: pyOpenRPA Name: pyOpenRPA
Version: 1.1.15 Version: 1.1.16
Summary: First open source RPA platform for business Summary: First open source RPA platform for business
Home-page: https://gitlab.com/UnicodeLabs/OpenRPA Home-page: https://gitlab.com/UnicodeLabs/OpenRPA
Author: Ivan Maslov Author: Ivan Maslov

@ -1,9 +1,9 @@
pyOpenRPA-1.1.15.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 pyOpenRPA-1.1.16.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
pyOpenRPA-1.1.15.dist-info/METADATA,sha256=QZCz4uAPAscqSQmt9SgpXNqSEDBYuGlZg8r6k4KxKc0,3352 pyOpenRPA-1.1.16.dist-info/METADATA,sha256=vFFlkEOKCcOcuHWX5ZAu1EhfXed_WcE07NLogmifeSE,3352
pyOpenRPA-1.1.15.dist-info/RECORD,, pyOpenRPA-1.1.16.dist-info/RECORD,,
pyOpenRPA-1.1.15.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 pyOpenRPA-1.1.16.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
pyOpenRPA-1.1.15.dist-info/WHEEL,sha256=qB97nP5e4MrOsXW5bIU5cUn_KSVr10EV0l-GCHG9qNs,97 pyOpenRPA-1.1.16.dist-info/WHEEL,sha256=qB97nP5e4MrOsXW5bIU5cUn_KSVr10EV0l-GCHG9qNs,97
pyOpenRPA-1.1.15.dist-info/top_level.txt,sha256=RPzwQXgYBRo_m5L3ZLs6Voh8aEkMeT29Xsul1w1qE0g,10 pyOpenRPA-1.1.16.dist-info/top_level.txt,sha256=RPzwQXgYBRo_m5L3ZLs6Voh8aEkMeT29Xsul1w1qE0g,10
pyOpenRPA/.idea/inspectionProfiles/profiles_settings.xml,sha256=YXLFmX7rPNGcnKK1uX1uKYPN0fpgskYNe7t0BV7cqkY,174 pyOpenRPA/.idea/inspectionProfiles/profiles_settings.xml,sha256=YXLFmX7rPNGcnKK1uX1uKYPN0fpgskYNe7t0BV7cqkY,174
pyOpenRPA/.idea/misc.xml,sha256=ySjeaQ1DfqxaRTlFGT_3zW5r9mWuwxoAK_AX4QiuAZM,203 pyOpenRPA/.idea/misc.xml,sha256=ySjeaQ1DfqxaRTlFGT_3zW5r9mWuwxoAK_AX4QiuAZM,203
pyOpenRPA/.idea/modules.xml,sha256=Q__U1JIA2cjxbLRXAv-SfYY00fZA0TNlpkkbY4s3ncg,277 pyOpenRPA/.idea/modules.xml,sha256=Q__U1JIA2cjxbLRXAv-SfYY00fZA0TNlpkkbY4s3ncg,277
@ -44,7 +44,7 @@ pyOpenRPA/Orchestrator/RobotScreenActive/__pycache__/Monitor.cpython-37.pyc,,
pyOpenRPA/Orchestrator/RobotScreenActive/__pycache__/Screen.cpython-37.pyc,, pyOpenRPA/Orchestrator/RobotScreenActive/__pycache__/Screen.cpython-37.pyc,,
pyOpenRPA/Orchestrator/RobotScreenActive/__pycache__/__init__.cpython-37.pyc,, pyOpenRPA/Orchestrator/RobotScreenActive/__pycache__/__init__.cpython-37.pyc,,
pyOpenRPA/Orchestrator/RobotScreenActive/__pycache__/__main__.cpython-37.pyc,, pyOpenRPA/Orchestrator/RobotScreenActive/__pycache__/__main__.cpython-37.pyc,,
pyOpenRPA/Orchestrator/Server.py,sha256=kWMAUDeHlG4RX3lZR-pHBIpeZ6lxF_PJ_KDVENvbFK8,25403 pyOpenRPA/Orchestrator/Server.py,sha256=BfXerskIc1BV2BoItaXUC8lhNp3WvadGYetUFo8RCxw,25624
pyOpenRPA/Orchestrator/ServerSettings.py,sha256=dK8pQzg2mcLPjbizOPCP7yHMMVLiTh8RbYVnJXn-Mvg,15640 pyOpenRPA/Orchestrator/ServerSettings.py,sha256=dK8pQzg2mcLPjbizOPCP7yHMMVLiTh8RbYVnJXn-Mvg,15640
pyOpenRPA/Orchestrator/Timer.py,sha256=HvYtEeH2Q5WVVjgds9XaBpWRmvZgwgBXurJDdVVq_T0,2097 pyOpenRPA/Orchestrator/Timer.py,sha256=HvYtEeH2Q5WVVjgds9XaBpWRmvZgwgBXurJDdVVq_T0,2097
pyOpenRPA/Orchestrator/Web/Index.js,sha256=zdbj1ioNgxhprLpGIQ2YYraKUMUpkBiVoR-3GXGR5X0,28258 pyOpenRPA/Orchestrator/Web/Index.js,sha256=zdbj1ioNgxhprLpGIQ2YYraKUMUpkBiVoR-3GXGR5X0,28258
@ -314,6 +314,6 @@ pyOpenRPA/Tools/Terminator.py,sha256=VcjX3gFXiCGu3MMCidhrTNsmC9wsAqfjRJdTSU9fLnU
pyOpenRPA/Tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 pyOpenRPA/Tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
pyOpenRPA/Tools/__pycache__/Terminator.cpython-37.pyc,, pyOpenRPA/Tools/__pycache__/Terminator.cpython-37.pyc,,
pyOpenRPA/Tools/__pycache__/__init__.cpython-37.pyc,, pyOpenRPA/Tools/__pycache__/__init__.cpython-37.pyc,,
pyOpenRPA/__init__.py,sha256=EYr94WCIlVXY6RR7CMN4jtIYitfDcpxLYJGK5kylOSM,175 pyOpenRPA/__init__.py,sha256=cF-VCh5GkVMRYDsx_4MJ8O2xREKysCGhlW_H5pHF8Co,175
pyOpenRPA/__pycache__/__init__.cpython-37.pyc,, pyOpenRPA/__pycache__/__init__.cpython-37.pyc,,
pyOpenRPA/test.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 pyOpenRPA/test.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0

@ -12,6 +12,7 @@ import threading
import json import json
from threading import Thread from threading import Thread
from . import Processor from . import Processor
import urllib.parse # decode URL in string
import importlib import importlib
import pdb import pdb
import base64 import base64
@ -244,6 +245,7 @@ class testHTTPServer_RequestHandler(BaseHTTPRequestHandler):
inURLItem["ResponseDefRequestGlobal"](inRequest, inGlobalDict) inURLItem["ResponseDefRequestGlobal"](inRequest, inGlobalDict)
if "ResponseFolderPath" in inURLItem: if "ResponseFolderPath" in inURLItem:
lRequestPath = inRequest.path lRequestPath = inRequest.path
if inURLItem["URL"][-1]!="/": inURLItem["URL"]+= "/" # Fix for settings
lFilePathSecondPart = lRequestPath.replace(inURLItem["URL"],"") lFilePathSecondPart = lRequestPath.replace(inURLItem["URL"],"")
lFilePath = os.path.join(inURLItem["ResponseFolderPath"],lFilePathSecondPart) lFilePath = os.path.join(inURLItem["ResponseFolderPath"],lFilePathSecondPart)
#print(f"File full path {lFilePath}") #print(f"File full path {lFilePath}")
@ -259,26 +261,26 @@ class testHTTPServer_RequestHandler(BaseHTTPRequestHandler):
if inURLItem["Method"].upper() == inMethod.upper(): if inURLItem["Method"].upper() == inMethod.upper():
# check Match type variant: BeginWith # check Match type variant: BeginWith
if inURLItem["MatchType"].upper() == "BEGINWITH": if inURLItem["MatchType"].upper() == "BEGINWITH":
lURLPath = self.path lURLPath = urllib.parse.unquote(self.path)
lURLPath = lURLPath.upper() lURLPath = lURLPath.upper()
if lURLPath.startswith(inURLItem["URL"].upper()): if lURLPath.startswith(inURLItem["URL"].upper()):
URLItemDo(inURLItem, self, gSettingsDict) URLItemDo(inURLItem, self, gSettingsDict)
return True return True
# check Match type variant: Contains # check Match type variant: Contains
elif inURLItem["MatchType"].upper() == "CONTAINS": elif inURLItem["MatchType"].upper() == "CONTAINS":
lURLPath = self.path lURLPath = urllib.parse.unquote(self.path)
lURLPath = lURLPath.upper() lURLPath = lURLPath.upper()
if lURLPath.contains(inURLItem["URL"].upper()): if lURLPath.contains(inURLItem["URL"].upper()):
URLItemDo(inURLItem, self, gSettingsDict) URLItemDo(inURLItem, self, gSettingsDict)
return True return True
# check Match type variant: Equal # check Match type variant: Equal
elif inURLItem["MatchType"].upper() == "EQUAL": elif inURLItem["MatchType"].upper() == "EQUAL":
if inURLItem["URL"].upper() == self.path.upper(): if inURLItem["URL"].upper() == urllib.parse.unquote(self.path).upper():
URLItemDo(inURLItem, self, gSettingsDict) URLItemDo(inURLItem, self, gSettingsDict)
return True return True
# check Match type variant: EqualCase # check Match type variant: EqualCase
elif inURLItem["MatchType"].upper() == "EQUALCASE": elif inURLItem["MatchType"].upper() == "EQUALCASE":
if inURLItem["URL"] == self.path: if inURLItem["URL"] == urllib.parse.unquote(self.path):
URLItemDo(inURLItem, self, gSettingsDict) URLItemDo(inURLItem, self, gSettingsDict)
return True return True
return False return False

@ -3,7 +3,7 @@ r"""
The OpenRPA package (from UnicodeLabs) The OpenRPA package (from UnicodeLabs)
""" """
__version__ = 'v1.1.15' __version__ = 'v1.1.16'
__all__ = [] __all__ = []
__author__ = 'Ivan Maslov <ivan.maslov@unicodelabs.ru>' __author__ = 'Ivan Maslov <ivan.maslov@unicodelabs.ru>'
#from .Core import Robot #from .Core import Robot

@ -1,6 +1,6 @@
Metadata-Version: 2.1 Metadata-Version: 2.1
Name: pyOpenRPA Name: pyOpenRPA
Version: 1.1.15 Version: 1.1.16
Summary: First open source RPA platform for business Summary: First open source RPA platform for business
Home-page: https://gitlab.com/UnicodeLabs/OpenRPA Home-page: https://gitlab.com/UnicodeLabs/OpenRPA
Author: Ivan Maslov Author: Ivan Maslov

@ -1,9 +1,9 @@
pyOpenRPA-1.1.15.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 pyOpenRPA-1.1.16.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
pyOpenRPA-1.1.15.dist-info/METADATA,sha256=QZCz4uAPAscqSQmt9SgpXNqSEDBYuGlZg8r6k4KxKc0,3352 pyOpenRPA-1.1.16.dist-info/METADATA,sha256=vFFlkEOKCcOcuHWX5ZAu1EhfXed_WcE07NLogmifeSE,3352
pyOpenRPA-1.1.15.dist-info/RECORD,, pyOpenRPA-1.1.16.dist-info/RECORD,,
pyOpenRPA-1.1.15.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 pyOpenRPA-1.1.16.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
pyOpenRPA-1.1.15.dist-info/WHEEL,sha256=qB97nP5e4MrOsXW5bIU5cUn_KSVr10EV0l-GCHG9qNs,97 pyOpenRPA-1.1.16.dist-info/WHEEL,sha256=qB97nP5e4MrOsXW5bIU5cUn_KSVr10EV0l-GCHG9qNs,97
pyOpenRPA-1.1.15.dist-info/top_level.txt,sha256=RPzwQXgYBRo_m5L3ZLs6Voh8aEkMeT29Xsul1w1qE0g,10 pyOpenRPA-1.1.16.dist-info/top_level.txt,sha256=RPzwQXgYBRo_m5L3ZLs6Voh8aEkMeT29Xsul1w1qE0g,10
pyOpenRPA/.idea/inspectionProfiles/profiles_settings.xml,sha256=YXLFmX7rPNGcnKK1uX1uKYPN0fpgskYNe7t0BV7cqkY,174 pyOpenRPA/.idea/inspectionProfiles/profiles_settings.xml,sha256=YXLFmX7rPNGcnKK1uX1uKYPN0fpgskYNe7t0BV7cqkY,174
pyOpenRPA/.idea/misc.xml,sha256=ySjeaQ1DfqxaRTlFGT_3zW5r9mWuwxoAK_AX4QiuAZM,203 pyOpenRPA/.idea/misc.xml,sha256=ySjeaQ1DfqxaRTlFGT_3zW5r9mWuwxoAK_AX4QiuAZM,203
pyOpenRPA/.idea/modules.xml,sha256=Q__U1JIA2cjxbLRXAv-SfYY00fZA0TNlpkkbY4s3ncg,277 pyOpenRPA/.idea/modules.xml,sha256=Q__U1JIA2cjxbLRXAv-SfYY00fZA0TNlpkkbY4s3ncg,277
@ -44,7 +44,7 @@ pyOpenRPA/Orchestrator/RobotScreenActive/__pycache__/Monitor.cpython-37.pyc,,
pyOpenRPA/Orchestrator/RobotScreenActive/__pycache__/Screen.cpython-37.pyc,, pyOpenRPA/Orchestrator/RobotScreenActive/__pycache__/Screen.cpython-37.pyc,,
pyOpenRPA/Orchestrator/RobotScreenActive/__pycache__/__init__.cpython-37.pyc,, pyOpenRPA/Orchestrator/RobotScreenActive/__pycache__/__init__.cpython-37.pyc,,
pyOpenRPA/Orchestrator/RobotScreenActive/__pycache__/__main__.cpython-37.pyc,, pyOpenRPA/Orchestrator/RobotScreenActive/__pycache__/__main__.cpython-37.pyc,,
pyOpenRPA/Orchestrator/Server.py,sha256=kWMAUDeHlG4RX3lZR-pHBIpeZ6lxF_PJ_KDVENvbFK8,25403 pyOpenRPA/Orchestrator/Server.py,sha256=BfXerskIc1BV2BoItaXUC8lhNp3WvadGYetUFo8RCxw,25624
pyOpenRPA/Orchestrator/ServerSettings.py,sha256=dK8pQzg2mcLPjbizOPCP7yHMMVLiTh8RbYVnJXn-Mvg,15640 pyOpenRPA/Orchestrator/ServerSettings.py,sha256=dK8pQzg2mcLPjbizOPCP7yHMMVLiTh8RbYVnJXn-Mvg,15640
pyOpenRPA/Orchestrator/Timer.py,sha256=HvYtEeH2Q5WVVjgds9XaBpWRmvZgwgBXurJDdVVq_T0,2097 pyOpenRPA/Orchestrator/Timer.py,sha256=HvYtEeH2Q5WVVjgds9XaBpWRmvZgwgBXurJDdVVq_T0,2097
pyOpenRPA/Orchestrator/Web/Index.js,sha256=zdbj1ioNgxhprLpGIQ2YYraKUMUpkBiVoR-3GXGR5X0,28258 pyOpenRPA/Orchestrator/Web/Index.js,sha256=zdbj1ioNgxhprLpGIQ2YYraKUMUpkBiVoR-3GXGR5X0,28258
@ -314,6 +314,6 @@ pyOpenRPA/Tools/Terminator.py,sha256=VcjX3gFXiCGu3MMCidhrTNsmC9wsAqfjRJdTSU9fLnU
pyOpenRPA/Tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 pyOpenRPA/Tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
pyOpenRPA/Tools/__pycache__/Terminator.cpython-37.pyc,, pyOpenRPA/Tools/__pycache__/Terminator.cpython-37.pyc,,
pyOpenRPA/Tools/__pycache__/__init__.cpython-37.pyc,, pyOpenRPA/Tools/__pycache__/__init__.cpython-37.pyc,,
pyOpenRPA/__init__.py,sha256=EYr94WCIlVXY6RR7CMN4jtIYitfDcpxLYJGK5kylOSM,175 pyOpenRPA/__init__.py,sha256=cF-VCh5GkVMRYDsx_4MJ8O2xREKysCGhlW_H5pHF8Co,175
pyOpenRPA/__pycache__/__init__.cpython-37.pyc,, pyOpenRPA/__pycache__/__init__.cpython-37.pyc,,
pyOpenRPA/test.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 pyOpenRPA/test.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0

@ -12,6 +12,7 @@ import threading
import json import json
from threading import Thread from threading import Thread
from . import Processor from . import Processor
import urllib.parse # decode URL in string
import importlib import importlib
import pdb import pdb
import base64 import base64
@ -244,6 +245,7 @@ class testHTTPServer_RequestHandler(BaseHTTPRequestHandler):
inURLItem["ResponseDefRequestGlobal"](inRequest, inGlobalDict) inURLItem["ResponseDefRequestGlobal"](inRequest, inGlobalDict)
if "ResponseFolderPath" in inURLItem: if "ResponseFolderPath" in inURLItem:
lRequestPath = inRequest.path lRequestPath = inRequest.path
if inURLItem["URL"][-1]!="/": inURLItem["URL"]+= "/" # Fix for settings
lFilePathSecondPart = lRequestPath.replace(inURLItem["URL"],"") lFilePathSecondPart = lRequestPath.replace(inURLItem["URL"],"")
lFilePath = os.path.join(inURLItem["ResponseFolderPath"],lFilePathSecondPart) lFilePath = os.path.join(inURLItem["ResponseFolderPath"],lFilePathSecondPart)
#print(f"File full path {lFilePath}") #print(f"File full path {lFilePath}")
@ -259,26 +261,26 @@ class testHTTPServer_RequestHandler(BaseHTTPRequestHandler):
if inURLItem["Method"].upper() == inMethod.upper(): if inURLItem["Method"].upper() == inMethod.upper():
# check Match type variant: BeginWith # check Match type variant: BeginWith
if inURLItem["MatchType"].upper() == "BEGINWITH": if inURLItem["MatchType"].upper() == "BEGINWITH":
lURLPath = self.path lURLPath = urllib.parse.unquote(self.path)
lURLPath = lURLPath.upper() lURLPath = lURLPath.upper()
if lURLPath.startswith(inURLItem["URL"].upper()): if lURLPath.startswith(inURLItem["URL"].upper()):
URLItemDo(inURLItem, self, gSettingsDict) URLItemDo(inURLItem, self, gSettingsDict)
return True return True
# check Match type variant: Contains # check Match type variant: Contains
elif inURLItem["MatchType"].upper() == "CONTAINS": elif inURLItem["MatchType"].upper() == "CONTAINS":
lURLPath = self.path lURLPath = urllib.parse.unquote(self.path)
lURLPath = lURLPath.upper() lURLPath = lURLPath.upper()
if lURLPath.contains(inURLItem["URL"].upper()): if lURLPath.contains(inURLItem["URL"].upper()):
URLItemDo(inURLItem, self, gSettingsDict) URLItemDo(inURLItem, self, gSettingsDict)
return True return True
# check Match type variant: Equal # check Match type variant: Equal
elif inURLItem["MatchType"].upper() == "EQUAL": elif inURLItem["MatchType"].upper() == "EQUAL":
if inURLItem["URL"].upper() == self.path.upper(): if inURLItem["URL"].upper() == urllib.parse.unquote(self.path).upper():
URLItemDo(inURLItem, self, gSettingsDict) URLItemDo(inURLItem, self, gSettingsDict)
return True return True
# check Match type variant: EqualCase # check Match type variant: EqualCase
elif inURLItem["MatchType"].upper() == "EQUALCASE": elif inURLItem["MatchType"].upper() == "EQUALCASE":
if inURLItem["URL"] == self.path: if inURLItem["URL"] == urllib.parse.unquote(self.path):
URLItemDo(inURLItem, self, gSettingsDict) URLItemDo(inURLItem, self, gSettingsDict)
return True return True
return False return False

@ -3,7 +3,7 @@ r"""
The OpenRPA package (from UnicodeLabs) The OpenRPA package (from UnicodeLabs)
""" """
__version__ = 'v1.1.15' __version__ = 'v1.1.16'
__all__ = [] __all__ = []
__author__ = 'Ivan Maslov <ivan.maslov@unicodelabs.ru>' __author__ = 'Ivan Maslov <ivan.maslov@unicodelabs.ru>'
#from .Core import Robot #from .Core import Robot

@ -12,6 +12,7 @@ import threading
import json import json
from threading import Thread from threading import Thread
from . import Processor from . import Processor
import urllib.parse # decode URL in string
import importlib import importlib
import pdb import pdb
import base64 import base64
@ -244,6 +245,7 @@ class testHTTPServer_RequestHandler(BaseHTTPRequestHandler):
inURLItem["ResponseDefRequestGlobal"](inRequest, inGlobalDict) inURLItem["ResponseDefRequestGlobal"](inRequest, inGlobalDict)
if "ResponseFolderPath" in inURLItem: if "ResponseFolderPath" in inURLItem:
lRequestPath = inRequest.path lRequestPath = inRequest.path
if inURLItem["URL"][-1]!="/": inURLItem["URL"]+= "/" # Fix for settings
lFilePathSecondPart = lRequestPath.replace(inURLItem["URL"],"") lFilePathSecondPart = lRequestPath.replace(inURLItem["URL"],"")
lFilePath = os.path.join(inURLItem["ResponseFolderPath"],lFilePathSecondPart) lFilePath = os.path.join(inURLItem["ResponseFolderPath"],lFilePathSecondPart)
#print(f"File full path {lFilePath}") #print(f"File full path {lFilePath}")
@ -259,26 +261,26 @@ class testHTTPServer_RequestHandler(BaseHTTPRequestHandler):
if inURLItem["Method"].upper() == inMethod.upper(): if inURLItem["Method"].upper() == inMethod.upper():
# check Match type variant: BeginWith # check Match type variant: BeginWith
if inURLItem["MatchType"].upper() == "BEGINWITH": if inURLItem["MatchType"].upper() == "BEGINWITH":
lURLPath = self.path lURLPath = urllib.parse.unquote(self.path)
lURLPath = lURLPath.upper() lURLPath = lURLPath.upper()
if lURLPath.startswith(inURLItem["URL"].upper()): if lURLPath.startswith(inURLItem["URL"].upper()):
URLItemDo(inURLItem, self, gSettingsDict) URLItemDo(inURLItem, self, gSettingsDict)
return True return True
# check Match type variant: Contains # check Match type variant: Contains
elif inURLItem["MatchType"].upper() == "CONTAINS": elif inURLItem["MatchType"].upper() == "CONTAINS":
lURLPath = self.path lURLPath = urllib.parse.unquote(self.path)
lURLPath = lURLPath.upper() lURLPath = lURLPath.upper()
if lURLPath.contains(inURLItem["URL"].upper()): if lURLPath.contains(inURLItem["URL"].upper()):
URLItemDo(inURLItem, self, gSettingsDict) URLItemDo(inURLItem, self, gSettingsDict)
return True return True
# check Match type variant: Equal # check Match type variant: Equal
elif inURLItem["MatchType"].upper() == "EQUAL": elif inURLItem["MatchType"].upper() == "EQUAL":
if inURLItem["URL"].upper() == self.path.upper(): if inURLItem["URL"].upper() == urllib.parse.unquote(self.path).upper():
URLItemDo(inURLItem, self, gSettingsDict) URLItemDo(inURLItem, self, gSettingsDict)
return True return True
# check Match type variant: EqualCase # check Match type variant: EqualCase
elif inURLItem["MatchType"].upper() == "EQUALCASE": elif inURLItem["MatchType"].upper() == "EQUALCASE":
if inURLItem["URL"] == self.path: if inURLItem["URL"] == urllib.parse.unquote(self.path):
URLItemDo(inURLItem, self, gSettingsDict) URLItemDo(inURLItem, self, gSettingsDict)
return True return True
return False return False

@ -3,7 +3,7 @@ r"""
The OpenRPA package (from UnicodeLabs) The OpenRPA package (from UnicodeLabs)
""" """
__version__ = 'v1.1.15' __version__ = 'v1.1.16'
__all__ = [] __all__ = []
__author__ = 'Ivan Maslov <ivan.maslov@unicodelabs.ru>' __author__ = 'Ivan Maslov <ivan.maslov@unicodelabs.ru>'
#from .Core import Robot #from .Core import Robot
Loading…
Cancel
Save