FIX: Bug [0001326] You cannot search inside archive file from inside archive file

src/fFindDlg.pas

@@ -298,6 +298,7 @@ type
     procedure AfterSearchStopped;  //update button states after stop search(ThreadTerminate call this method)
     procedure AfterSearchFocus;     //set correct focus after search stopped
 
+    procedure FindInArchive(AFileView: TFileView);
     procedure FillFindOptions(out FindOptions: TSearchTemplateRec; SetStartPath: boolean);
     procedure FindOptionsToDSXSearchRec(const AFindOptions: TSearchTemplateRec;
                                         out SRec: TDsxSearchRecord);
@@ -392,7 +393,7 @@ uses
   uSearchResultFileSource, uFile, uFileProperty, uColumnsFileView,
   uFileViewNotebook, uKeyboard, uOSUtils, uArchiveFileSourceUtil,
   DCOSUtils, RegExpr, uDebug, uShowMsg, uConvEncoding, uColumns,
-  uFileFunctions, uFileSorting;
+  uFileFunctions, uFileSorting, uWcxArchiveFileSource, WcxPlugin;
 
 const
   TimeUnitToComboIndex: array[TTimeUnit] of integer = (0, 1, 2, 3, 4, 5, 6);
@@ -523,6 +524,8 @@ begin
           FreeAndNil(ASelectedFiles);
         end;
 
+      FindInArchive(FileView);
+
       if Length(TemplateName) > 0 then
       begin
         FUpdating := True;
@@ -1325,6 +1328,41 @@ begin
   end;
 end;
 
+procedure TfrmFindDlg.FindInArchive(AFileView: TFileView);
+var
+  AEnabled: Boolean;
+  AFileSource: IWcxArchiveFileSource;
+begin
+  AEnabled:= aFileView.FileSource.IsClass(TWcxArchiveFileSource);
+
+  cbOpenedTabs.Visible:= not AEnabled;
+  cbSelectedFiles.Visible:= not AEnabled;
+  cbFindInArchive.Enabled:= not AEnabled;
+  cbReplaceText.Enabled:= not AEnabled;
+  cmbFindPathStart.Enabled:= not AEnabled;
+  btnChooseFolder.Enabled:= not AEnabled;
+  chkDuplicates.Enabled:= not AEnabled;
+  cmbSearchDepth.Enabled:=  not AEnabled;
+  tsPlugins.TabVisible:= not AEnabled;
+  actPagePlugins.Enabled:= not AEnabled;
+  cbFollowSymLinks.Enabled:= not AEnabled;
+
+  if AEnabled then AFileSource:= (aFileView.FileSource as IWcxArchiveFileSource);
+  cbFindText.Enabled:= (AEnabled = False) or (AFileSource.PluginCapabilities and PK_CAPS_SEARCHTEXT <> 0);
+
+  if AEnabled then
+  begin
+    cmbSearchDepth.ItemIndex:= 0;
+    cbFindInArchive.Checked:= True;
+    cbReplaceText.Checked:= False;
+    chkDuplicates.Checked:= False;
+    cbOpenedTabs.Checked:= False;
+    cbSelectedFiles.Checked:= False;
+    cbFollowSymLinks.Checked:= False;
+    cmbFindPathStart.Text:= aFileView.CurrentAddress;
+  end;
+end;
+
 procedure TfrmFindDlg.FoundedStringCopyAdded(Sender: TObject);
 begin
   if FoundedStringCopy.Count > 0 then
@@ -1491,15 +1529,18 @@ begin
   Self.Repaint;
   Application.ProcessMessages;
 
-  if (cmbFindPathStart.Text = '') then begin
-    cmbFindPathStart.Text:= mbGetCurrentDir;
-  end;
-  for sPath in SplitPath(cmbFindPathStart.Text) do
+  if cbFindInArchive.Enabled then
   begin
-    if not mbDirectoryExists(sPath) then
+    if (cmbFindPathStart.Text = '') then begin
+      cmbFindPathStart.Text:= mbGetCurrentDir;
+    end;
+    for sPath in SplitPath(cmbFindPathStart.Text) do
     begin
-      ShowMessage(Format(rsFindDirNoEx, [sPath]));
-      Exit;
+      if not mbDirectoryExists(sPath) then
+      begin
+        ShowMessage(Format(rsFindDirNoEx, [sPath]));
+        Exit;
+      end;
     end;
   end;
 
@@ -1602,6 +1643,7 @@ begin
         with FFindThread do
         begin
           Items := FoundedStringCopy;
+          Archive:= not cbFindInArchive.Enabled;
           OnTerminate := @ThreadTerminate; // will update the buttons after search is finished
         end;
 
@@ -2124,8 +2166,12 @@ begin
     begin
       if StartPath <> '' then
         lblSearchContents.Caption := '"' + FilesMasks + '" -> "' + StartPath + '"'
-      else
+      else begin
         lblSearchContents.Caption := '"' + FilesMasks + '"';
+      end;
+      pnlLoadSaveBottom.Enabled:= cbFindInArchive.Enabled or
+                                  ((Duplicates = False) and (ContentPlugin = False) and
+                                   (SearchPlugin = EmptyStr) and (IsReplaceText = False));
     end;
   end;
 end;
@@ -2149,19 +2195,24 @@ procedure TfrmFindDlg.LoadTemplate(const Template: TSearchTemplateRec);
 begin
   with Template do
   begin
