xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2026-02-01 10:24:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

4.37 beta

Browse Source
This commit is contained in:
Igor Pavlov
2006-03-19 00:00:00 +00:00
committed by Kornel Lesiński
parent 8304895f29
commit cb9eea7264
44 changed files with 691 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
7zip/FileManager/PanelCrc.cpp
+10 -3
View File
@@ -30,6 +30,7 @@ static const UInt32 kBufSize = (1 << 15);
struct CDirEnumerator
{
bool FlatMode;
UString BasePrefix;
UStringVector FileNames;
@@ -38,6 +39,8 @@ struct CDirEnumerator
int Index;
bool GetNextFile(NFind::CFileInfoW &fileInfo, bool &filled, UString &fullPath, DWORD &errorCode);
void Init();
CDirEnumerator(): FlatMode(false) {};
};
void CDirEnumerator::Init()
@@ -57,6 +60,10 @@ bool CDirEnumerator::GetNextFile(NFind::CFileInfoW &fileInfo, bool &filled, UStr
if (Index >= FileNames.Size())
return true;
const UString &path = FileNames[Index];
int pos = path.ReverseFind('\\');
resPath.Empty();
if (pos >= 0)
resPath = path.Left(pos + 1);
if (!NFind::FindFile(BasePrefix + path, fileInfo))
{
errorCode = ::GetLastError();
@@ -64,7 +71,6 @@ bool CDirEnumerator::GetNextFile(NFind::CFileInfoW &fileInfo, bool &filled, UStr
return false;
}
Index++;
resPath.Empty();
break;
}
bool found;
@@ -83,7 +89,7 @@ bool CDirEnumerator::GetNextFile(NFind::CFileInfoW &fileInfo, bool &filled, UStr
Prefixes.DeleteBack();
}
resPath += fileInfo.Name;
if (fileInfo.IsDirectory())
if (!FlatMode && fileInfo.IsDirectory())
{
UString prefix = resPath + (UString)(wchar_t)kDirDelimiter;
Enumerators.Add(NFind::CEnumeratorW(BasePrefix + prefix + (UString)(wchar_t)kAnyStringWildcard));
@@ -276,8 +282,9 @@ void CApp::CalculateCrc()
CThreadCrc combiner;
for (int i = 0; i < indices.Size(); i++)
combiner.DirEnumerator.FileNames.Add(srcPanel.GetItemName(indices[i]));
combiner.DirEnumerator.FileNames.Add(srcPanel.GetItemRelPath(indices[i]));
combiner.DirEnumerator.BasePrefix = srcPanel._currentFolderPrefix;
combiner.DirEnumerator.FlatMode = GetFlatMode();
CProgressDialog progressDialog;
combiner.ProgressDialog = &progressDialog;