[freenet-cvs] r11304 - trunk/freenet/src/freenet/support/io

[t...@freenetproject.org]

Author: toad
Date: 2006-12-08 18:37:20 +0000 (Fri, 08 Dec 2006)
New Revision: 11304

Modified:
   trunk/freenet/src/freenet/support/io/FilenameGenerator.java
Log:
Better totals

Modified: trunk/freenet/src/freenet/support/io/FilenameGenerator.java
===================================================================
--- trunk/freenet/src/freenet/support/io/FilenameGenerator.java 2006-12-08 
18:10:15 UTC (rev 11303)
+++ trunk/freenet/src/freenet/support/io/FilenameGenerator.java 2006-12-08 
18:37:20 UTC (rev 11304)
@@ -36,6 +36,7 @@

                if(wipeFiles) {
                        long wipedFiles = 0;
+                       long wipeableFiles = 0;
                        long startWipe = System.currentTimeMillis();
                        File[] filenames = tmpDir.listFiles();
                        if(filenames != null) {
@@ -44,14 +45,16 @@
                                        String name = f.getName();
                                        if((((File.separatorChar == '\\') && 
name.toLowerCase().startsWith(prefix.toLowerCase())) ||
                                                        
name.startsWith(prefix))) {
-                                               wipedFiles++;
-                                               if(!f.delete() && f.exists())
+                                               wipeableFiles++;
+                                               if((!f.delete()) && f.exists())
                                                        
System.err.println("Unable to delete temporary file "+f+" - permissions 
problem?");
+                                               else
+                                                       wipedFiles++;
                                        }
                                }
                        }
                        long endWipe = System.currentTimeMillis();
-                       System.err.println("Deleted "+wipedFiles+" temporary 
files in "+TimeUtil.formatTime(endWipe-startWipe));
+                       System.err.println("Deleted "+wipedFiles+" of 
"+wipeableFiles+" temporary files ("+(filenames.length-wipeableFiles)+" 
non-temp files in temp directory) in "+TimeUtil.formatTime(endWipe-startWipe));
                }
        }