Changeset 345 for trunk/Include/Classes/System/IO/DirectoryInfo.ab

Timestamp:

Sep 29, 2007, 9:26:35 PM (17 years ago)

Author:

OverTaker

Message:

GetFileSystemInfos実装完了。他ちょっとした修整

File:

• trunk/Include/Classes/System/IO/DirectoryInfo.ab (modified) (2 diffs)

trunk/Include/Classes/System/IO/DirectoryInfo.ab

@@ -10 +10 @@
         OriginalPath = path
         FullPath = Path.GetFullPath(path)
-        Refresh()
     End Sub
 
@@ -160 +159 @@
         find = FindFirstFile(ToTCStr(Path.Combine(FullPath, searchPattern)), findData)
         If find = INVALID_HANDLE_VALUE Then
-            debug 'Exception
-            Return Nothing
+            Return New List<DirectoryInfo>
         End If
 
         Dim files As List<FileSystemInfo>
-        Dim i = 0 As Long
         Do
-            If i > 1 Then
-                Dim s = New String(findData.cFileName As PCTSTR)
-                If (findData.dwFileAttributes And FILE_ATTRIBUTE_DIRECTORY) = FILE_ATTRIBUTE_DIRECTORY Then
-                    files.Add(New DirectoryInfo(Path.Combine(FullPath, s)))
-                Else
-                    files.Add(New FileInfo(Path.Combine(FullPath, s)))
-                End If
+            Dim s = New String(findData.cFileName As PCTSTR)
+            If (findData.dwFileAttributes And FILE_ATTRIBUTE_DIRECTORY) = FILE_ATTRIBUTE_DIRECTORY Then
+                files.Add(New DirectoryInfo(Path.Combine(FullPath, s)))
+            Else
+                files.Add(New FileInfo(Path.Combine(FullPath, s)))
             End If
-            i++
         Loop While FindNextFile(find, findData)
         FindClose(find)
+
+        files.Remove(New DirectoryInfo(Path.Combine(FullPath, ".")))
+        files.Remove(New DirectoryInfo(Path.Combine(FullPath, "..")))
 
         If GetLastError() = ERROR_NO_MORE_FILES Then