Index: src/libchcore/TSubTaskFastMove.cpp
===================================================================
diff -u -N
--- src/libchcore/TSubTaskFastMove.cpp	(revision b26ced3298e3e7e51d91f3ac70b56746786da83b)
+++ src/libchcore/TSubTaskFastMove.cpp	(revision 0)
@@ -1,216 +0,0 @@
-// ============================================================================
-//  Copyright (C) 2001-2009 by Jozef Starosczyk
-//  ixen@copyhandler.com
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU Library General Public License
-//  (version 2) as published by the Free Software Foundation;
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU Library General Public
-//  License along with this program; if not, write to the
-//  Free Software Foundation, Inc.,
-//  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-// ============================================================================
-/// @file  TSubTaskScanDirectory.cpp
-/// @date  2010/09/18
-/// @brief Contains implementation of classes related to scan directory subtask.
-// ============================================================================
-#include "stdafx.h"
-#include "TSubTaskFastMove.h"
-#include "TSubTaskContext.h"
-#include "TTaskConfiguration.h"
-#include "IFeedbackHandler.h"
-#include "TBasePathData.h"
-#include "TWorkerThreadController.h"
-#include "TTaskLocalStats.h"
-#include "TFileInfo.h"
-#include <boost/lexical_cast.hpp>
-#include "TPathContainer.h"
-#include "TScopedRunningTimeTracker.h"
-#include "TFeedbackHandlerWrapper.h"
-#include "TBufferSizes.h"
-#include "TFilesystemFeedbackWrapper.h"
-#include "TDestinationPathProvider.h"
-
-namespace chcore
-{
-	TSubTaskFastMove::TSubTaskFastMove(TSubTaskContext& rContext) :
-		TSubTaskBase(rContext),
-		m_tSubTaskStats(eSubOperation_FastMove),
-		m_spLog(std::make_unique<logger::TLogger>(rContext.GetLogFileData(), L"ST-FastMove"))
-	{
-	}
-
-	TSubTaskFastMove::~TSubTaskFastMove()
-	{
-	}
-
-	void TSubTaskFastMove::Reset()
-	{
-		m_tSubTaskStats.Clear();
-	}
-
-	void TSubTaskFastMove::InitBeforeExec()
-	{
-		TBasePathDataContainerPtr spBasePaths = GetContext().GetBasePaths();
-
-		file_count_t fcSize = spBasePaths->GetCount();
-		file_count_t fcIndex = m_tSubTaskStats.GetCurrentIndex();
-
-		if(fcIndex >= fcSize)
-			fcIndex = 0;
-
-		if(fcSize > 0)
-		{
-			TBasePathDataPtr spBasePath = spBasePaths->GetAt(fcIndex);
-			m_tSubTaskStats.SetCurrentPath(spBasePath->GetSrcPath().ToString());
-		}
-		else
-			m_tSubTaskStats.SetCurrentPath(TString());
-	}
-
-	TSubTaskFastMove::ESubOperationResult TSubTaskFastMove::Exec(const IFeedbackHandlerPtr& spFeedback)
-	{
-		TScopedRunningTimeTracker guard(m_tSubTaskStats);
-		TFeedbackHandlerWrapperPtr spFeedbackHandler(std::make_shared<TFeedbackHandlerWrapper>(spFeedback, guard));
-
-		// log
-		TWorkerThreadController& rThreadController = GetContext().GetThreadController();
-		TBasePathDataContainerPtr spBasePaths = GetContext().GetBasePaths();
-		const TConfig& rConfig = GetContext().GetConfig();
-		TSmartPath pathDestination = GetContext().GetDestinationPath();
-		const TFileFiltersArray& rafFilters = GetContext().GetFilters();
-		IFilesystemPtr spFilesystem = GetContext().GetLocalFilesystem();
-
-		TFilesystemFeedbackWrapper tFilesystemFBWrapper(spFeedbackHandler, spFilesystem, GetContext().GetLogFileData(), rThreadController);
-
-		LOG_INFO(m_spLog) << _T("Performing initial fast-move operation...");
-
-		// new stats
-		m_tSubTaskStats.SetCurrentBufferIndex(TBufferSizes::eBuffer_Default);
-		m_tSubTaskStats.SetProcessedCount(0);
-		m_tSubTaskStats.SetTotalSize(0);
-		m_tSubTaskStats.SetProcessedSize(0);
-		m_tSubTaskStats.SetCurrentPath(TString());
-
-		bool bIgnoreDirs = GetTaskPropValue<eTO_IgnoreDirectories>(rConfig);
-		bool bForceDirectories = GetTaskPropValue<eTO_CreateDirectoriesRelativeToRoot>(rConfig);
-
-		// when using special options with move operation, we don't want to use fast-moving, since most probably
-		// some searching and special processing needs to be done
-		if (bIgnoreDirs || bForceDirectories)
-		{
-			m_tSubTaskStats.SetTotalCount(0);
-			return eSubResult_Continue;
-		}
-		else
-			m_tSubTaskStats.SetTotalCount(spBasePaths->GetCount());
-
-		TDestinationPathProvider tDstPathProvider(spFilesystem, pathDestination,
-			bIgnoreDirs, bForceDirectories,
-			GetTaskPropValue<eTO_AlternateFilenameFormatString_First>(GetContext().GetConfig()),
-			GetTaskPropValue<eTO_AlternateFilenameFormatString_AfterFirst>(GetContext().GetConfig()));
-
-		// add everything
-		TString strFormat;
-
-		file_count_t fcSize = spBasePaths->GetCount();
-		file_count_t fcIndex = m_tSubTaskStats.GetCurrentIndex();
-		for (; fcIndex < fcSize; fcIndex++)
-		{
-			TBasePathDataPtr spBasePath = spBasePaths->GetAt(fcIndex);
-			TSmartPath pathCurrent = spBasePath->GetSrcPath();
-
-			// store currently processed index
-			m_tSubTaskStats.SetCurrentIndex(fcIndex);
-
-			// new stats
-			m_tSubTaskStats.SetProcessedCount(fcIndex);
-			m_tSubTaskStats.SetCurrentPath(pathCurrent.ToString());
-
-			// retrieve base path data
-			// check if we want to process this path at all
-			if (spBasePath->GetSkipFurtherProcessing())
-				continue;
-
-			TFileInfoPtr spFileInfo(std::make_shared<TFileInfo>());
-
-			ESubOperationResult eResult = tFilesystemFBWrapper.GetFileInfoFB(pathCurrent, spFileInfo, spBasePath);
-			if (eResult == TSubTaskBase::eSubResult_SkipFile)
-			{
-				spBasePath->SetSkipFurtherProcessing(true);
-				continue;
-			}
-			else if (eResult != TSubTaskBase::eSubResult_Continue)
-				return eResult;
-
-			// does it match the input filter?
-			if (!spFileInfo->IsDirectory() && !rafFilters.Match(spFileInfo))
-			{
-				spBasePath->SetSkipFurtherProcessing(true);
-				continue;
-			}
-
-			// try to fast move
-			eResult = tFilesystemFBWrapper.FastMoveFB(spFileInfo, tDstPathProvider.CalculateDestinationPath(spFileInfo), spBasePath);
-			if (eResult != TSubTaskBase::eSubResult_Continue)
-				return eResult;
-
-			// check for kill need
-			if (rThreadController.KillRequested())
-			{
-				// log
-				LOG_INFO(m_spLog) << _T("Kill request while fast moving items");
-				return eSubResult_KillRequest;
-			}
-		}
-
-		m_tSubTaskStats.SetCurrentIndex(fcIndex);
-		m_tSubTaskStats.SetProcessedCount(fcIndex);
-		m_tSubTaskStats.SetCurrentPath(TString());
-
-		// log
-		LOG_INFO(m_spLog) << _T("Fast moving finished");
-
-		return eSubResult_Continue;
-	}
-
-	void TSubTaskFastMove::GetStatsSnapshot(TSubTaskStatsSnapshotPtr& spStats) const
-	{
-		m_tSubTaskStats.GetSnapshot(spStats);
-	}
-
-	void TSubTaskFastMove::Store(const ISerializerPtr& spSerializer) const
-	{
-		ISerializerContainerPtr spContainer = spSerializer->GetContainer(_T("subtask_fastmove"));
-
-		InitColumns(spContainer);
-
-		ISerializerRowData& rRow = spContainer->GetRow(0, m_tSubTaskStats.WasAdded());
-
-		m_tSubTaskStats.Store(rRow);
-	}
-
-	void TSubTaskFastMove::Load(const ISerializerPtr& spSerializer)
-	{
-		ISerializerContainerPtr spContainer = spSerializer->GetContainer(_T("subtask_fastmove"));
-
-		InitColumns(spContainer);
-
-		ISerializerRowReaderPtr spRowReader = spContainer->GetRowReader();
-		if (spRowReader->Next())
-			m_tSubTaskStats.Load(spRowReader);
-	}
-
-	void TSubTaskFastMove::InitColumns(const ISerializerContainerPtr& spContainer) const
-	{
-		IColumnsDefinition& rColumns = spContainer->GetColumnsDefinition();
-		if (rColumns.IsEmpty())
-			TSubTaskStatsInfo::InitColumns(rColumns);
-	}
-}