X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdFilesFromDirectory.cxx;h=4caeae3c6cc4a96500ade9515abaeade4250e929;hb=1ba1a0e223adf11163b6e12ad5fe999b0f87add7;hp=1aefdb16e4005719a68219f62bb9b1cf6b79fb1e;hpb=899e84df04040566381e7252faa0b47d0863baca;p=bbtk.git

diff --git a/packages/std/src/bbstdFilesFromDirectory.cxx b/packages/std/src/bbstdFilesFromDirectory.cxx
index 1aefdb1..4caeae3 100644
--- a/packages/std/src/bbstdFilesFromDirectory.cxx
+++ b/packages/std/src/bbstdFilesFromDirectory.cxx
@@ -48,19 +48,28 @@ BBTK_BLACK_BOX_IMPLEMENTATION(FilesFromDirectory,bbtk::AtomicBlackBox);
 void FilesFromDirectory::Process()
 {
 	Filenames.clear();
-   	DirName 	= bbGetInputIn();
-   	bool rec 	= bbGetInputRecursive();
-   	/*int nbFiles = */ Explore(DirName, rec);
-	CleanFilenames( bbGetInputIn() );
+	SimpleFilenames.clear();
+	
+	if (bbGetInputActive()==true)
+	{
+		if (bbGetInputIn()!="")
+		{
+		   	DirName 	= bbGetInputIn();
+			/*int nbFiles = */ Explore(DirName, bbGetInputRecursive(), bbGetInputRecursiveLevel() );
+			CleanFilenames( DirName );
+		} // if In
+	} // Active
    	bbSetOutputOut(Filenames);   
   	bbSetOutputOutSimple(SimpleFilenames);   
 }
 
 void FilesFromDirectory::bbUserSetDefaultValues()
 {
+    bbSetInputActive(true);
     bbSetInputIn(".");
     bbSetInputRecursive(false);  
     bbSetInputType(0);  
+    bbSetInputRecursiveLevel(999);  
 }
 
 void FilesFromDirectory::bbUserInitializeProcessing() 
@@ -86,7 +95,7 @@ std::string FilesFromDirectory::NormalizePath(std::string const &pathname)
    std::string name = pathname;
    int size = name.size();
 
-   if ( name[size-1] != FILESEPARATOR )
+   if (!((name[size-1]=='/')||(name[size-1]=='\\')))
    {
       name += FILESEPARATOR;
    }
@@ -102,18 +111,20 @@ std::string FilesFromDirectory::NormalizePath(std::string const &pathname)
 
 
 
