// Created: 19.05.01
// RCS-ID: $Id$
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License: wxWindows licence
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
#endif //WX_PRECOMP
#include "wx/dir.h"
+#include "wx/filename.h"
// ============================================================================
// implementation
// dumb generic implementation
-bool wxDir::HasFiles(const wxString& spec)
+bool wxDir::HasFiles(const wxString& spec) const
{
wxString s;
return GetFirst(&s, spec, wxDIR_FILES | wxDIR_HIDDEN);
}
// we have a (much) faster version for Unix
-#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__EMX__) || defined(__WINE__)
+#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__EMX__) || defined(__WINE__)
-bool wxDir::HasSubDirs(const wxString& spec)
+bool wxDir::HasSubDirs(const wxString& spec) const
{
wxString s;
return GetFirst(&s, spec, wxDIR_DIRS | wxDIR_HIDDEN);
#endif // !Unix
+// ----------------------------------------------------------------------------
+// wxDir::GetNameWithSep()
+// ----------------------------------------------------------------------------
+
+wxString wxDir::GetNameWithSep() const
+{
+ // Note that for historical reasons (i.e. because GetName() was there
+ // first) we implement this one in terms of GetName() even though it might
+ // actually make more sense to reverse this logic.
+
+ wxString name = GetName();
+ if ( !name.empty() )
+ {
+ // Notice that even though GetName() isn't supposed to return the
+ // separator, it can still be present for the root directory name.
+ if ( name.Last() != wxFILE_SEP_PATH )
+ name += wxFILE_SEP_PATH;
+ }
+
+ return name;
+}
+
// ----------------------------------------------------------------------------
// wxDir::Traverse()
// ----------------------------------------------------------------------------
int flags) const
{
wxCHECK_MSG( IsOpened(), (size_t)-1,
- _T("dir must be opened before traversing it") );
+ wxT("dir must be opened before traversing it") );
// the total number of files found
size_t nFiles = 0;
// the name of this dir with path delimiter at the end
- wxString prefix = GetName();
- prefix += wxFILE_SEP_PATH;
+ const wxString prefix = GetNameWithSep();
// first, recurse into subdirs
if ( flags & wxDIR_DIRS )
{
wxString dirname;
- for ( bool cont = GetFirst(&dirname, wxEmptyString, wxDIR_DIRS | (flags & wxDIR_HIDDEN) );
+ for ( bool cont = GetFirst(&dirname, wxEmptyString,
+ (flags & ~(wxDIR_FILES | wxDIR_DOTDOT))
+ | wxDIR_DIRS);
cont;
cont = cont && GetNext(&dirname) )
{
switch ( sink.OnDir(fulldirname) )
{
default:
- wxFAIL_MSG(_T("unexpected OnDir() return value") );
+ wxFAIL_MSG(wxT("unexpected OnDir() return value") );
// fall through
case wxDIR_STOP:
switch ( sink.OnOpenError(fulldirname) )
{
default:
- wxFAIL_MSG(_T("unexpected OnOpenError() return value") );
+ wxFAIL_MSG(wxT("unexpected OnOpenError() return value") );
// fall through
case wxDIR_STOP:
break;
wxASSERT_MSG( res == wxDIR_CONTINUE,
- _T("unexpected OnFile() return value") );
+ wxT("unexpected OnFile() return value") );
nFiles++;
private:
wxArrayString& m_files;
- DECLARE_NO_COPY_CLASS(wxDirTraverserSimple)
+ wxDECLARE_NO_COPY_CLASS(wxDirTraverserSimple);
};
/* static */
const wxString& filespec,
int flags)
{
- wxCHECK_MSG( files, (size_t)-1, _T("NULL pointer in wxDir::GetAllFiles") );
+ wxCHECK_MSG( files, (size_t)-1, wxT("NULL pointer in wxDir::GetAllFiles") );
size_t nFiles = 0;
private:
wxString m_file;
- DECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst)
+ wxDECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst);
};
/* static */
return wxEmptyString;
}
+
+
+// ----------------------------------------------------------------------------
+// wxDir::GetTotalSize()
+// ----------------------------------------------------------------------------
+
+#if wxUSE_LONGLONG
+
+class wxDirTraverserSumSize : public wxDirTraverser
+{
+public:
+ wxDirTraverserSumSize() { }
+
+ virtual wxDirTraverseResult OnFile(const wxString& filename)
+ {
+ // wxFileName::GetSize won't use this class again as
+ // we're passing it a file and not a directory;
+ // thus we are sure to avoid an endless loop
+ wxULongLong sz = wxFileName::GetSize(filename);
+
+ if (sz == wxInvalidSize)
+ {
+ // if the GetSize() failed (this can happen because e.g. a
+ // file is locked by another process), we can proceed but
+ // we need to at least warn the user that the resulting
+ // final size could be not reliable (if e.g. the locked
+ // file is very big).
+ m_skippedFiles.Add(filename);
+ return wxDIR_CONTINUE;
+ }
+
+ m_sz += sz;
+ return wxDIR_CONTINUE;
+ }
+
+ virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname))
+ {
+ return wxDIR_CONTINUE;
+ }
+
+ wxULongLong GetTotalSize() const
+ { return m_sz; }
+ const wxArrayString& GetSkippedFiles() const
+ { return m_skippedFiles; }
+
+protected:
+ wxULongLong m_sz;
+ wxArrayString m_skippedFiles;
+};
+
+wxULongLong wxDir::GetTotalSize(const wxString &dirname, wxArrayString *filesSkipped)
+{
+ if (!wxDirExists(dirname))
+ return wxInvalidSize;
+
+ // to get the size of this directory and its contents we need
+ // to recursively walk it...
+ wxDir dir(dirname);
+ if ( !dir.IsOpened() )
+ return wxInvalidSize;
+
+ wxDirTraverserSumSize traverser;
+ if (dir.Traverse(traverser) == (size_t)-1 )
+ return wxInvalidSize;
+
+ if (filesSkipped)
+ *filesSkipped = traverser.GetSkippedFiles();
+
+ return traverser.GetTotalSize();
+}
+
+#endif // wxUSE_LONGLONG
+
+// ----------------------------------------------------------------------------
+// wxDir helpers
+// ----------------------------------------------------------------------------
+
+/* static */
+bool wxDir::Exists(const wxString& dir)
+{
+ return wxFileName::DirExists(dir);
+}
+
+/* static */
+bool wxDir::Make(const wxString &dir, int perm, int flags)
+{
+ return wxFileName::Mkdir(dir, perm, flags);
+}
+
+/* static */
+bool wxDir::Remove(const wxString &dir, int flags)
+{
+ return wxFileName::Rmdir(dir, flags);
+}
+
projects / wxWidgets.git / blobdiff