xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-06 19:14:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

9.04 beta

Browse Source
This commit is contained in:
Igor Pavlov
2009-06-02 00:00:00 +00:00
committed by Kornel Lesiński
parent 8874e4fbc9
commit 829409452d
440 changed files with 19803 additions and 9941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CPP/7zip/UI/Common/ArchiveName.cpp
View File

@@ -2,12 +2,14 @@
#include "StdAfx.h"
#include "Windows/FileFind.h"
#include "Windows/FileDir.h"
#include "Windows/FileFind.h"
#include "ExtractingFilePath.h"
using namespace NWindows;
UString CreateArchiveName(const UString &srcName, bool fromPrev, bool keepName)
static UString CreateArchiveName2(const UString &srcName, bool fromPrev, bool keepName)
{
UString resultName = L"Archive";
if (fromPrev)
@@ -20,7 +22,7 @@ UString CreateArchiveName(const UString &srcName, bool fromPrev, bool keepName)
{
dirPrefix.Delete(dirPrefix.Length() - 1);
NFile::NFind::CFileInfoW fileInfo;
if (NFile::NFind::FindFile(dirPrefix, fileInfo))
if (fileInfo.Find(dirPrefix))
resultName = fileInfo.Name;
}
}
@@ -28,8 +30,9 @@ UString CreateArchiveName(const UString &srcName, bool fromPrev, bool keepName)
else
{
NFile::NFind::CFileInfoW fileInfo;
if (!NFile::NFind::FindFile(srcName, fileInfo))
return resultName;
if (!fileInfo.Find(srcName))
// return resultName;
return srcName;
resultName = fileInfo.Name;
if (!fileInfo.IsDir() && !keepName)
{
@@ -44,3 +47,8 @@ UString CreateArchiveName(const UString &srcName, bool fromPrev, bool keepName)
}
return resultName;
}
UString CreateArchiveName(const UString &srcName, bool fromPrev, bool keepName)
{
return GetCorrectFsPath(CreateArchiveName2(srcName, fromPrev, keepName));
}