Changeset 348 for branches/guitools-2.0/shared/smbtree.vrs

Timestamp:

Dec 9, 2009, 7:48:45 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI Version 2.0 beta6 level code

File:

• branches/guitools-2.0/shared/smbtree.vrs (modified) (13 diffs)

branches/guitools-2.0/shared/smbtree.vrs

@@ -3 +3 @@
 /*:VRX */
 _RefreshTree: 
-    say "_RefreshTree() started"
+    say time()' _RefreshTree() started'
     FirstRun = 0
 
     ok = SysFileDelete(samba.!msg)
 
-    if UserCred = 'USERCRED' | UserCred = '' | UserCred = '--user=%' then do
-        UserCred = '-N'
-    end
-
+    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'
     if ShowHidden = 'SHOWHIDDEN' | ShowHidden = '' then ShowHidden = 0
 
-    say 'detach 'samba.!smbtreeexe' -S 'debuglevel' 'UserCred' >'samba.!msg
-    address cmd 'detach 'samba.!smbtreeexe' -S 'debuglevel' 'UserCred' >'samba.!msg
-
+    if BroadCast = 1 then BroadCast = '-b'; else BroadCast = ''
+
+    say '  detach 'samba.!smbtreeexe' 'BroadCast' -S 'debuglevel' 'UserCred' >'samba.!msg
+    address cmd 'detach 'samba.!smbtreeexe' 'BroadCast' -S 'debuglevel' 'UserCred' >'samba.!msg
+
+    if BroadCast = '-b' then BroadCast = 1; else BroadCast = 0
     if UserCred = '-N' then UserCred = ''
 
@@ -25 +25 @@
     ok = VRset("TM_RefreshTreeDisplay","Enabled",1)
 
-    say "_RefreshTree() done"
+    say time()' _RefreshTree() done'
 return
 
 /*:VRX */
-_RefreshTreeDisplay: 
+_RefreshTreeDisplay:
+    say time()' _RefreshTreeDisplay() started'
     stat = stream(samba.!msg,'c','open read')
     if stat <> "READY:" then return
@@ -84 +85 @@
                 comment = strip(comment)
                 if VRGet("CN_smbtree","View") = "IconTree" then parent = smbtree.!workgroup; else parent = ""
-                ok = VRSet( "CN_smbtree", "Painting", 1  )
                 smbtree.!machine = VRMethod( "CN_smbtree", "AddRecord",parent,, machine||'0D0A'x||comment)
                 /* We make any machine as sleeping initially */
@@ -90 +90 @@
                 ok = VRMethod( "CN_smbtree", "SetRecordAttr", smbtree.!machine, "ReadOnly", 1)
                 ok = VRMethod( "CN_smbtree", "SetFieldData",  smbtree.!machine, NBFH, machine, CommentFH, Comment, WorkGroupFH, CurWG)
+                ok = VRSet( "CN_smbtree", "Painting", 1  )
                 ok = VRSet( "CN_smbtree", "Painting", 0  )
                 if VRGet("CN_smbtree","View") = "Detail" then do
@@ -138 +139 @@
             when smbtreeline.sl = "" then nop
             otherwise do
-                say 'Workgroup: "'smbtreeline.sl'"'
+                say '  Workgroup: "'smbtreeline.sl'"'
                 if pos("RECEIVING",translate(smbtreeline.sl)) > 0 then do
                     Msg.Type = "W"
@@ -164 +165 @@
     ok = VRSet("TM_Throbber","Enabled", 0)
     ok = VRSet("Pict_Throbber","Visible", 0)
+    say time()' _RefreshTreeDisplay() done'
 return
 
-/*:VRX         _RefreshShares
-*/
+/*:VRX         _RefreshShares */
 _RefreshShares:
-    say "_RefreshShares() started"
+    say time()' _RefreshShares() started'
     RefreshID = RANDOM()
     smbmachine = TempDir||"smbmachine."||machine
 
