// Created: 08.12.99
// RCS-ID: $Id$
// Copyright: (c) 1999 Stefan Csomor <csomor@advanced.ch>
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dir.h"
#endif
#include <windows.h>
#endif
+#include "wx/filename.h"
#include "wx/mac/private.h"
-#ifdef __DARWIN__
-# include "MoreFilesX.h"
-#else
-# include "MoreFiles.h"
-# include "MoreFilesExtras.h"
-#endif
+#include "MoreFilesX.h"
// ----------------------------------------------------------------------------
// constants
public:
wxDirData(const wxString& dirname);
~wxDirData();
-
+
+ void Close() ;
void SetFileSpec(const wxString& filespec) { m_filespec = filespec; }
void SetFlags(int flags) { m_flags = flags; }
const wxString& GetName() const { return m_dirname; }
private:
- CInfoPBRec m_CPB ;
- wxInt16 m_index ;
- long m_dirId ;
- Str255 m_name ;
- Boolean m_isDir ;
+ FSIterator m_iterator ;
wxString m_dirname;
wxString m_filespec;
wxDirData::wxDirData(const wxString& dirname)
: m_dirname(dirname)
{
- OSErr err;
-
// throw away the trailing slashes
size_t n = m_dirname.length();
wxCHECK_RET( n, _T("empty dir name in wxDir") );
;
m_dirname.Truncate(n + 1);
-
-#ifdef __DARWIN__
- FSRef theRef;
-
- // get the FSRef associated with the POSIX path
- err = FSPathMakeRef((const UInt8 *) m_dirname.c_str(), &theRef, NULL);
- FSGetVRefNum(&theRef, &(m_CPB.hFileInfo.ioVRefNum));
-
- err = FSGetNodeID( &theRef , &m_dirId , &m_isDir ) ;
-#else
- FSSpec fsspec ;
-
- wxMacFilename2FSSpec( m_dirname , &fsspec ) ;
- m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
-
- err = FSpGetDirectoryID( &fsspec , &m_dirId , &m_isDir ) ;
-#endif
- wxASSERT_MSG( (err == noErr) || (err == nsvErr) , "Error accessing directory " + m_dirname) ;
-
- m_CPB.hFileInfo.ioNamePtr = m_name ;
- m_index = 0 ;
+ m_iterator = NULL ;
}
wxDirData::~wxDirData()
{
+ Close() ;
+}
+
+void wxDirData::Close()
+{
+ if ( m_iterator )
+ {
+ FSCloseIterator( m_iterator ) ;
+ m_iterator = NULL ;
+ }
}
void wxDirData::Rewind()
{
- m_index = 0 ;
+ Close() ;
}
bool wxDirData::Read(wxString *filename)
-{
- if ( !m_isDir )
- return FALSE ;
-
-#if TARGET_CARBON
- char c_name[256] ;
-#endif
+{
wxString result;
-
- short err = noErr ;
+ OSStatus err = noErr ;
+ if ( NULL == m_iterator )
+ {
+ FSRef dirRef;
+ err = wxMacPathToFSRef( m_dirname , &dirRef ) ;
+ if ( err == noErr )
+ {
+ err = FSOpenIterator(&dirRef, kFSIterateFlat, &m_iterator);
+ }
+ if ( err )
+ {
+ Close() ;
+ return FALSE ;
+ }
+ }
- while ( err == noErr )
+ wxString name ;
+
+ while( noErr == err )
{
- m_index++ ;
- m_CPB.dirInfo.ioFDirIndex = m_index;
- m_CPB.dirInfo.ioDrDirID = m_dirId; /* we need to do this every time */
- err = PBGetCatInfoSync((CInfoPBPtr)&m_CPB);
- if ( err != noErr )
- break ;
+ HFSUniStr255 uniname ;
+ FSRef fileRef;
+ FSCatalogInfo catalogInfo;
+ UInt32 fetched = 0;
+
+ err = FSGetCatalogInfoBulk( m_iterator, 1, &fetched, NULL, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo , &catalogInfo , &fileRef, NULL, &uniname );
+ if ( errFSNoMoreItems == err )
+ return false ;
+
+ wxASSERT( noErr == err ) ;
-#if TARGET_CARBON
- p2cstrcpy( c_name, m_name ) ;
- strcpy( (char *)m_name, c_name);
-#else
- p2cstr( m_name ) ;
-#endif
- // its hidden but we don't want it
- if ( ( m_CPB.hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible ) && !(m_flags & wxDIR_HIDDEN) )
- continue ;
-#ifdef __DARWIN__
- // under X, names that start with '.' are hidden
- if ( ( m_name[0] == '.' ) && !(m_flags & wxDIR_HIDDEN) )
- continue;
-#endif
-#if TARGET_CARBON
- // under X thats the way the mounting points look like
- if ( ( m_CPB.dirInfo.ioDrDirID == 0 ) && ( m_flags & wxDIR_DIRS) )
- break ;
-#endif
- // we have a directory
- if ( ( m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (m_flags & wxDIR_DIRS) )
+ if ( noErr != err )
break ;
+
+ name = wxMacHFSUniStrToString( &uniname ) ;
+
+ if ( ( name == wxT(".") || name == wxT("..") ) && !(m_flags & wxDIR_DOTDOT) )
+ continue;
+
+ if ( ( name[0U] == '.' ) && !(m_flags & wxDIR_HIDDEN ) )
+ continue ;
+
+ if ( (((FileInfo*)&catalogInfo.finderInfo)->finderFlags & kIsInvisible ) && !(m_flags & wxDIR_HIDDEN ) )
+ continue ;
+ // its a dir and we don't want it
+ if ( (catalogInfo.nodeFlags & kFSNodeIsDirectoryMask) && !(m_flags & wxDIR_DIRS) )
+ continue ;
+
// its a file but we don't want it
- if ( ( m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(m_flags & wxDIR_FILES ) )
+ if ( (catalogInfo.nodeFlags & kFSNodeIsDirectoryMask) == 0 && !(m_flags & wxDIR_FILES ) )
continue ;
-
- wxString file( m_name ) ;
- if ( m_filespec.IsEmpty() || m_filespec == "*.*" || m_filespec == "*" )
+
+ if ( m_filespec.IsEmpty() || m_filespec == wxT("*.*") || m_filespec == wxT("*") )
{
}
- else if ( m_filespec.Length() > 1 && m_filespec.Left(1) =="*" )
- {
- if ( file.Right( m_filespec.Length() - 1 ).Upper() != m_filespec.Mid(1).Upper() )
- {
- continue ;
- }
- }
- else if ( m_filespec.Length() > 1 && m_filespec.Right(1) == "*" )
- {
- if ( file.Left( m_filespec.Length() - 1 ).Upper() != m_filespec.Left( m_filespec.Length() - 1 ).Upper() )
- {
- continue ;
- }
- }
- else if ( file.Upper() != m_filespec.Upper() )
+ else if ( !wxMatchWild(m_filespec, name , FALSE) )
{
continue ;
}
return FALSE ;
}
- *filename = (char*) m_name ;
-
+ *filename = name ;
return TRUE;
}
projects / wxWidgets.git / blobdiff