// Created: 08.12.99
// RCS-ID: $Id$
// Copyright: (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "dir.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#endif // PCH
#include "wx/dir.h"
-#include "wx/filefn.h" // for wxPathExists()
+#include "wx/filefn.h" // for wxDirExists()
+
+#ifdef __WINDOWS__
+ #include "wx/msw/private.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// define the types and functions used for file searching
+// ----------------------------------------------------------------------------
+
+typedef WIN32_FIND_DATA FIND_STRUCT;
+typedef HANDLE FIND_DATA;
+typedef DWORD FIND_ATTR;
+
+static inline FIND_DATA InitFindData() { return INVALID_HANDLE_VALUE; }
+
+static inline bool IsFindDataOk(FIND_DATA fd)
+{
+ return fd != INVALID_HANDLE_VALUE;
+}
+
+static inline void FreeFindData(FIND_DATA fd)
+{
+ if ( !::FindClose(fd) )
+ {
+ wxLogLastError(_T("FindClose"));
+ }
+}
-#include <windows.h>
+static inline FIND_DATA FindFirst(const wxString& spec,
+ FIND_STRUCT *finddata)
+{
+ return ::FindFirstFile(spec, finddata);
+}
+
+static inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)
+{
+ return ::FindNextFile(fd, finddata) != 0;
+}
+
+static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
+{
+ return finddata->cFileName;
+}
+
+static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
+{
+ return finddata->dwFileAttributes;
+}
+
+static inline bool IsDir(FIND_ATTR attr)
+{
+ return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0;
+}
+
+static inline bool IsHidden(FIND_ATTR attr)
+{
+ return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0;
+}
// ----------------------------------------------------------------------------
// constants
void Rewind();
bool Read(wxString *filename);
+ const wxString& GetName() const { return m_dirname; }
+
private:
- HANDLE m_handle;
+ FIND_DATA m_finddata;
wxString m_dirname;
wxString m_filespec;
int m_flags;
+
+ DECLARE_NO_COPY_CLASS(wxDirData)
};
// ============================================================================
wxDirData::wxDirData(const wxString& dirname)
: m_dirname(dirname)
{
- m_handle = INVALID_HANDLE_VALUE;
+ m_finddata = InitFindData();
}
wxDirData::~wxDirData()
void wxDirData::Close()
{
- if ( m_handle != INVALID_HANDLE_VALUE )
+ if ( IsFindDataOk(m_finddata) )
{
- if ( !::FindClose(m_handle) )
- {
- wxLogLastError(_T("FindClose"));
- }
+ FreeFindData(m_finddata);
- m_handle = INVALID_HANDLE_VALUE;
+ m_finddata = InitFindData();
}
}
bool wxDirData::Read(wxString *filename)
{
- bool first = FALSE;
+ bool first = false;
WIN32_FIND_DATA finddata;
- if ( m_handle == INVALID_HANDLE_VALUE )
+ #define PTR_TO_FINDDATA (&finddata)
+
+ if ( !IsFindDataOk(m_finddata) )
{
// open first
- wxString filespec;
- filespec << m_dirname << _T('\\')
- << (!m_filespec ? _T("*.*") : m_filespec.c_str());
+ wxString filespec = m_dirname;
+ if ( !wxEndsWithPathSeparator(filespec) )
+ {
+ filespec += _T('\\');
+ }
+ filespec += (!m_filespec ? _T("*.*") : m_filespec.c_str());
- m_handle = ::FindFirstFile(filespec, &finddata);
+ m_finddata = FindFirst(filespec, PTR_TO_FINDDATA);
- first = TRUE;
+ first = true;
}
- if ( m_handle == INVALID_HANDLE_VALUE )
+ if ( !IsFindDataOk(m_finddata) )
{
+#ifdef __WIN32__
DWORD err = ::GetLastError();
- if ( err != ERROR_FILE_NOT_FOUND )
+ if ( err != ERROR_FILE_NOT_FOUND && err != ERROR_NO_MORE_FILES )
{
wxLogSysError(err, _("Can not enumerate files in directory '%s'"),
m_dirname.c_str());
}
+#endif // __WIN32__
//else: not an error, just no (such) files
- return FALSE;
+ return false;
}
const wxChar *name;
- DWORD attr;
+ FIND_ATTR attr;
for ( ;; )
{
if ( first )
{
- first = FALSE;
+ first = false;
}
else
{
- if ( !::FindNextFile(m_handle, &finddata) )
+ if ( !FindNext(m_finddata, PTR_TO_FINDDATA) )
{
+#ifdef __WIN32__
DWORD err = ::GetLastError();
if ( err != ERROR_NO_MORE_FILES )
{
wxLogLastError(_T("FindNext"));
}
+#endif // __WIN32__
//else: not an error, just no more (such) files
- return FALSE;
+ return false;
}
}
- name = finddata.cFileName;
- attr = finddata.dwFileAttributes;
+ name = GetNameFromFindData(PTR_TO_FINDDATA);
+ attr = GetAttrFromFindData(PTR_TO_FINDDATA);
// don't return "." and ".." unless asked for
if ( name[0] == _T('.') &&
}
// check the type now
- if ( !(m_flags & wxDIR_FILES) && !(attr & FILE_ATTRIBUTE_DIRECTORY) )
+ if ( !(m_flags & wxDIR_FILES) && !IsDir(attr) )
{
// it's a file, but we don't want them
continue;
}
- else if ( !(m_flags & wxDIR_DIRS) && (attr & FILE_ATTRIBUTE_DIRECTORY) )
+ else if ( !(m_flags & wxDIR_DIRS) && IsDir(attr) )
{
// it's a dir, and we don't want it
continue;
// finally, check whether it's a hidden file
if ( !(m_flags & wxDIR_HIDDEN) )
{
- if ( attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM) )
+ if ( IsHidden(attr) )
{
// it's a hidden file, skip it
continue;
break;
}
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
/* static */
bool wxDir::Exists(const wxString& dir)
{
- return wxPathExists(dir);
+ return wxDirExists(dir);
}
// ----------------------------------------------------------------------------
delete M_DIR;
m_data = new wxDirData(dirname);
- return TRUE;
+ return true;
}
bool wxDir::IsOpened() const
return m_data != NULL;
}
+wxString wxDir::GetName() const
+{
+ wxString name;
+ if ( m_data )
+ {
+ name = M_DIR->GetName();
+ if ( !name.empty() )
+ {
+ // bring to canonical Windows form
+ name.Replace(_T("/"), _T("\\"));
+
+ if ( name.Last() == _T('\\') )
+ {
+ // chop off the last (back)slash
+ name.Truncate(name.length() - 1);
+ }
+ }
+ }
+
+ return name;
+}
+
wxDir::~wxDir()
{
delete M_DIR;
const wxString& filespec,
int flags) const
{
- wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
+ wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
M_DIR->Rewind();
bool wxDir::GetNext(wxString *filename) const
{
- wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
+ wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
- wxCHECK_MSG( filename, FALSE, _T("bad pointer in wxDir::GetNext()") );
+ wxCHECK_MSG( filename, false, _T("bad pointer in wxDir::GetNext()") );
return M_DIR->Read(filename);
}
+
+// ----------------------------------------------------------------------------
+// wxGetDirectoryTimes: used by wxFileName::GetTimes()
+// ----------------------------------------------------------------------------
+
+#ifdef __WIN32__
+
+extern bool
+wxGetDirectoryTimes(const wxString& dirname,
+ FILETIME *ftAccess, FILETIME *ftCreate, FILETIME *ftMod)
+{
+ // FindFirst() is going to fail
+ wxASSERT_MSG( !dirname.empty() && dirname.Last() != _T('\\'),
+ _T("incorrect directory name format in wxGetDirectoryTimes") );
+
+ FIND_STRUCT fs;
+ FIND_DATA fd = FindFirst(dirname, &fs);
+ if ( !IsFindDataOk(fd) )
+ {
+ return false;
+ }
+
+ *ftAccess = fs.ftLastAccessTime;
+ *ftCreate = fs.ftCreationTime;
+ *ftMod = fs.ftLastWriteTime;
+
+ FindClose(fd);
+
+ return true;
+}
+
+#endif // __WIN32__
+
projects / wxWidgets.git / blobdiff