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

new feature: use CompressDialog settings for "Add to xyz.7z"

Browse Source 
- the standard 7-Zip will always use LZMA2 Level 5
- my version used always: ZStandard Level 3
- but now, it uses: the registry settings from the last CompressDialog
This commit is contained in:
Tino Reichardt
2017-05-18 14:43:39 +02:00
parent 9e94cf8abf
commit 6936476598
2 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
CPP/7zip/UI/Common/CompressCall.cpp
View File

@@ -18,6 +18,7 @@
#include "../FileManager/RegistryUtils.h" #include "../FileManager/RegistryUtils.h"
#include "ZipRegistry.h"
#include "CompressCall.h" #include "CompressCall.h"
using namespace NWindows; using namespace NWindows;
@@ -41,6 +42,7 @@ using namespace NWindows;
#define kStopSwitchParsing " --" #define kStopSwitchParsing " --"
#define kLargePagesDisable " -slp-" #define kLargePagesDisable " -slp-"
static NCompression::CInfo m_RegistryInfo;
extern HWND g_HWND; extern HWND g_HWND;
UString GetQuotedString(const UString &s) UString GetQuotedString(const UString &s)
@@ -176,6 +178,29 @@ static HRESULT CreateMap(const UStringVector &names,
return S_OK; return S_OK;
} }
int FindRegistryFormat(const UString &name)
{
FOR_VECTOR (i, m_RegistryInfo.Formats)
{
const NCompression::CFormatOptions &fo = m_RegistryInfo.Formats[i];
if (name.IsEqualTo_NoCase(GetUnicodeString(fo.FormatID)))
return i;
}
return -1;
}
int FindRegistryFormatAlways(const UString &name)
{
int index = FindRegistryFormat(name);
if (index < 0)
{
NCompression::CFormatOptions fo;
fo.FormatID = GetSystemString(name);
index = m_RegistryInfo.Formats.Add(fo);
}
return index;
}
HRESULT CompressFiles( HRESULT CompressFiles(
const UString &arcPathPrefix, const UString &arcPathPrefix,
const UString &arcName, const UString &arcName,
@@ -186,7 +211,7 @@ HRESULT CompressFiles(
{ {
MY_TRY_BEGIN MY_TRY_BEGIN
UString params ('a'); UString params ('a');
CFileMapping fileMapping; CFileMapping fileMapping;
NSynchronization::CManualResetEvent event; NSynchronization::CManualResetEvent event;
params += kIncludeSwitch; params += kIncludeSwitch;
@@ -194,9 +219,30 @@ HRESULT CompressFiles(
if (!arcType.IsEmpty()) if (!arcType.IsEmpty())
{ {
int index;
params += kArchiveTypeSwitch; params += kArchiveTypeSwitch;
params += arcType; params += arcType;
m_RegistryInfo.Load();
index = FindRegistryFormatAlways(arcType);
if (index >= 0)
{
char temp[32];
const NCompression::CFormatOptions &fo = m_RegistryInfo.Formats[index];
params += " -m0=";
params += fo.Method;
params += " -mx";
ConvertUInt64ToString(fo.Level, temp);
params += temp;
if (fo.NumThreads)
{
params += " -mmt";
ConvertUInt64ToString(fo.NumThreads, temp);
params += temp;
}
}
} }
// for testing current params, /TR 2017-05-18
// ErrorMessage(params);
if (email) if (email)
params += kEmailSwitch; params += kEmailSwitch;

2
CPP/7zip/UI/FileManager/ViewSettings.cpp
View File

@@ -15,7 +15,7 @@
using namespace NWindows; using namespace NWindows;
using namespace NRegistry; using namespace NRegistry;
#define REG_PATH_FM TEXT("Software") TEXT(STRING_PATH_SEPARATOR) TEXT("7-Zip") TEXT(STRING_PATH_SEPARATOR) TEXT("FM") #define REG_PATH_FM TEXT("Software") TEXT(STRING_PATH_SEPARATOR) TEXT("7-Zip-ZStandard") TEXT(STRING_PATH_SEPARATOR) TEXT("FM")
static LPCTSTR const kCUBasePath = REG_PATH_FM; static LPCTSTR const kCUBasePath = REG_PATH_FM;
static LPCTSTR const kCulumnsKeyName = REG_PATH_FM TEXT(STRING_PATH_SEPARATOR) TEXT("Columns"); static LPCTSTR const kCulumnsKeyName = REG_PATH_FM TEXT(STRING_PATH_SEPARATOR) TEXT("Columns");