Changeset 327

Timestamp:

Sep 8, 2007, 10:59:51 AM (17 years ago)

Author:

OverTaker

Message:

Directoryクラス新規作成。DirectoryInfo.FilesのAllDirectories実装。(変なところでエラーになって動かない)

Location:

trunk/Include/Classes/System/IO

Files:

• Directory.ab (added)
• DirectoryInfo.ab (modified) (5 diffs)

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

@@ -93 +93 @@
 
     Function GetDirectories(searchPattern As String, searchOption As SearchOption) As List<DirectoryInfo>
-        If searchOption = SearchOption.TopDirectoryOnly Then
-            Return GetDirectories(searchPattern)
-        ElseIf searchOption = SearchOption.AllDirectories Then
-            Dim dirs As List<DirectoryInfo>
-            dirs = GetDirectories(searchPattern)
-
-            Dim subdirs As List<DirectoryInfo>
-            Dim i As Long, j As Long
-            For i = 0 To ELM(dirs.Count)
-                subdirs = dirs[i].GetDirectories(searchPattern)
-                For j = 0 To ELM(subdirs.Count)
-                    dirs.Add(subdirs[i])
+        Select Case searchOption
+            Case SearchOption.TopDirectoryOnly
+                Return GetDirectories(searchPattern)
+            Case SearchOption.AllDirectories
+                Dim dirs As List<DirectoryInfo>
+                dirs = GetDirectories(searchPattern)
+
+                Dim subdirs As List<DirectoryInfo>
+                Dim i As Long, j As Long
+                For i = 0 To ELM(dirs.Count)
+                    subdirs = dirs[i].GetDirectories(searchPattern)
+                    For j = 0 To ELM(subdirs.Count)
+                        dirs.Add(subdirs[i])
+                    Next
                 Next
-            Next
-            Return dirs
-        End If
+                Return dirs
+        End Select
     End Function
 
@@ -129 +130 @@
     End Function
 
-/*  Function GetFiles(searchPattern As String, searchOption As SearchOption) As List<FileInfo>
-    End Function*/
+    Function GetFiles(searchPattern As String, searchOption As SearchOption) As List<FileInfo>
+        Select Case searchOption
+            Case SearchOption.TopDirectoryOnly
+                Return GetFiles(searchPattern)
+            Case SearchOption.AllDirectories
+                Dim dirs As List<DirectoryInfo>
+                dirs = GetDirectories(searchPattern, SearchOption.AllDirectories)
+
+                Dim files As List<FileInfo>
+                Dim subfiles As List<FileInfo>
+                Dim i As Long, j As Long
+                For i = 0 To ELM(dirs.Count)
+                    subfiles = dirs[i].GetFiles(searchPattern)
+                    For j = 0 To ELM(subfiles.Count)
+                        files.Add(subfiles[j])
+                    Next
+                Next
+                Return files
+        End Select
+    End Function
 
     Function GetFileSystemInfos() As List<FileSystemInfo>
@@ -139 +158 @@
         Dim find As HANDLE
         Dim findData As WIN32_FIND_DATA
-        find = FindFirstFile(Path.Combine(FullPath, searchPattern), findData)
+        find = FindFirstFile(ToTCStr(Path.Combine(FullPath, searchPattern)), findData)
         If find = INVALID_HANDLE_VALUE Then
             debug 'Exception
@@ -146 +165 @@
 
         Dim files As List<FileSystemInfo>
-        Dim lastError As DWord
         Dim i As Long
-        While lastError <> ERROR_NO_MORE_FILES
+        Do
             If i > 1 Then
                 Dim s = New String(findData.cFileName As PCTSTR)
@@ -157 +175 @@
                 End If
             End If
-
-            If FindNextFile(find, findData) = False Then
-                lastError = GetLastError()
-                If lastError <> ERROR_NO_MORE_FILES Then
-                    FindClose(find)
-                    debug 'Exception
-                    Return Nothing
-                End If
-            End If
             i++
-        Wend
+        Loop While FindNextFile(find, findData)
         FindClose(find)
-        Return files
+
+        If GetLastError() = ERROR_NO_MORE_FILES Then
+            Return files
+        Else
+            debug 'Exception
+            Return Nothing
+        End If
     End Function