Changeset 871

Timestamp:

06/10/07 06:14:01 (2 years ago)

Author:

lilo_booter

Message:

+ 'Corrections' for os/x and file system methods (utf8 unsupported in the comms for now)

Files:

• trunk/jahtools/jbatch/jbatch_server.py (modified) (3 diffs)

trunk/jahtools/jbatch/jbatch_server.py

@@ -365 +365 @@
                                 except Exception:
                                         # TODO: utf8 handling
-                                        print "rejecting", entry
+                                        #print "rejecting", entry
+                                        pass
                 args[ "socket" ].sendall( result )
 
@@ -376 +377 @@
                         contents = os.listdir( dir )
                         for entry in contents:
-                                full = os.path.join( dir, entry )
-                                if os.path.isdir( full ):
-                                        socket.sendall( "\"%s/\"\n" % entry )
-                                elif files:
-                                        socket.sendall( "\"%s\"\n" % entry )
+                                try:
+                                        full = os.path.join( dir, str( entry ) )
+                                        if os.path.isdir( full ):
+                                                socket.sendall( "\"%s/\"\n" % entry )
+                                        elif files:
+                                                socket.sendall( "\"%s\"\n" % entry )
+                                except Exception:
+                                        #print "rejecting", entry
+                                        pass
                         socket.sendall( "\n" )
                         if depth != 0:
                                 depth -= 1
                                 for entry in contents:
-                                        full = os.path.join( dir, entry )
-                                        if os.path.isdir( full ):
-                                                self.rpn.push( full )
-                                                self.rpn.push( depth )
-                                                self.rls( files, **args )
+                                        try:
+                                                full = os.path.join( dir, str( entry ) )
+                                                if os.path.isdir( full ):
+                                                        self.rpn.push( full )
+                                                        self.rpn.push( str( depth ) )
+                                                        self.rls( files, **args )
+                                        except Exception:
+                                                #print "rejecting", entry
+                                                pass
                 else:
                         socket.sendall( "\n" )
@@ -397 +406 @@
 
         def tree( self, **args ):
-                self.rls( False, args )
+                self.rls( False, **args )
 
         def help( self, **args ):