-    say         'detach 'samba.!smbclientexe' -L "'strip(machine)'" 'UserCred' 'debuglevel' 1>'smbmachine' 2>NUL'
+    say       '  detach 'samba.!smbclientexe' -L "'strip(machine)'" 'UserCred' 'debuglevel' 1>'smbmachine' 2>NUL'
     address cmd 'detach 'samba.!smbclientexe' -L "'strip(machine)'" 'UserCred' 'debuglevel' 1>'smbmachine' 2>NUL'
 
@@ -180 +181 @@
     ok = VRSet("CN_smbtree","Enabled", 0)
     ok = VRset("TM_RefreshTreeDisplay","Enabled",1)
+    say time()' _RefreshShares() done'
 return
 
@@ -185 +187 @@
 */
 _AddSharesDisplay: /* New get shares code - uses smbclient output and is much faster */
-    say "_AddSharesDisplay() started"
+    say time()' _AddSharesDisplay() started'
 
     ok = SysFileTree(Tempdir||'smbmachine.*',smbmachine.,'FO')
-    say ' 'smbmachine.0' file(s) to process.'
+    say '  'smbmachine.0' file(s) to process.'
 
     if smbmachine.0 = 0 then do /* we are done, no more files around, cleanup, disable Timer and exit */
@@ -194 +196 @@
         ok = VRSet("CN_smbtree","Enabled", 1)
         ok = VRset("TM_RefreshTreeDisplay","Enabled",0)
-        say "_AddSharesDisplay() completed" 
+        ok = VRSet( "CN_smbtree", "Painting", 0  )
+        ok = VRSet( "CN_smbtree", "Painting", 1  )
+        say time()' _AddSharesDisplay() completed'
         return /* exit here */
     end
 
-    if UserCred = 'USERCRED' | UserCred = '' | UserCred = '--user=%' then do
-        UserCred = '-N'
-    end
-
+    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'
     if ShowHidden = 'SHOWHIDDEN' | ShowHidden = '' then ShowHidden = 0
 
@@ -215 +216 @@
 
             if smbtree.!machine = "" then do /* invalid (old) file */
-                say "_AddSharesDisplay() exit with Invalid file found (no corresponding machine)"
+                say time()' _AddSharesDisplay() exit with Invalid file found (no corresponding machine)'
                 ok = stream(smbmachine.I,'c','close')
                 ok = SysFileDelete(smbmachine.I)
@@ -225 +226 @@
 
             if pos("FAIL", translate(line)) > 0 then do /* we see an error message - the term "FAIL" seems to be common to all */
-                say '_AddSharesDisplay() exit with "'line'"'
+                say time()' _AddSharesDisplay() exit with "'line'"'
                 ok = stream(smbmachine.I,'c','close')
                 ok = SysFileDelete(smbmachine.I)
@@ -237 +238 @@
                 say '  Skip 'retries' "'line'"'
                 if retries >=10 then do /* No valid output - error */
-                    say "_AddSharesDisplay() exit with invalid output error"
+                    say time()' _AddSharesDisplay() exit with invalid output error'
                     ok = stream(smbmachine.I,'c','close')
                     ok = SysFileDelete(smbmachine.I)
@@ -297 +298 @@
             end
 
-            say "_AddSharesDisplay() success and cleanup"
+            say time()' _AddSharesDisplay() success and cleanup'
             ok = stream(smbmachine.I,'c','close')
             ok = SysFileDelete(smbmachine.I)
-            if ok <> 0 then say 'Failure 'ok' deleting "'smbmachine.I'"!'
+            if ok <> 0 then say '  Failure 'ok' deleting "'smbmachine.I'"!'
         end
         else say '  Got "'stat'" for "'smbmachine.I'"'
     end
-    say "_AddSharesDisplay() loop end"
+    say time()' _AddSharesDisplay() loop end'
 return