From 7cf9b248a2946be3ad00cc2b819c34b14ed48900 Mon Sep 17 00:00:00 2001 From: Ivan Maslov Date: Tue, 23 Apr 2019 22:15:59 +0300 Subject: [PATCH] #RestructureRobot --- Robot/OpenRPA_32.cmd | 3 ++- Robot/PythonDebug_32.cmd | 3 ++- Robot/daemon.py | 12 ++++++------ __pycache__/winGUI.cpython-37.pyc | Bin 13001 -> 0 bytes 4 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 __pycache__/winGUI.cpython-37.pyc diff --git a/Robot/OpenRPA_32.cmd b/Robot/OpenRPA_32.cmd index f9e41e00..136762e1 100644 --- a/Robot/OpenRPA_32.cmd +++ b/Robot/OpenRPA_32.cmd @@ -1,2 +1,3 @@ cd %~dp0 -.\WPy32-3720\python-3.7.2\python.exe daemon.py \ No newline at end of file +.\..\Resources\WPy32-3720\python-3.7.2\python.exe daemon.py +pause >nul \ No newline at end of file diff --git a/Robot/PythonDebug_32.cmd b/Robot/PythonDebug_32.cmd index 33cc7f1b..eca1167e 100644 --- a/Robot/PythonDebug_32.cmd +++ b/Robot/PythonDebug_32.cmd @@ -1,2 +1,3 @@ cd %~dp0 -.\WPy32-3720\python-3.7.2\python.exe \ No newline at end of file +.\..\Resources\WPy32-3720\python-3.7.2\python.exe +pause >nul \ No newline at end of file diff --git a/Robot/daemon.py b/Robot/daemon.py index d7232778..089b5718 100644 --- a/Robot/daemon.py +++ b/Robot/daemon.py @@ -158,19 +158,19 @@ class testHTTPServer_RequestHandler(BaseHTTPRequestHandler): self.SendResponseContentTypeFile('text/html',"Index.xhtml") #Мост между файлом и http запросом (новый формат) if self.path == '/3rdParty/Semantic-UI-CSS-master/semantic.min.css': - self.SendResponseContentTypeFile('text/css',"3rdParty\\Semantic-UI-CSS-master\\semantic.min.css") + self.SendResponseContentTypeFile('text/css',"..\\Resources\\Web\\Semantic-UI-CSS-master\\semantic.min.css") #Мост между файлом и http запросом (новый формат) if self.path == '/3rdParty/Semantic-UI-CSS-master/semantic.min.js': - self.SendResponseContentTypeFile('application/javascript',"3rdParty\\Semantic-UI-CSS-master\\semantic.min.js") + self.SendResponseContentTypeFile('application/javascript',"..\\Resources\\Web\\Semantic-UI-CSS-master\\semantic.min.js") #Мост между файлом и http запросом (новый формат) if self.path == '/3rdParty/jQuery/jquery-3.1.1.min.js': - self.SendResponseContentTypeFile('application/javascript',"3rdParty\\jQuery\\jquery-3.1.1.min.js") + self.SendResponseContentTypeFile('application/javascript',"..\\Resources\\Web\\jQuery\\jquery-3.1.1.min.js") #Мост между файлом и http запросом (новый формат) if self.path == '/3rdParty/Google/LatoItalic.css': - self.SendResponseContentTypeFile('font/css',"3rdParty\\Google\\LatoItalic.css") + self.SendResponseContentTypeFile('font/css',"..\\Resources\\Web\\Google\\LatoItalic.css") #Мост между файлом и http запросом (новый формат) if self.path == '/3rdParty/Semantic-UI-CSS-master/themes/default/assets/fonts/icons.woff2': - self.SendResponseContentTypeFile('font/woff2',"3rdParty\\Semantic-UI-CSS-master\\themes\\default\\assets\\fonts\\icons.woff2") + self.SendResponseContentTypeFile('font/woff2',"..\\Resources\\Web\\Semantic-UI-CSS-master\\themes\\default\\assets\\fonts\\icons.woff2") #Мост между файлом и http запросом (новый формат) if self.path == '/favicon.ico': self.SendResponseContentTypeFile('image/x-icon',"favicon.ico") @@ -289,7 +289,7 @@ def run(): httpd.serve_forever() #Start childprocess 32 bit -p = subprocess.Popen(['WPy32-3720\\python-3.7.2\\python.exe','winGUI.py'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) +p = subprocess.Popen(['..\\Resources\\WPy32-3720\\python-3.7.2\\python.exe','winGUI.py'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) #print(ChildProcessReadWaitString(p)) run() diff --git a/__pycache__/winGUI.cpython-37.pyc b/__pycache__/winGUI.cpython-37.pyc deleted file mode 100644 index 9aeb0336330da4ecf388838b10373c96a7ebd695..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13001 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