X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=e2b6211f7aa4ec0ce944ce0f6ec62a94ed4e5f98;hb=80075429b6ab9db9e885b9bb9ae1427530c7bef8;hp=836041fbca94851635cd4a1271c637e1069390d1;hpb=43cf193ac4e7395e1406e1867d76a6125c257a8b;p=gdcm.git diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index 836041fb..e2b6211f 100644 --- a/src/gdcmDirList.cxx +++ b/src/gdcmDirList.cxx @@ -1,138 +1,300 @@ -// gdcmDirList.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDirList.cxx,v $ + Language: C++ + Date: $Date: 2009/05/26 10:27:38 $ + Version: $Revision: 1.68 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmDirList.h" +#include "gdcmUtil.h" +#include "gdcmDebug.h" -#include -#include +#include "gdcmDicomDirImage.h" -#ifdef GDCM_NO_ANSI_STRING_STREAM - #include - #define ostringstream ostrstream -#else - #include -#endif +#include +#include +#include +#include //stat function -#ifdef _MSC_VER - #include +#ifdef _MSC_VER + #include #include #else #include - #include + #include #endif -//----------------------------------------------------------------------------- -const char gdcmDirList::SEPARATOR_X = '/'; -const char gdcmDirList::SEPARATOR_WIN = '\\'; -const std::string gdcmDirList::SEPARATOR = "/"; - +namespace GDCM_NAME_SPACE +{ //----------------------------------------------------------------------------- // Constructor / Destructor -/* - * \ingroup gdcmDirList +/** * \brief Constructor - * @param + * @param dirName root directory name + * @param recursive whether we want to explore recursively or not */ -gdcmDirList::gdcmDirList(std::string dirName,bool recursive) +DirList::DirList(std::string const &dirName, bool recursive, bool all) { - name=dirName; - - NormalizePath(name); - Explore(name,recursive); + DirName = dirName; + Explore(dirName, recursive, all); } -/* - * \ingroup gdcmDirList +/** + * \brief Constructor + * @param se DicomDirSerie we want to explore + */ +DirList::DirList(DicomDirSerie *se) +{ + Explore(se); +} +/** * \brief Destructor - * @param */ -gdcmDirList::~gdcmDirList(void) +DirList::~DirList() { } -//----------------------------------------------------------------------------- -// Print - //----------------------------------------------------------------------------- // Public -/* - * \ingroup gdcmDirList - * \brief Get the directory name - * @param +/** + * \brief Tells us if file name corresponds to a Directory + * @param dirName file name to check + * @return true if the file IS a Directory */ -std::string gdcmDirList::GetDirName(void) +bool DirList::IsDirectory(std::string const &dirName) { - return(name); + struct stat fs; + // std::cout << "dirName[dirName.size()-1] [" << dirName[dirName.size()-1] << "]" + // << std::endl; + //assert( dirName[dirName.size()-1] != GDCM_FILESEPARATOR ); + if ( stat(dirName.c_str(), &fs) == 0 ) + { +#if _WIN32 + return ((fs.st_mode & _S_IFDIR) != 0); +#else + return S_ISDIR(fs.st_mode); +#endif + } + else + { + gdcmStaticWarningMacro("[" << dirName << "] not found or is not a Directory"); + //gdcmStaticErrorMacro( strerror(errno) ); + return false; + } } +/** + * \brief Get the first entry while visiting Filenames + * \return The first if found, otherwhise "" + */ +std::string DirList::GetFirst() +{ + ItDirList = Filenames.begin(); + if (ItDirList != Filenames.end()) + return *ItDirList; + return ""; +} + +/** + * \brief Get the next entry while visiting Filenames + * \return The next if found, otherwhise "" + */ +std::string DirList::GetNext() +{ + gdcmAssertMacro (ItDirList != Filenames.end()) + { + ++ItDirList; + if (ItDirList != Filenames.end()) + return *ItDirList; + } + return ""; +} + //----------------------------------------------------------------------------- // Protected //----------------------------------------------------------------------------- // Private -/* - * \ingroup gdcmDirList - * \brief Add a SEPARATOR to the end of the directory name is necessary - * @param + +/** + * \brief Explores a DicomDirSerie + * return number of files found + * @param se DicomDirSerie to explore */ -void gdcmDirList::NormalizePath(std::string &dirName) +int DirList::Explore(DicomDirSerie *se) { - int size=dirName.size(); - if((dirName[size-1]!=SEPARATOR_X)&&(dirName[size-1]!=SEPARATOR_WIN)) - { - dirName+=SEPARATOR; + int numberOfFiles = 0; + + DicomDirImage *im = se->GetFirstImage(); + while ( im ) + { + Filenames.push_back( im->GetEntryString(0x0004, 0x1500) );// File name (Referenced File ID) + numberOfFiles++; + im = se->GetNextImage(); } + return numberOfFiles; } - -/* - * \ingroup gdcmDirList + +/** * \brief Explore a directory with possibility of recursion - * @param + * return number of files read + * @param dirpath directory to explore + * @param recursive whether we want recursion or not + * @param all whether we want all (i.e; File names + Directory names) default=false */ -void gdcmDirList::Explore(std::string dirName,bool recursive) +int DirList::Explore(std::string const &dirpath, bool recursive, bool all) { + int numberOfFiles = 0; std::string fileName; + std::string dirName = Util::NormalizePath(dirpath); +#ifdef _MSC_VER + WIN32_FIND_DATA fileData; + //assert( dirName[dirName.size()-1] == '' ); + HANDLE hFile = FindFirstFile((dirName+"*").c_str(), &fileData); - NormalizePath(dirName); - -#ifdef _MSC_VER - WIN32_FIND_DATA fileData; - HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData); - int found=true; - - while( (hFile!=INVALID_HANDLE_VALUE) && (found) ) + for(BOOL b = (hFile != INVALID_HANDLE_VALUE); + b; + b = FindNextFile(hFile, &fileData)) { - fileName=fileData.cFileName; - if(fileData.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) + fileName = dirName + fileData.cFileName; + // avoid infinite loop! + if ( GDCM_NAME_SPACE::Util::GetName(fileName) == "." || GDCM_NAME_SPACE::Util::GetName(fileName) == "..") + continue; + + if (all) // meaningfull only when recursive=false { - if( (fileName!=".") && (fileName!="..") && (recursive) ) - Explore(dirName+fileName); + Filenames.push_back( fileName ); + numberOfFiles++; } else { - this->push_back(dirName+fileName); - } + if ( !( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) ) //is it a regular file? + { + Filenames.push_back( fileName ); + numberOfFiles++; - found=FindNextFile(hFile,&fileData); + } + else if ( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) //directory? + { + if ( GDCM_NAME_SPACE::Util::GetName(fileName)[0] != '.' && recursive ) //we also skip hidden files + { + numberOfFiles += Explore( fileName, recursive); + } + } + else + { + gdcmErrorMacro( "Unexpected error" ); + return -1; + } + } + } + + DWORD dwError = GetLastError(); + if (hFile != INVALID_HANDLE_VALUE) + FindClose(hFile); + if (dwError != ERROR_NO_MORE_FILES) + { + LPVOID lpMsgBuf; + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER| + FORMAT_MESSAGE_FROM_SYSTEM| + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL,GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language + (LPTSTR) &lpMsgBuf,0,NULL); + + gdcmErrorMacro("FindNextFile error. Error is " << (char *)lpMsgBuf + <<" for the directory : "<d_name; - if(namelist[i]->d_type==DT_DIR) + return 0; + } + + // According to POSIX, the dirent structure contains a field char d_name[] + // of unspecified size, with at most NAME_MAX characters preceeding the + // terminating null character. Use of other fields will harm the porta- + // bility of your programs. + + struct stat buf; + dirent *d; + for (d = readdir(dir); d; d = readdir(dir)) + { + fileName = dirName + d->d_name; + //std::cout << d->d_name << std::endl; + // avoid infinite loop! + if ( GDCM_NAME_SPACE::Util::GetName(d->d_name) == "." || GDCM_NAME_SPACE::Util::GetName(d->d_name) == "..") + continue; + + if( stat(fileName.c_str(), &buf) != 0 ) { - if( (fileName!=".") && (fileName!="..") && (recursive) ) - Explore(dirName+fileName); + gdcmErrorMacro( strerror(errno) ); } - else + + if (all) // meaningfull only when recursive=false { - this->push_back(dirName+fileName); + Filenames.push_back( fileName ); + numberOfFiles++; } + else + { + if ( S_ISREG(buf.st_mode) ) //is it a regular file? + { + Filenames.push_back( fileName ); + numberOfFiles++; + } + else if ( S_ISDIR(buf.st_mode) ) //directory? + { + if ( d->d_name[0] != '.' && recursive ) //we also skip hidden files + { + numberOfFiles += Explore( fileName, recursive); + } + } + else + { + gdcmErrorMacro( "Unexpected error" ); + return -1; + } + } + } + + if( closedir(dir) != 0 ) + { + gdcmErrorMacro( strerror(errno) ); } #endif + + return numberOfFiles; +} + +//----------------------------------------------------------------------------- +// Print +/** + * \brief Print method + * @param os ostream to write to + */ +void DirList::Print(std::ostream &os, std::string const &) +{ + std::copy(Filenames.begin(), Filenames.end(), + std::ostream_iterator(os, "\n")); } //----------------------------------------------------------------------------- +} // end namespace gdcm