Readabalize code. Will fix bugs later today.

sbin/fileImport.pl

@@ -178,10 +178,12 @@ if (!($^O =~ /^Win/i) && $> != 0 && !$override) {
 
 my %ListAssetExists;
 my %filelisthash;
+
 print "Starting..." unless ($quiet);
 my $session = WebGUI::Session->open($webguiRoot,$configFile);
 $session->user({userId=>3});
 print "OK\n" unless ($quiet);
+
 my $parent = WebGUI::Asset::File->newByDynamicClass($session, $parentAssetId);
 if (defined $parent) {
 	&buildListAssetExists($parent);
@@ -190,6 +192,7 @@ if (defined $parent) {
 	exit 5;
 }
 print "End of the childs detection\n" unless ($quiet);
+
 # TB : wrap buildFileList in buildFileListWrap function for recursive search.
 &addFiles(&buildFileListWrap($pathToFiles));
 &setPrivileges();
@@ -197,6 +200,7 @@ print "End of the childs detection\n" unless ($quiet);
 print "Cleaning up..." unless ($quiet);
 $session->var->end();
 $session->close();
+
 print "OK\n" unless ($quiet);
 exit 0;
 
@@ -208,8 +212,10 @@ sub addFiles {
 	print "Adding files...\n" unless ($quiet);
 	foreach my $file (@{$filelist}) {
 		my $class = 'WebGUI::Asset::File';
+		
 		# TB : add the path relative to $pathToFile in the message.
 		print "\tAdding ".$file->{relpath}.$slash.$file->{filename}." to the database.\n" unless ($quiet);
+		
 		my $templateId = 'PBtmpl0000000000000024';
 		if (isIn(lc($file->{ext}),@nailable)) {
 			$class = 'WebGUI::Asset::File::Image';
@@ -229,13 +235,16 @@ sub addFiles {
 			my $filename = $storage->addFileFromFilesystem("$pathToFiles$slash$file->{relpath}$slash$file->{filename}");
 			$child->generateThumbnail if ($class eq 'WebGUI::Asset::File::Image');
 			$child->setSize($storage->getFileSize($filename));
-    } else {
+		}
+		else {
 			print "\t\tCreate the new asset.\n" unless ($quiet);
 			my $storage = WebGUI::Storage->create($session);
 			my $filename = $storage->addFileFromFilesystem("$pathToFiles$slash$file->{relpath}$slash$file->{filename}");
+
 			# TB : possibly remove the extension if the ignoreExtInName feature enabled.
 			my $filenameTitle = $filename;
 			$filenameTitle =~ s/\.$file->{ext}// if ($ignoreExtInName);
+			
 			my $newAsset = $parent->addChild({
 				className    => $class,
 				title        => $filenameTitle,
@@ -248,12 +257,14 @@ sub addFiles {
 				groupIdEdit  => $groupToEdit,
 				templateId   => $templateId,
 				endDate      => 32472169200,
-					ownerUserId=>$owner
+				ownerUserId  => $owner,
 			});
+
 			$newAsset->generateThumbnail if ($class eq 'WebGUI::Asset::File::Image');
 			$newAsset->setSize($storage->getFileSize($filename));
 		}
 	}
+
 	print "Finished adding.\n" unless ($quiet);
 }
 
@@ -262,13 +273,16 @@ sub addFiles {
 #-----------------------------------------
 sub setPrivileges {
 	print "Setting filesystem privileges.\n" unless ($quiet);
+	
 	if ($session->os->get("type") eq "Linuxish") {
 		unless (system("chown -R ".$webUser." ".$session->config->get("uploadsPath"))) {
 			print "Privileges set.\n" unless ($quiet);
-    } else {
+		}
+		else {
 			print "Could not set privileges.\n";
 		}
-  } else {
+	}
+	else {
 		print "Cannot set privileges on this platform.\n" unless ($quiet)
 	}
 }
@@ -279,10 +293,12 @@ sub setPrivileges {
 sub buildFileListWrap {
 	my ($path) = @_;
 	my (@filelist);
+
 	print "Building file list.\n" unless ($quiet);
 	@filelist = &buildFileList($now,$path);
 	# &filelistCheck(@filelist);
 	print "File list complete.\n" unless ($quiet);
+
 	return \@filelist;
 }
 
@@ -292,8 +308,10 @@ sub buildFileListWrap {
 sub buildFileList {
 	my ($now,$path) = @_;
 	my (@filelist, @files, $file, $filename, $ext);
+
 	if (opendir(FILES,$path)) {
 		@files = readdir(FILES);
+
 		foreach $file (@files) {
 			next if ($file eq "." || $file eq "..");
 			my $fullpathfile = "$path$slash$file";
@@ -301,18 +319,23 @@ sub buildFileList {
 				$file =~ /(.*?)\.(.*?)$/;
 				$filename = $1;
 				$ext = $2;
+				
 				# TB : filter process : skip files due to options : skipOlderThan and findByExt
 				next if (&skipFilter($fullpathfile,$ext,$now));
+				
 				# TB : due to recursive search. Not really nice.
 				my $relpath = &trailFile("$path");
+				
 				# TB : check is the filelist doesn't contains two times the same file (file with the same name)
 				# due to recursive call, this can happen.
 				if (exists $filelisthash{$file}) {
+				
 					print "Error: file \"$file\" exists at several locations.
 					Both \"$filelisthash{$file}\" and \"$relpath\" contains it.
 					Exit at the first error of this type.\n" unless ($quiet);
 					exit 2;
 				}
+
 				push(@filelist,{ext=>$ext, filename=>$file, relpath=>$relpath});
 				$filelisthash{$file} = $relpath;
 				print "Found file $file.\n" unless ($quiet);
@@ -320,9 +343,11 @@ sub buildFileList {
 			# TB : the recursive call
 			push(@filelist,&buildFileList($now,"$fullpathfile")) if ((-d "$fullpathfile") && $recursive);
 		}
+
 		closedir(FILES);
 		return @filelist;
-  } else {
+	}
+	else {
 		print "Error: Could not open folder $path.\n" unless ($quiet);
 		exit 2;
 	}
@@ -335,6 +360,7 @@ sub getType {
 	my ($extension);
 	$extension = $_[0];
 	$extension =~ s/.*\.(.*?)$/$1/;
+
 	return $extension;
 }
 
@@ -344,20 +370,24 @@ sub getType {
 #-----------------------------------------
 sub skipFilter {
 	my ($file,$ext,$now) = @_;
+
 	# TB : stat in Windows has a strange behaviour relativelly to Unix
 	# the output of stat si an array of array.
 	# to be check on Unix if this work correctly.
 	my @dev = stat "$file";
+
 	# TB : option skipOlderThan
 	if ($now - $dev[0][9] > $skipOlderThan) {
 		print "Found file $file.\n\tBut older than $skipOlderThan. Skip it.\n" unless ($quiet);
 		return 1;
 	}
+
 	# TB : option findByExt
 	if (($findByExt ne "") && ($findByExt !~ /(^|,)$ext(,|$)/)) {
 		print "Found file in $file.\n\tBut Extension doesn't match findByExt tag. Skip it.\n" unless ($quiet);
 		return 1;
 	}
+
 	return 0;
 }
 
@@ -370,14 +400,18 @@ sub trailFile {
 	# this is supposed to find the relative path to pathToFiles
 	my ($path) = @_;
 	my $pathToFiles_temp = $pathToFiles;
+
 	if ($^O =~ /Win/) { 
 		$pathToFiles_temp =~ s/\\/\\\\/g; 
-  } else {
+	}
+	else {
 		$pathToFiles_temp =~ s/\//\\\//g;
 	}
+
 	$path =~ s/$pathToFiles_temp//;
 	$path =~ s/.//;
 	$path = "." if ($path eq "");
+
 	return $path;
 }
 
@@ -390,11 +424,13 @@ sub checkAssetExists {
 	my $replaceAsset = 0;
 	my $replaceAssetId = "";
 	my $child;
+
 	if (exists $ListAssetExists{$url}) {
 		$child = $ListAssetExists{$url};
 		$replaceAsset = 1;
 		$replaceAssetId = $child->getId;
 	}
+
 	return($replaceAsset, $replaceAssetId, $child);
 }
 
@@ -405,6 +441,7 @@ sub checkAssetExists {
 sub buildListAssetExists {
 	my ($parent) = @_;
 	my @allelement = $parent->getLineage();
+
 	foreach my $elem ( @{$allelement[0]} ) {
 		my $child = WebGUI::Asset::File->newByDynamicClass($session,$elem);
 		if (defined $child) {