Changeset 30501

Timestamp:

Mar 7, 2008, 3:56:14 PM (16 years ago)

Author:

martinl

Message:

wxGUI (gcmd) MS Windows related fixes

Location:

grass/trunk/gui/wxpython/gui_modules

Files:

• gcmd.py (modified) (4 diffs)
• globalvar.py (modified) (1 diff)

grass/trunk/gui/wxpython/gui_modules/gcmd.py

@@ -7 +7 @@
  * GException
  * DigitError
- * Popen
+ * Popen (from http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/440554)
  * Command
  * CommandThread
@@ -128 +128 @@
     def kill(self):
         """Try to kill running process"""
-        try:
+        if subprocess.mswindows:
+            import win32api
+            handle = win32api.OpenProcess(1, 0, self.pid)
+            return (0 != win32api.TerminateProcess(handle, 0))
+        else:
             os.kill(-self.pid, signal.SIGTERM) # kill whole group
-        except OSError:
-            pass
 
     if subprocess.mswindows:
@@ -213 +215 @@
                 if not conn.closed:
                     fcntl.fcntl(conn, fcntl.F_SETFL, flags)
+
+message = "Other end disconnected!"
+
+def recv_some(p, t=.1, e=1, tr=5, stderr=0):
+    if tr < 1:
+        tr = 1
+    x = time.time()+t
+    y = []
+    r = ''
+    pr = p.recv
+    if stderr:
+        pr = p.recv_err
+    while time.time() < x or r:
+        r = pr()
+        if r is None:
+            if e:
+                raise Exception(message)
+            else:
+                break
+        elif r:
+            y.append(r)
+        else:
+            time.sleep(max((x-time.time())/tr, 0))
+    return ''.join(y)
+    
+def send_all(p, data):
+    while len(data):
+        sent = p.send(data)
+        if sent is None:
+            raise Exception(message)
+        data = buffer(data, sent)
 
 # Define notification event for thread completion
@@ -529 +562 @@
                 return 
             if self.stdout:
-                line = self.__read_all(self.module.stdout)
+                # line = self.__read_all(self.module.stdout)
+                line = recv_some(self.module, e=0, stderr=0)
                 self.stdout.write(line)
             if self.stderr:
-                line = self.__read_all(self.module.stderr)
+                # line = self.__read_all(self.module.stderr)
+                line = recv_some(self.module, e=0, stderr=1)
                 self.stderr.write(line)
 
         # get the last output
         if self.stdout:
-            line = self.__read_all(self.module.stdout)
+            # line = self.__read_all(self.module.stdout)
+            line = recv_some(self.module, e=0, stderr=0)
             self.stdout.write(line)
         if self.stderr:
-            line = self.__read_all(self.module.stderr)
+            # line = self.__read_all(self.module.stderr)
+            line = recv_some(self.module, e=0, stderr=1)
             self.stderr.write(line)
 

grass/trunk/gui/wxpython/gui_modules/globalvar.py

@@ -63 +63 @@
     parsing string from the command line
     """
-    gcmdlst = []
     gisbase = os.environ['GISBASE']
+    binlst = []
     if bin is True:
-        gcmdlst = os.listdir(os.path.join(gisbase, 'bin'))
+        binlst = os.listdir(os.path.join(gisbase, 'bin'))
+        if subprocess.mswindows:
+            for idx in range(len(binlst)):
+                binlst[idx] = binlst[idx].replace(EXT_BIN, '')
+                binlst[idx] = binlst[idx].replace(EXT_SCT, '')
+    sctlst = []
     if scripts is True:
-        gcmdlst = gcmdlst + os.listdir(os.path.join(gisbase, 'scripts'))
+        sctlst = sctlst + os.listdir(os.path.join(gisbase, 'scripts'))
+        if subprocess.mswindows:
+            for idx in range(len(binlst)):
+                binlst[idx] = binlst[idx].replace(EXT_BIN, '')
+                binlst[idx] = binlst[idx].replace(EXT_SCT, '')
+
     # self.gcmdlst = self.gcmdlst + os.listdir(os.path.join(gisbase,'etc','gm','script'))
 
-    return gcmdlst
+    return binlst + sctlst
 
 """@brief Collected GRASS-relared binaries/scripts"""