-    if StartPath <> '' then
-      cmbFindPathStart.Text := StartPath;
+    if cbFindInArchive.Enabled then
+    begin
+      if StartPath <> '' then
+        cmbFindPathStart.Text := StartPath;
+      cbFollowSymLinks.Checked := FollowSymLinks;
+      cbFindInArchive.Checked := FindInArchives;
+      if (SearchDepth + 1 >= 0) and (SearchDepth + 1 < cmbSearchDepth.Items.Count) then
+        cmbSearchDepth.ItemIndex := SearchDepth + 1
+      else
+        cmbSearchDepth.ItemIndex := 0;
+    end;
     cmbExcludeDirectories.Text := ExcludeDirectories;
     cmbFindFileMask.Text := FilesMasks;
     cmbExcludeFiles.Text := ExcludeFiles;
-    if (SearchDepth + 1 >= 0) and (SearchDepth + 1 < cmbSearchDepth.Items.Count) then
-      cmbSearchDepth.ItemIndex := SearchDepth + 1
-    else
-      cmbSearchDepth.ItemIndex := 0;
+
     cbRegExp.Checked := RegExp;
     cbPartialNameSearch.Checked := IsPartialNameSearch;
-    cbFollowSymLinks.Checked := FollowSymLinks;
-    cbFindInArchive.Checked := FindInArchives;
+
     // attributes
     edtAttrib.Text := AttributesPattern;
     // file date/time
@@ -2194,22 +2245,29 @@ begin
     // find/replace text
     cbFindText.Checked := IsFindText;
     cmbFindText.Text := FindText;
-    cbReplaceText.Checked := IsReplaceText;
-    cmbReplaceText.Text := ReplaceText;
+    if cbFindInArchive.Enabled then
+    begin
+      cbReplaceText.Checked := IsReplaceText;
+      cmbReplaceText.Text := ReplaceText;
+    end;
     chkHex.Checked := HexValue;
     cbCaseSens.Checked := CaseSensitive;
     cbNotContainingText.Checked := NotContainingText;
     cbTextRegExp.Checked := TextRegExp;
     cmbEncoding.Text := TextEncoding;
-    // duplicates
-    chkDuplicates.Checked := Duplicates;
-    chkDuplicateName.Checked := DuplicateName;
-    chkDuplicateSize.Checked := DuplicateSize;
-    chkDuplicateHash.Checked := DuplicateHash;
-    chkDuplicateContent.Checked := DuplicateContent;
-    // plugins
-    cmbPlugin.Text := SearchPlugin;
-    frmContentPlugins.Load(Template);
+
+    if cbFindInArchive.Enabled then
+    begin
+      // duplicates
+      chkDuplicates.Checked := Duplicates;
+      chkDuplicateName.Checked := DuplicateName;
+      chkDuplicateSize.Checked := DuplicateSize;
+      chkDuplicateHash.Checked := DuplicateHash;
+      chkDuplicateContent.Checked := DuplicateContent;
+      // plugins
+      cmbPlugin.Text := SearchPlugin;
+      frmContentPlugins.Load(Template);
+    end;
 
     //Let's switch to the most pertinent tab after having load the template.
     //If we would just load and no switching, user has not a real feedback visually he loaded something.

src/ufindthread.pas

@@ -61,6 +61,7 @@ type
     FFilesMasksRegExp: TRegExprW;
     FExcludeFilesRegExp: TRegExprW;
     FRegExpr: TRegExpr;
+    FArchive: Boolean;
 
     FTimeSearchStart:TTime;
     FTimeSearchEnd:TTime;
@@ -97,6 +98,7 @@ type
     property FilesFound: Integer read FFilesFound;
     property CurrentDir: String read FCurrentDir;
     property TimeOfScan:TTime read GetTimeOfScan;
+    property Archive: Boolean write FArchive;
 
     property Items:TStrings write FItems;
   end;
@@ -235,7 +237,11 @@ begin
   try
     Assert(Assigned(FItems), 'Assert: FItems is empty');
     FCurrentDepth:= -1;
-    if not Assigned(FSelectedFiles) or (FSelectedFiles.Count = 0) then
+    if FArchive then
+    begin
+      FindInArchive(FSearchTemplate.StartPath);
+    end
+    else if not Assigned(FSelectedFiles) or (FSelectedFiles.Count = 0) then
     begin
       // Normal search (all directories).
       for sPath in SplitPath(FSearchTemplate.StartPath) do

src/umaincommands.pas

@@ -393,7 +393,7 @@ uses fOptionsPluginsBase, fOptionsPluginsDSX, fOptionsPluginsWCX,
      DCOSUtils, DCStrUtils, DCBasicTypes, uFileSourceCopyOperation, fSyncDirsDlg,
      uHotDir, DCXmlConfig, dmCommonData, fOptionsFrame, foptionsDirectoryHotlist,
      fMainCommandsDlg, uConnectionManager, fOptionsFavoriteTabs, fTreeViewMenu,
-     uArchiveFileSource, fOptionsHotKeys, fBenchmark, uAdministrator
+     uArchiveFileSource, fOptionsHotKeys, fBenchmark, uAdministrator, uWcxArchiveFileSource
      {$IFDEF COLUMNSFILEVIEW_VTV}
      , uColumnsFileViewVtv
      {$ELSE}
@@ -3253,8 +3253,11 @@ procedure TMainCommands.cm_Search(const Params: array of string);
 var
   TemplateName: String;
 begin
-  if not frmMain.ActiveFrame.FileSource.IsClass(TFileSystemFileSource) then
+  if not (frmMain.ActiveFrame.FileSource.IsClass(TFileSystemFileSource) or
+    frmMain.ActiveFrame.FileSource.IsClass(TWcxArchiveFileSource)) then
+  begin
     msgError(rsMsgErrNotSupported)
+  end
   else begin
     if Length(Params) > 0 then
       TemplateName:= Params[0]