generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 11:31:53 +01:00
Code Issues Projects Releases Wiki Activity

SF Feature requests #168 and #163 - part 3

Browse Source
This commit is contained in:
Marian Krivos
2013-02-20 09:44:25 +01:00
parent ef1c594fb1
commit 8ddba0bcd1
10 changed files with 304 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
Foundation/src/SortedDirectoryIterator.cpp
View File

@@ -33,49 +33,48 @@
// DEALINGS IN THE SOFTWARE.
//
#include "Poco/SortedDirectoryIterator.h"
#include <algorithm>
namespace Poco {
namespace Poco
{
SortedDirectoryIterator::SortedDirectoryIterator()
: DirectoryIterator(), _is_finished(true)
: DirectoryIterator(), _is_finished(true)
{
}
SortedDirectoryIterator::SortedDirectoryIterator(const std::string& path)
: DirectoryIterator(path), _is_finished(false)
: DirectoryIterator(path), _is_finished(false)
{
scan();
next();
scan();
next();
}
SortedDirectoryIterator::SortedDirectoryIterator(const DirectoryIterator& iterator)
: DirectoryIterator(iterator), _is_finished(false)
: DirectoryIterator(iterator), _is_finished(false)
{
scan();
next();
scan();
next();
}
SortedDirectoryIterator::SortedDirectoryIterator(const File& file)
: DirectoryIterator(file), _is_finished(false)
: DirectoryIterator(file), _is_finished(false)
{
scan();
next();
scan();
next();
}
SortedDirectoryIterator::SortedDirectoryIterator(const Path& path)
: DirectoryIterator(path), _is_finished(false)
: DirectoryIterator(path), _is_finished(false)
{
scan();
next();
scan();
next();
}
@@ -83,56 +82,56 @@ SortedDirectoryIterator::~SortedDirectoryIterator()
{
}
SortedDirectoryIterator& SortedDirectoryIterator::operator ++ ()
SortedDirectoryIterator& SortedDirectoryIterator::operator ++()
{
if (!_is_finished)
{
next();
}
return *this;
if (!_is_finished)
{
next();
}
return *this;
}
void SortedDirectoryIterator::scan()
{
DirectoryIterator end_it;
while (*this != end_it)
{
if ((*this)->isDirectory())
_directories.push_back(_path.toString());
else
_files.push_back(_path.toString());
DirectoryIterator end_it;
while (*this != end_it)
{
if ((*this)->isDirectory())
_directories.push_back(_path.toString());
else
_files.push_back(_path.toString());
DirectoryIterator::operator++();
}
DirectoryIterator::operator++();
}
std::sort(_directories.begin(), _directories.end());
std::sort(_files.begin(), _files.end());
std::sort(_directories.begin(), _directories.end());
std::sort(_files.begin(), _files.end());
}
void SortedDirectoryIterator::next()
{
DirectoryIterator end_it;
if (!_directories.empty())
{
_path.assign(_directories.front());
_directories.pop_front();
_file = _path;
}
else if (!_files.empty())
{
_path.assign(_files.front());
_files.pop_front();
_file = _path;
}
else
{
_is_finished = true;
_path = end_it.path();
_file = _path;
}
DirectoryIterator end_it;
if (!_directories.empty())
{
_path.assign(_directories.front());
_directories.pop_front();
_file = _path;
}
else if (!_files.empty())
{
_path.assign(_files.front());
_files.pop_front();
_file = _path;
}
else
{
_is_finished = true;
_path = end_it.path();
_file = _path;
}
}
} // namespace Poco