Use Extract dialog when extracting without selection. (#420)

M2Team · May 26, 2024 · b78c093 · b78c093
1 parent b45dc7e
commit b78c093
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 2 deletions.
diff --git a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/Panel.cpp b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/Panel.cpp
@@ -988,7 +988,7 @@ void CPanel::ExtractArchives()
 {
   if (_parentFolders.Size() > 0)
   {
-    _panelCallback->OnCopy(false, false);
+    ExtractFromArchive();
     return;
   }
   CRecordVector<UInt32> indices;
@@ -1015,6 +1015,41 @@ void CPanel::ExtractArchives()
       );
 }
 
+void CPanel::ExtractFromArchive()
+{
+  if (_parentFolders.Size() > 1) {
+    _panelCallback->OnCopy(false, false);
+    return;
+  }
+
+  CRecordVector<UInt32> indices;
+  GetOperatedItemIndices(indices);
+  if (indices.Size() > 0) {
+    _panelCallback->OnCopy(false, false);
+    return;
+  }
+
+  UString path = GetFsPath();
+  if (IsPathSepar(path.Back()))
+      path.DeleteBack();
+  if (path != _parentFolders[0].VirtualPath) {
+    _panelCallback->OnCopy(false, false);
+    return;
+  }
+  UStringVector paths;
+  paths.Add(path);
+  UString outFolder = GetSubFolderNameForExtract2(path);
+
+  CContextMenuInfo ci;
+  ci.Load();
+
+  ::ExtractArchives(paths, outFolder
+      , true // showDialog
+      , false // elimDup
+      , ci.WriteZone
+      );
+}
+
 /*
 static void AddValuePair(UINT resourceID, UInt64 value, UString &s)
 {

diff --git a/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/Panel.h b/NanaZip.UI.Classic/SevenZip/CPP/7zip/UI/FileManager/Panel.h
@@ -850,6 +850,7 @@ class CPanel: public NWindows::NControl::CWindow2
 
   void GetFilePaths(const CRecordVector<UInt32> &indices, UStringVector &paths, bool allowFolders = false);
   void ExtractArchives();
+  void ExtractFromArchive();
   void TestArchives();
 
   HRESULT CopyTo(CCopyToOptions &options,

diff --git a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/Panel.cpp b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/Panel.cpp
@@ -988,7 +988,7 @@ void CPanel::ExtractArchives()
 {
   if (_parentFolders.Size() > 0)
   {
-    _panelCallback->OnCopy(false, false);
+    ExtractFromArchive();
     return;
   }
   CRecordVector<UInt32> indices;
@@ -1015,6 +1015,41 @@ void CPanel::ExtractArchives()
       );
 }
 
+void CPanel::ExtractFromArchive()
+{
+  if (_parentFolders.Size() > 1) {
+    _panelCallback->OnCopy(false, false);
+    return;
+  }
+
+  CRecordVector<UInt32> indices;
+  GetOperatedItemIndices(indices);
+  if (indices.Size() > 0) {
+    _panelCallback->OnCopy(false, false);
+    return;
+  }
+
+  UString path = GetFsPath();
+  if (IsPathSepar(path.Back()))
+      path.DeleteBack();
+  if (path != _parentFolders[0].VirtualPath) {
+    _panelCallback->OnCopy(false, false);
+    return;
+  }
+  UStringVector paths;
+  paths.Add(path);
+  UString outFolder = GetSubFolderNameForExtract2(path);
+
+  CContextMenuInfo ci;
+  ci.Load();
+
+  ::ExtractArchives(paths, outFolder
+      , true // showDialog
+      , false // elimDup
+      , ci.WriteZone
+      );
+}
+
 /*
 static void AddValuePair(UINT resourceID, UInt64 value, UString &s)
 {

diff --git a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/Panel.h b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/Panel.h
@@ -850,6 +850,7 @@ class CPanel: public NWindows::NControl::CWindow2
 
   void GetFilePaths(const CRecordVector<UInt32> &indices, UStringVector &paths, bool allowFolders = false);
   void ExtractArchives();
+  void ExtractFromArchive();
   void TestArchives();
 
   HRESULT CopyTo(CCopyToOptions &options,