Index: src/libchcore/TDestinationPathProvider.cpp
===================================================================
diff -u -N
--- src/libchcore/TDestinationPathProvider.cpp	(revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f)
+++ src/libchcore/TDestinationPathProvider.cpp	(revision 0)
@@ -1,127 +0,0 @@
-#include "stdafx.h"
-#include "TDestinationPathProvider.h"
-#include "TCoreException.h"
-#include "ErrorCodes.h"
-#include <boost/lexical_cast.hpp>
-
-namespace chcore
-{
-	TDestinationPathProvider::TDestinationPathProvider(const IFilesystemPtr& spFilesystem,
-		const TSmartPath& pathDestinationBase,
-		bool bIgnoreFolders,
-		bool bForceDirectories,
-		const TString& strFirstAltName,
-		const TString& strNextAltName) :
-
-		m_spFilesystem(spFilesystem),
-		m_pathDestinationBase(pathDestinationBase),
-		m_bIgnoreFolders(bIgnoreFolders),
-		m_bForceDirectories(bForceDirectories),
-		m_strFirstAltName(strFirstAltName),
-		m_strNextAltName(strNextAltName)
-	{
-		if(!spFilesystem)
-			throw TCoreException(eErr_InvalidArgument, L"spFilesystem", LOCATION);
-	}
-
-	TSmartPath TDestinationPathProvider::CalculateDestinationPath(const TFileInfoPtr& spFileInfo)
-	{
-		if(!spFileInfo)
-			throw TCoreException(eErr_InvalidArgument, L"spFileInfo", LOCATION);
-
-		if (m_bForceDirectories)
-			return CalculateForceDirectories(spFileInfo);
-
-		if (m_bIgnoreFolders)
-			return CalculateIgnoreDirectories(spFileInfo);
-
-		TBasePathDataPtr spPathData = spFileInfo->GetBasePathData();
-		if(!spPathData)
-			return m_pathDestinationBase + spFileInfo->GetFilePath();
-
-		// generate new dest name
-		if(!spPathData->IsDestinationPathSet())
-		{
-			// generate something - if dest folder == src folder - search for copy
-			if(m_pathDestinationBase == spFileInfo->GetFullFilePath().GetFileRoot())
-			{
-				TSmartPath pathSubst = FindFreeSubstituteName(spFileInfo->GetFullFilePath());
-				spPathData->SetDestinationPath(pathSubst);
-			}
-			else
-			{
-				TSmartPath pathFilename = spPathData->GetSrcPath();
-				pathFilename.StripSeparatorAtEnd();
-				pathFilename.StripPath(L":");
-
-				spPathData->SetDestinationPath(pathFilename.GetFileName());
-			}
-		}
-
-		TSmartPath pathResult = m_pathDestinationBase + spPathData->GetDestinationPath() + spFileInfo->GetFilePath();
-		pathResult.StripSeparatorAtEnd();
-
-		return pathResult;
-	}
-
-	TSmartPath TDestinationPathProvider::CalculateForceDirectories(const TFileInfoPtr& spFileInfo)
-	{
-		// force create directories
-		TSmartPath tFileRoot = spFileInfo->GetFullFilePath().GetFileRoot();
-		tFileRoot.StripPath(L":");
-
-		TSmartPath pathCombined = m_pathDestinationBase + tFileRoot;
-
-		// force create directory
-		m_spFilesystem->CreateDirectory(pathCombined, true);
-
-		TSmartPath pathFile = spFileInfo->GetFullFilePath().GetFileName();
-		pathFile.StripPath(L":");
-		TSmartPath pathResult = pathCombined + pathFile;
-		pathResult.StripSeparatorAtEnd();
-
-		return pathResult;
-	}
-
-	TSmartPath TDestinationPathProvider::CalculateIgnoreDirectories(const TFileInfoPtr& spFileInfo)
-	{
-		TSmartPath pathFilename = spFileInfo->GetFullFilePath();
-		pathFilename.StripPath(L":");
-		pathFilename.StripSeparatorAtEnd();
-
-		TSmartPath pathResult = m_pathDestinationBase + pathFilename.GetFileName();
-
-		return pathResult;
-	}
-
-	// finds another name for a copy of src file(folder) in dest location
-	TSmartPath TDestinationPathProvider::FindFreeSubstituteName(TSmartPath pathSrcPath) const
-	{
-		// get the name from src path
-		pathSrcPath.StripSeparatorAtEnd();
-
-		TSmartPath pathFilename = pathSrcPath.GetFileName();
-		pathFilename.StripPath(L":");
-
-		// set the dest path
-		TString strCheckPath = m_strFirstAltName;
-		strCheckPath.Replace(_T("%name"), pathFilename.GetFileTitle().ToString());
-		strCheckPath.Replace(_T("%ext"), pathFilename.GetExtension().ToString());
-
-		TSmartPath pathCheckPath(PathFromWString(strCheckPath));
-
-		// when adding to strDstPath check if the path already exists - if so - try again
-		int iCounter = 1;
-		TString strFmt = m_strNextAltName;
-		while(m_spFilesystem->PathExist(m_pathDestinationBase + pathCheckPath))
-		{
-			strCheckPath = strFmt;
-			strCheckPath.Replace(_T("%name"), pathFilename.GetFileTitle().ToString());
-			strCheckPath.Replace(_T("%ext"), pathFilename.GetExtension().ToString());
-			strCheckPath.Replace(_T("%count"), boost::lexical_cast<std::wstring>(++iCounter).c_str());
-			pathCheckPath.FromString(strCheckPath);
-		}
-
-		return pathCheckPath;
-	}
-}