Changeset 345

Timestamp:

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

Author:

OverTaker

Message:

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

Location:

trunk/Include/Classes/System/IO

Files:

• DirectoryInfo.ab (modified) (2 diffs)
• FileInfo.ab (modified) (1 diff)
• FileSystemInfo.ab (modified) (7 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

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

@@ -9 +9 @@
         OriginalPath = path
         FullPath = Path.GetFullPath(path)
-        Refresh()
     End Sub
 

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

@@ -8 +8 @@
     m_LastWriteTime As FILETIME
     m_FileAttributes As DWord
+
+    m_IsFreshed As Boolean
 Protected
     FullPath As String
     OriginalPath As String
 Public
+    Sub FileSystemInfo()
+        m_IsFreshed = False
+    End Sub
+
+    Sub ~FileSystemInfo()
+    End Sub
 
     Override Function Equals( object As Object ) As Boolean
@@ -27 +35 @@
     'Public Properties
     Function Attributes() As DWord'FileAttributes
+        If Not m_IsFreshed Then Refresh()
         Return m_FileAttributes
     End Function
@@ -38 +47 @@
 
     Function CreationTime() As DateTime
+        If Not m_IsFreshed Then Refresh()
         Return DateTime.FromFileTime(m_CreationTime)
     End Function
@@ -55 +65 @@
 
     Function LastAccessTime() As DateTime
+        If Not m_IsFreshed Then Refresh()
         Return DateTime.FromFileTime(m_LastAccessTime)
     End Function
@@ -72 +83 @@
 
     Function LastWriteTime() As DateTime
+        If Not m_IsFreshed Then Refresh()
         Return DateTime.FromFileTime(m_LastWriteTime)
     End Function
@@ -89 +101 @@
 
     Function Exists() As Boolean
+        If Not m_IsFreshed Then Refresh()
         If m_FileAttributes = 0 Then
             Return False
@@ -128 +141 @@
 Private
     Sub setFileTime()
+        If Not m_IsFreshed Then Refresh()
         Dim hFile = CreateFile(ToTCStr(FullPath), GENERIC_WRITE, FILE_SHARE_READ Or FILE_SHARE_WRITE, ByVal 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0)
         If hFile = INVALID_HANDLE_VALUE Then