Changeset 2543

Timestamp:

09/03/07 01:12:01 (1 year ago)

Author:

kris

Message:

removed indirect mutating methods from PathView?, so that it is more compatible with VFS

Files:

• trunk/tango/io/FilePath.d (modified) (11 diffs)

trunk/tango/io/FilePath.d

@@ -94 +94 @@
-                        folder_,                // path before name
-                        suffix_;                // after rightmost '.'
+
+        /***********************************************************************
+
+                Filter used for screening paths via toList()
+
+        ***********************************************************************/
+
+        public alias bool delegate (FilePath, bool) Filter;
-
-
@@ -625 +633 @@
-        /***********************************************************************
-
-directory
+folder
-                filenames are null terminated, though the null itself
-                is hidden at the end of each name (not exposed by the
@@ -658 +666 @@
-        /***********************************************************************
-
-directory
+folder
-                the provided filter to control the list:
-                ---
@@ -1126 +1134 @@
-                /***************************************************************
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                {
-                        HANDLE                  h;
+                        uint                    count;
-                        char[]                  prefix;
-                        char[MAX_PATH+1]        tmp = void;
@@ -1186 +1196 @@
-                           // skip hidden/system files
-                           if ((fileinfo.dwFileAttributes & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN)) is 0)
-
+
+
+
+
-
-                           } while (next);
-
-this
+count
-                }
-        }
@@ -1410 +1423 @@
-                /***************************************************************
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                {
-                        DIR*            dir;
@@ -1426 +1440 @@
-                        char[]          prefix;
-                        char[]          sfnbuf;
+                        uint            count;
-
-                        dir = tango.stdc.posix.dirent.opendir (this.cString.ptr);
@@ -1457 +1472 @@
-                                                 : (sbuf.st_mode & S_IFDIR) != 0;
-                              dg (prefix, str, isDir);
+                              ++count;
-                              }
-
-this
+count
-                }
-        }
@@ -1472 +1488 @@
-interface PathView
-{
-        public  alias bool delegate (FilePath, bool) Filter;
-
-        /***********************************************************************
-
@@ -1630 +1644 @@
-        /***********************************************************************
-
-                Create an entire path consisting of this folder along with
-                all parent folders. The path must not contain '.' or '..'
-                segments. Related methods include PathUtil.normalize() and
-                FileSystem.absolutePath()
-
-                Returns: a chaining reference (this)
-
-                Throws: IOException upon systen errors
-
-                Throws: IllegalArgumentException if the path contains invalid
-                        path segment names (such as '.' or '..') or a segment
-                        exists but as a file instead of a folder
-
-        ***********************************************************************/
-
-        abstract FilePath create ();
-
-        /***********************************************************************
-
-                Create a new file
-
-        ***********************************************************************/
-
-        abstract FilePath createFile ();
-
-        /***********************************************************************
-
-                Create a new directory
-
-        ***********************************************************************/
-
-        abstract FilePath createFolder ();
-
-        /***********************************************************************
-
-                Return the file length (in bytes)
-
@@ -1694 +1673 @@
-
-        abstract Stamps timeStamps ();
-
-        /***********************************************************************
-
-                List the set of filenames within this directory, using
-                the provided filter to control the list:
-                ---
-                bool delegate (FilePath path, bool isFolder) Filter
-                ---
-
-                Returning true from the filter includes the given path, 
-                whilst returning false excludes it. Parameter 'isFolder'
-                indicates whether the path is a file or folder
-
-                Note that paths composed of '.' characters are ignored.
-
-        ***********************************************************************/
-
-        abstract FilePath[] toList (Filter filter = null);
-
-        /***********************************************************************
-
-                List the set of filenames within this directory.
-
-                All filenames are null terminated and are passed
-                to the provided delegate as such, along with the
-                path prefix and whether the entry is a directory
-                or not.
-
-        ***********************************************************************/
-        
-        abstract FilePath toList (void delegate (char[], char[], bool) dg);
-}
-