Ticket #1970: _FTP_Listtoarray Fix.au3

File _FTP_Listtoarray Fix.au3, 7.4 KB (added by Beege, on Jul 10, 2011 at 10:20:34 AM)
Line 
1#include <FTPEx.au3>
2#include <array.au3>
3;new
4$Open = _FTP_Open('MyFTP Control')
5$Connect = _FTP_Connect($Open, 'ftp.mozilla.org', '', '')
6If Not @error Then ConsoleWrite('Connection Successful.' & @CRLF)
7
8_FTP_DirSetCurrent($Connect, '/pub')
9If Not @error Then ConsoleWrite('Current Directory = ' & _FTP_DirGetCurrent($Connect) & @CRLF)
10
11$Filelist = _FTP_ListToArrayEx2($Connect, 0);dirs and files
12_ArrayDisplay($Filelist, 'Dirs and Files')
13$Filelist = _FTP_ListToArrayEx2($Connect, 1);dirs
14_ArrayDisplay($Filelist, 'Dirs Only')
15$Filelist = _FTP_ListToArrayEx2($Connect, 2);files
16_ArrayDisplay($Filelist, 'Files Only')
17
18_FTP_Close($Connect)
19
20;old
21$Open = _FTP_Open('MyFTP Control')
22$Connect = _FTP_Connect($Open, 'ftp.mozilla.org', '', '')
23If Not @error Then ConsoleWrite('Connection Successful.' & @CRLF)
24
25_FTP_DirSetCurrent($Connect, '/pub')
26If Not @error Then ConsoleWrite('Current Directory = ' & _FTP_DirGetCurrent($Connect) & @CRLF)
27
28$Filelist = _FTP_ListToArrayEx($Connect, 0);dirs and files
29_ArrayDisplay($Filelist, 'Dirs and Files')
30$Filelist = _FTP_ListToArrayEx($Connect, 1);dirs
31_ArrayDisplay($Filelist, 'Dirs Only - Fail')
32$Filelist = _FTP_ListToArrayEx($Connect, 2);files
33_ArrayDisplay($Filelist, 'Files Only - Fail')
34
35_FTP_Close($Connect)
36
37
38Func _FTP_ListToArrayEx2($l_FTPSession, $Return_Type = 0, $l_Flags = 0, $b_Fmt = 1, $l_Context = 0)
39 If $__ghWinInet_FTP = -1 Then Return SetError(-2, 0, 0)
40 Return __FTP_ListToArray2($l_FTPSession, $Return_Type, $l_Flags, $b_Fmt, 6, $l_Context)
41EndFunc ;==>_FTP_ListToArrayEx
42
43Func __FTP_ListToArray2($l_FTPSession, $Return_Type = 0, $l_Flags = 0, $bFmt = 1, $ArrayCount = 6, $l_Context = 0)
44 Local $tWIN32_FIND_DATA, $tFileTime, $IsDir, $callFindNext
45 Local $DirectoryIndex = 0, $FileIndex = 0
46
47 If $ArrayCount = 1 Then
48 Local $FileArray[1], $DirectoryArray[1]
49 Else
50 Local $FileArray[1][$ArrayCount], $DirectoryArray[1][$ArrayCount]
51 EndIf
52
53 If $Return_Type < 0 Or $Return_Type > 2 Then Return SetError(1, 0, $FileArray)
54
55;~ Global Const $tagWIN32_FIND_DATA = "DWORD dwFileAttributes; dword ftCreationTime[2]; dword ftLastAccessTime[2]; dword ftLastWriteTime[2]; DWORD nFileSizeHigh; DWORD nFileSizeLow; dword dwReserved0; dword dwReserved1; WCHAR cFileName[260]; WCHAR cAlternateFileName[14];"
56 $tWIN32_FIND_DATA = DllStructCreate($tagWIN32_FIND_DATA)
57 Local $callFindFirst = DllCall($__ghWinInet_FTP, 'handle', 'FtpFindFirstFileW', 'handle', $l_FTPSession, 'wstr', "", 'ptr', DllStructGetPtr($tWIN32_FIND_DATA), 'dword', $l_Flags, 'dword_ptr', $l_Context)
58 If @error Or Not $callFindFirst[0] Then Return SetError(1, _WinAPI_GetLastError(), 0)
59
60 Do
61 $IsDir = BitAND(DllStructGetData($tWIN32_FIND_DATA, "dwFileAttributes"), $FILE_ATTRIBUTE_DIRECTORY) = $FILE_ATTRIBUTE_DIRECTORY
62 If $IsDir And ($Return_Type <> 2) Then
63 $DirectoryIndex += 1
64 If $ArrayCount = 1 Then
65 If UBound($DirectoryArray) < $DirectoryIndex+1 Then ReDim $DirectoryArray[$DirectoryIndex*2]
66 $DirectoryArray[$DirectoryIndex] = DllStructGetData($tWIN32_FIND_DATA, "cFileName")
67 Else
68 If UBound($DirectoryArray) < $DirectoryIndex+1 Then ReDim $DirectoryArray[$DirectoryIndex*2][$ArrayCount]
69 $DirectoryArray[$DirectoryIndex][0] = DllStructGetData($tWIN32_FIND_DATA, "cFileName")
70
71 $DirectoryArray[$DirectoryIndex][1] = _WinAPI_MakeQWord(DllStructGetData($tWIN32_FIND_DATA, "nFileSizeLow"), DllStructGetData($tWIN32_FIND_DATA, "nFileSizeHigh"))
72 If $ArrayCount = 6 Then
73 $DirectoryArray[$DirectoryIndex][2] = DllStructGetData($tWIN32_FIND_DATA, "dwFileAttributes")
74
75 $tFileTime = DllStructCreate($tagFILETIME, DllStructGetPtr($tWIN32_FIND_DATA, "ftLastWriteTime"))
76 $DirectoryArray[$DirectoryIndex][3] = _Date_Time_FileTimeToStr( $tFileTime ,$bFmt)
77 $tFileTime = DllStructCreate($tagFILETIME, DllStructGetPtr($tWIN32_FIND_DATA, "ftCreationTime"))
78 $DirectoryArray[$DirectoryIndex][4] = _Date_Time_FileTimeToStr( $tFileTime ,$bFmt)
79 $tFileTime = DllStructCreate($tagFILETIME, DllStructGetPtr($tWIN32_FIND_DATA, "ftLastAccessTime"))
80 $DirectoryArray[$DirectoryIndex][5] = _Date_Time_FileTimeToStr( $tFileTime ,$bFmt)
81 EndIf
82 EndIf
83 ElseIf Not $IsDir And $Return_Type <> 1 Then
84 $FileIndex += 1
85 If $ArrayCount = 1 Then
86 If UBound($FileArray) < $FileIndex+1 Then ReDim $FileArray[$FileIndex*2]
87 $FileArray[$FileIndex] = DllStructGetData($tWIN32_FIND_DATA, "cFileName")
88 Else
89 If UBound($FileArray) < $FileIndex+1 Then ReDim $FileArray[$FileIndex*2][$ArrayCount]
90 $FileArray[$FileIndex][0] = DllStructGetData($tWIN32_FIND_DATA, "cFileName")
91
92 $FileArray[$FileIndex][1] = _WinAPI_MakeQWord(DllStructGetData($tWIN32_FIND_DATA, "nFileSizeLow"), DllStructGetData($tWIN32_FIND_DATA, "nFileSizeHigh"))
93 If $ArrayCount = 6 Then
94 $FileArray[$FileIndex][2] = DllStructGetData($tWIN32_FIND_DATA, "dwFileAttributes")
95
96 $tFileTime = DllStructCreate($tagFILETIME, DllStructGetPtr($tWIN32_FIND_DATA, "ftLastWriteTime"))
97 $FileArray[$FileIndex][3] = _Date_Time_FileTimeToStr( $tFileTime ,$bFmt)
98 $tFileTime = DllStructCreate($tagFILETIME, DllStructGetPtr($tWIN32_FIND_DATA, "ftCreationTime"))
99 $FileArray[$FileIndex][4] = _Date_Time_FileTimeToStr( $tFileTime ,$bFmt)
100 $tFileTime = DllStructCreate($tagFILETIME, DllStructGetPtr($tWIN32_FIND_DATA, "ftLastAccessTime"))
101 $FileArray[$FileIndex][5] = _Date_Time_FileTimeToStr( $tFileTime ,$bFmt)
102 EndIf
103 EndIf
104 EndIf
105
106 $callFindNext = DllCall($__ghWinInet_FTP, 'bool', 'InternetFindNextFileW', 'handle', $callFindFirst[0], 'ptr', DllStructGetPtr($tWIN32_FIND_DATA))
107 If @error Then Return SetError(2, _WinAPI_GetLastError(), 0)
108 Until Not $callFindNext[0]
109
110 DllCall($__ghWinInet_FTP, 'bool', 'InternetCloseHandle', 'handle', $callFindFirst[0])
111 ; No need to test @error.
112
113 If $ArrayCount = 1 Then
114 $DirectoryArray[0] = $DirectoryIndex
115 $FileArray[0] = $FileIndex
116 Else
117 $DirectoryArray[0][0] = $DirectoryIndex
118 $FileArray[0][0] = $FileIndex
119 EndIf
120
121 Switch $Return_Type
122 Case 0
123 If $ArrayCount = 1 Then
124 ReDim $DirectoryArray[$DirectoryArray[0] + $FileArray[0] + 1]
125 For $i = 1 To $FileIndex
126 $DirectoryArray[$DirectoryArray[0] + $i] = $FileArray[$i]
127 Next
128 $DirectoryArray[0] += $FileArray[0]
129 Else
130 ReDim $DirectoryArray[$DirectoryArray[0][0] + $FileArray[0][0] + 1][$ArrayCount]
131 For $i = 1 To $FileIndex
132 For $j = 0 To $ArrayCount-1
133 $DirectoryArray[$DirectoryArray[0][0] + $i][$j] = $FileArray[$i][$j]
134 Next
135 Next
136 $DirectoryArray[0][0] += $FileArray[0][0]
137 EndIf
138 Return $DirectoryArray
139 Case 1
140 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
141 ;ReDim $DirectoryArray[$DirectoryIndex+1]
142 If $ArrayCount = 1 Then
143 ReDim $DirectoryArray[$DirectoryIndex+1]
144 Else
145 ReDim $DirectoryArray[$DirectoryIndex+1][$ArrayCount]
146 EndIf
147 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
148 Return $DirectoryArray
149 Case 2
150 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
151 ;ReDim $FileArray[$FileIndex +1]
152 If $ArrayCount = 1 Then
153 ReDim $FileArray[$FileIndex +1]
154 Else
155 ReDim $FileArray[$FileIndex +1][$ArrayCount]
156 EndIf
157 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
158 Return $FileArray
159 EndSwitch
160EndFunc ;==>__FTP_ListToArray
161