-int FilesFromDirectory::Explore(std::string const &dirpath, bool recursive)
+int FilesFromDirectory::Explore(std::string const &dirpath, bool recursive, int recursiveLevel)
 {
-   	int numberOfFiles 		= 0;
-   	std::string dirName 	= NormalizePath(dirpath);
-   	int tmpNumberOfFiles;
+   	int 		numberOfFiles 		= 0;
+
+if (recursiveLevel>=0){
+
+   	std::string dirName 			= NormalizePath(dirpath);
+   	int 		tmpNumberOfFiles;
    	std::string fileName;
 #ifdef _MSC_VER
    	WIN32_FIND_DATA fileData;
    	//assert( dirName[dirName.size()-1] == '' );
    	HANDLE hFile = FindFirstFile((dirName+"*").c_str(), &fileData);
 
-
    	for(BOOL b = (hFile != INVALID_HANDLE_VALUE); b;
        b = FindNextFile(hFile, &fileData))
    	{
@@ -125,19 +136,30 @@ int FilesFromDirectory::Explore(std::string const &dirpath, bool recursive)
          {
 			if (bbGetInputType()==1)
 			{
-		       		Filenames.push_back(fileName);	 
-   		 	     	numberOfFiles++;
+		        std::string temp = dirName+fileName;
+	       		Filenames.push_back(temp);	 
+   	 	     	numberOfFiles++;
 			} // Type ALL_directories
 
-			tmpNumberOfFiles	=	Explore(dirName+fileName, recursive);
+			tmpNumberOfFiles	=	Explore(dirName+fileName, recursive,recursiveLevel-1);
 			if ((bbGetInputType()==2)&&tmpNumberOfFiles==0)
 			{
-		    	Filenames.push_back(fileName);	 
+		        std::string temp = dirName+fileName;
+	       		Filenames.push_back(temp);	 
    	 	        numberOfFiles++;
 			} // Type Lsast_directories
 			
 			numberOfFiles 		= 	numberOfFiles + tmpNumberOfFiles;
-         } // if
+         } // if recursive
+         if ( fileName != "." && fileName != ".." && !recursive )
+		 {
+			if ((bbGetInputType()==1) || (bbGetInputType()==2))
+			{
+		        std::string temp = dirName+fileName;
+	           	Filenames.push_back(temp);	 
+   	 	       	numberOfFiles++;
+			} // Type All_directories
+		}// fileName && !recursive
       } else  {
 //      std::string temp = "\"" +dirName+fileName + "\"";
         std::string temp = dirName+fileName;
@@ -186,7 +208,7 @@ int FilesFromDirectory::Explore(std::string const &dirpath, bool recursive)
   // Real POSIX implementation: scandir is a BSD extension only, and doesn't 
   // work on debian for example
 
-   	DIR* dir = opendir(dirName.c_str());
+   	DIR* dir = opendir( dirName.c_str() );
    	if (!dir)
    	{
 		return 0;
@@ -230,7 +252,7 @@ int FilesFromDirectory::Explore(std::string const &dirpath, bool recursive)
 				} // Type files
          	} // d_name
       	} else if ( S_ISDIR(buf.st_mode) ) {  //directory?
-         	if ( d->d_name[0] != '.' && recursive ) //we also skip hidden files
+         	if ( (d->d_name[0]!='.') && recursive ) //we also skip hidden files
          	{
 				if (bbGetInputType()==1)
 				{
@@ -238,14 +260,23 @@ int FilesFromDirectory::Explore(std::string const &dirpath, bool recursive)
    	 	         	numberOfFiles++;
 				} // Type All_directories
 
-				tmpNumberOfFiles	= Explore( fileName, recursive);
+				tmpNumberOfFiles	= Explore( fileName, recursive, recursiveLevel-1);
 				if ((bbGetInputType()==2)&&tmpNumberOfFiles==0)
 				{
 			  		Filenames.push_back(fileName);	 
    	 	         	numberOfFiles++;
 				} // Type Lsast_directories
            		numberOfFiles 		= numberOfFiles+tmpNumberOfFiles;
-         	} // d_name
+         	}// d_name && recursive
+         	if ( (d->d_name[0]!='.') && !recursive ) { //we also skip hidden files
+				if ((bbGetInputType()==1) || (bbGetInputType()==2))
+				{
+	             	Filenames.push_back(fileName);	 
+   	 	         	numberOfFiles++;
+				} // Type All_directories
+			
+			}// d_name && !recursive
+
 		} else {
          	//gdcmErrorMacro( "Unexpected error" );
          	return -1;
@@ -257,6 +288,7 @@ int FilesFromDirectory::Explore(std::string const &dirpath, bool recursive)
    }// closedir
 #endif
 
+} // if recursiveLevel 
 
   	return numberOfFiles;
 }
@@ -266,8 +298,36 @@ int FilesFromDirectory::Explore(std::string const &dirpath, bool recursive)
 void FilesFromDirectory::CleanFilenames( std::string basePath )
 {
   	std::string tmpString;
-  	int i,ii,sizeFilenames = Filenames.size();
-
+  	int i,ii,sizeFilenames 	= Filenames.size();
+	int j,sizeFileEnd 		= bbGetInputFileEnd().size();
+	int okEraseElement;
+	int posStr;
+//Selecting just the files in the FileEnd List
+	if (bbGetInputFileEnd().size()!=0)
+	{
+		for (i=sizeFilenames-1; i>=0; i--)
+		{
+			okEraseElement = 0;
+			for (j=0; j<sizeFileEnd; j++)
+			{
+				posStr=(Filenames[i].length()) - (bbGetInputFileEnd()[j]).length();
+				if (posStr>=0)
+				{
+					std::string tmp=Filenames[i].substr( posStr ) ;
+					if (bbGetInputFileEnd()[j].compare( tmp )==0 )
+					{
+						okEraseElement++;
+					} // if FileEnd
+				}// if posStr
+			} // for j					
+
+			if (okEraseElement==0) 
+			{ 
+				Filenames.erase( Filenames.begin()+i );
+			}
+		} // for i	
+	} // if FileEnd !=0
+	sizeFilenames = Filenames.size();
 // Cleanning paths with spaces	
 	for (i=0; i<sizeFilenames; i++)
 	{
@@ -296,14 +356,12 @@ void FilesFromDirectory::CleanFilenames( std::string basePath )
         	} // if 
     	} // for ii
   	} // for i
-
 // Creating SimpleFilenames
 	unsigned int lenghtBasePath = basePath.length();
 	for (i=0; i<sizeFilenames; i++)
 	{
 		SimpleFilenames.push_back( Filenames[i].substr( lenghtBasePath ) );
 	} // for i
-
 }