Index: src/libchcore/TSubTaskScanDirectory.cpp
===================================================================
diff -u -N -rd468098a278a0d16c5b700236ea276b9c9677c9f -r25722a1d39e5d4bb49c5a60cbee3dda6c02cb193
--- src/libchcore/TSubTaskScanDirectory.cpp	(.../TSubTaskScanDirectory.cpp)	(revision d468098a278a0d16c5b700236ea276b9c9677c9f)
+++ src/libchcore/TSubTaskScanDirectory.cpp	(.../TSubTaskScanDirectory.cpp)	(revision 25722a1d39e5d4bb49c5a60cbee3dda6c02cb193)
@@ -39,6 +39,7 @@
 #include "TFeedbackHandlerWrapper.h"
 #include "TBufferSizes.h"
 #include "TFileException.h"
+#include "TFilesystemFeedbackWrapper.h"
 
 namespace chcore
 {
@@ -71,7 +72,10 @@
 		TBasePathDataContainerPtr spBasePaths = GetContext().GetBasePaths();
 		const TConfig& rConfig = GetContext().GetConfig();
 		const TFileFiltersArray& rafFilters = GetContext().GetFilters();
+		IFilesystemPtr spFilesystem = GetContext().GetLocalFilesystem();
 
+		TFilesystemFeedbackWrapper tFilesystemFBWrapper(spFeedbackHandler, spFilesystem, rLog);
+
 		rLog.logi(_T("Searching for files..."));
 
 		// reset progress
@@ -116,7 +120,7 @@
 
 			// try to get some info about the input path; let user know if the path does not exist.
 			bool bSkip = false;
-			ESubOperationResult eResult = GetFileInfoFB(spFeedbackHandler, pathCurrent, spFileInfo, spBasePath, bSkip);
+			ESubOperationResult eResult = tFilesystemFBWrapper.GetFileInfoFB(pathCurrent, spFileInfo, spBasePath, bSkip);
 			if (eResult != TSubTaskBase::eSubResult_Continue)
 				return eResult;
 			else if (bSkip)
@@ -185,57 +189,6 @@
 		return eSubResult_Continue;
 	}
 
-	TSubTaskBase::ESubOperationResult TSubTaskScanDirectories::GetFileInfoFB(const IFeedbackHandlerPtr& spFeedbackHandler, const TSmartPath& pathCurrent, TFileInfoPtr& spFileInfo, const TBasePathDataPtr& spBasePath, bool& bSkip)
-	{
-		TFileInfoArray& rFilesCache = GetContext().GetFilesCache();
-		const IFilesystemPtr& spFilesystem = GetContext().GetLocalFilesystem();
-
-		bool bRetry = false;
-		do
-		{
-			bRetry = false;
-
-			// read attributes of src file/folder
-			DWORD dwLastError = ERROR_SUCCESS;
-			try
-			{
-				spFilesystem->GetFileInfo(pathCurrent, spFileInfo, spBasePath);
-				return eSubResult_Continue;
-			}
-			catch (const TFileException& e)
-			{
-				dwLastError = e.GetNativeError();
-			}
-
-			EFeedbackResult frResult = spFeedbackHandler->FileError(pathCurrent.ToWString(), TString(), EFileError::eFastMoveError, dwLastError);
-			switch (frResult)
-			{
-			case EFeedbackResult::eResult_Cancel:
-				rFilesCache.Clear();
-				return eSubResult_CancelRequest;
-
-			case EFeedbackResult::eResult_Retry:
-				bRetry = true;
-				break;
-
-			case EFeedbackResult::eResult_Pause:
-				rFilesCache.Clear();
-				return eSubResult_PauseRequest;
-
-			case EFeedbackResult::eResult_Skip:
-				bSkip = true;
-				break;		// just do nothing
-
-			default:
-				BOOST_ASSERT(FALSE);		// unknown result
-				THROW_CORE_EXCEPTION(eErr_UnhandledCase);
-			}
-		}
-		while (bRetry);
-
-		return eSubResult_Continue;
-	}
-
 	void TSubTaskScanDirectories::GetStatsSnapshot(TSubTaskStatsSnapshotPtr& spStats) const
 	{
 		m_tSubTaskStats.GetSnapshot(spStats);