Subversion Repositories spk

Rev

Rev 183 | Rev 197 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 183 Rev 196
Line 88... Line 88...
88 
	}
 88 
	}
89 
}
 89 
}
90 
 
 90 
 
91 
bool COriginalFiles::backupFile(C_File *f, Utils::CStringList *errors)
 91 
bool COriginalFiles::backupFile(C_File *f, Utils::CStringList *errors)
92 
{
 92 
{
93 
	Utils::String newDir = "PluginManager/Original/" + f->getDirectory(NULL);
 93 
	Utils::WString newDir = L"PluginManager/Original/" + f->getDirectory(NULL).toWString();
94 
	CDirIO oDir(_sDir);
 94 
	CDirIO oDir(_sDir);
95 
	if ( oDir.exists(newDir + "/" + f->filename()) )
 95 
	if ( oDir.exists(newDir + L"/" + f->filename().toWString()) )
96 
		return true;
 96 
		return true;
97 
 
 97 
 
98 
	// make sure the directory exissts
 98 
	// make sure the directory exissts
99 
	if ( !oDir.exists(newDir) )
 99 
	if ( !oDir.exists(newDir) )
100 
	{
 100 
	{
101 
		if ( !oDir.create(newDir) )
 101 
		if ( !oDir.create(newDir) )
102 
		{
 102 
		{
103 
			CLog::logf(CLog::Log_Install, 2, "Unable to create directory to backup original files, %s", newDir.c_str());
 103 
			CLog::logf(CLog::Log_Install, 2, "Unable to create directory to backup original files, %s", newDir.c_str());
104 
			addLogEntry(SPKINSTALL_CREATEDIRECTORY_FAIL, newDir, errors);
 104 
			addLogEntry(SPKINSTALL_CREATEDIRECTORY_FAIL, newDir.toString(), errors);
105 
			return false;
 105 
			return false;
106 
		}
 106 
		}
107 
 
 107 
 
108 
		CLog::logf(CLog::Log_Install, 2, "Created new directory, %s", newDir.c_str());
 108 
		CLog::logf(CLog::Log_Install, 2, "Created new directory, %s", newDir.c_str());
109 
		addLogEntry(SPKINSTALL_CREATEDIRECTORY, newDir, errors);
 109 
		addLogEntry(SPKINSTALL_CREATEDIRECTORY, newDir.toString(), errors);
110 
	}
 110 
	}
111 
 
 111 
 
112 
	// now lets copy the file
 112 
	// now lets copy the file
113 
	CFileIO CopyFile(f->filePointer());
 113 
	CFileIO CopyFile(f->filePointer());
114 
	if(CopyFile.copy(oDir.file(newDir + "/" + f->filename())))
 114 
	if(CopyFile.copy(oDir.file(newDir + L"/" + f->filename().toWString())))
115 
	{
 115 
	{
116 
		CLog::logf(CLog::Log_Install, 2, "Original file: %s has been backed up", f->getNameDirectory(NULL).c_str());
 116 
		CLog::logf(CLog::Log_Install, 2, "Original file: %s has been backed up", f->getNameDirectory(NULL).c_str());
117 
		addLogEntry(SPKINSTALL_ORIGINAL_BACKUP, f->getNameDirectory(NULL), errors);
 117 
		addLogEntry(SPKINSTALL_ORIGINAL_BACKUP, f->getNameDirectory(NULL), errors);
118 
		return true;
 118 
		return true;
119 
	}
 119 
	}
Line 287... Line 287...
287 
	for(auto itr = files.begin(); itr != files.end(); itr++)
 287 
	for(auto itr = files.begin(); itr != files.end(); itr++)
288 
	{
 288 
	{
289 
		CFileIO File(Dir.file((*itr)->str));
 289 
		CFileIO File(Dir.file((*itr)->str));
290
290
291 
		if ( File.extension().Compare(ext) )
 291 
		if ( File.extension().Compare(ext) )
292 
			_add(filetype, File.filename(), searchPath, pFiles);
 292 
			_add(filetype, File.filenameStr(), searchPath, pFiles);
293 
	}
 293 
	}
294 
}
 294 
}
295 
 
 295 
 
296 
/**
 296 
/**
297 
 * Get original file
 297 
 * Get original file