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

9.19

Browse Source
This commit is contained in:
Igor Pavlov
2010-11-11 00:00:00 +00:00
committed by Kornel Lesiński
parent c65230d858
commit b75af1bba6
25 changed files with 314 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
CPP/7zip/UI/Common/Update.cpp
View File

@@ -387,12 +387,11 @@ static HRESULT Compress(
CMyComPtr<ISequentialOutStream> outStream;
const UString &archiveName = archivePath.GetFinalPath();
if (!stdOutMode)
{
UString resultPath;
int pos;
if (!NFile::NDirectory::MyGetFullPathName(archiveName, resultPath, pos))
if (!NFile::NDirectory::MyGetFullPathName(archivePath.GetFinalPath(), resultPath, pos))
throw 1417161;
NFile::NDirectory::CreateComplexDirectory(resultPath.Left(pos));
}
@@ -676,35 +675,38 @@ HRESULT UpdateArchive(
}
}
const UString archiveName = options.ArchivePath.GetFinalPath();
CArchiveLink archiveLink;
NFind::CFileInfoW archiveFileInfo;
CArchiveLink arcLink;
const UString arcPath = options.ArchivePath.GetFinalPath();
if (archiveFileInfo.Find(archiveName))
if (!options.ArchivePath.OriginalPath.IsEmpty())
{
if (archiveFileInfo.IsDir())
throw "there is no such archive";
if (options.VolumesSizes.Size() > 0)
return E_NOTIMPL;
CIntVector formatIndices;
if (options.MethodMode.FormatIndex >= 0)
formatIndices.Add(options.MethodMode.FormatIndex);
HRESULT result = archiveLink.Open2(codecs, formatIndices, false, NULL, archiveName, openCallback);
if (result == E_ABORT)
return result;
RINOK(callback->OpenResult(archiveName, result));
RINOK(result);
if (archiveLink.VolumePaths.Size() > 1)
NFind::CFileInfoW fi;
if (fi.Find(arcPath))
{
errorInfo.SystemError = (DWORD)E_NOTIMPL;
errorInfo.Message = L"Updating for multivolume archives is not implemented";
return E_NOTIMPL;
if (fi.IsDir())
throw "there is no such archive";
if (options.VolumesSizes.Size() > 0)
return E_NOTIMPL;
CIntVector formatIndices;
if (options.MethodMode.FormatIndex >= 0)
formatIndices.Add(options.MethodMode.FormatIndex);
HRESULT result = arcLink.Open2(codecs, formatIndices, false, NULL, arcPath, openCallback);
if (result == E_ABORT)
return result;
RINOK(callback->OpenResult(arcPath, result));
RINOK(result);
if (arcLink.VolumePaths.Size() > 1)
{
errorInfo.SystemError = (DWORD)E_NOTIMPL;
errorInfo.Message = L"Updating for multivolume archives is not implemented";
return E_NOTIMPL;
}
CArc &arc = arcLink.Arcs.Back();
arc.MTimeDefined = !fi.IsDevice;
arc.MTime = fi.MTime;
}
CArc &arc = archiveLink.Arcs.Back();
arc.MTimeDefined = !archiveFileInfo.IsDevice;
arc.MTime = archiveFileInfo.MTime;
}
else
{
@@ -771,7 +773,7 @@ HRESULT UpdateArchive(
bool createTempFile = false;
bool thereIsInArchive = archiveLink.IsOpen;
bool thereIsInArchive = arcLink.IsOpen;
if (!options.StdOutMode && options.UpdateArchiveItself)
{
@@ -800,7 +802,8 @@ HRESULT UpdateArchive(
// ap.Temp = true;
// ap.TempPrefix = tempDirPrefix;
}
if (i > 0 || !createTempFile)
if (!options.StdOutMode &&
(i > 0 || !createTempFile))
{
const UString &path = ap.GetFinalPath();
if (NFind::DoesFileOrDirExist(path))
@@ -816,18 +819,18 @@ HRESULT UpdateArchive(
CObjectVector<CArcItem> arcItems;
if (thereIsInArchive)
{
RINOK(EnumerateInArchiveItems(censor, archiveLink.Arcs.Back(), arcItems));
RINOK(EnumerateInArchiveItems(censor, arcLink.Arcs.Back(), arcItems));
}
RINOK(UpdateWithItemLists(codecs, options,
thereIsInArchive ? archiveLink.GetArchive() : 0,
thereIsInArchive ? arcLink.GetArchive() : 0,
arcItems, dirItems,
tempFiles, errorInfo, callback));
if (thereIsInArchive)
{
RINOK(archiveLink.Close());
archiveLink.Release();
RINOK(arcLink.Close());
arcLink.Release();
}
tempFiles.Paths.Clear();
@@ -838,19 +841,19 @@ HRESULT UpdateArchive(
CArchivePath &ap = options.Commands[0].ArchivePath;
const UString &tempPath = ap.GetTempPath();
if (thereIsInArchive)
if (!NDirectory::DeleteFileAlways(archiveName))
if (!NDirectory::DeleteFileAlways(arcPath))
{
errorInfo.SystemError = ::GetLastError();
errorInfo.Message = L"7-Zip cannot delete the file";
errorInfo.FileName = archiveName;
errorInfo.FileName = arcPath;
return E_FAIL;
}
if (!NDirectory::MyMoveFile(tempPath, archiveName))
if (!NDirectory::MyMoveFile(tempPath, arcPath))
{
errorInfo.SystemError = ::GetLastError();
errorInfo.Message = L"7-Zip cannot move the file";
errorInfo.FileName = tempPath;
errorInfo.FileName2 = archiveName;
errorInfo.FileName2 = arcPath;
return E_FAIL;
}
}