github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-23 06:13:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: New FillDiff features

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6948 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-02-24 19:06:00 +00:00
parent a2a391f4e3
commit 3024f7af94
16 changed files with 389 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

118
uppsrc/TextDiffCtrl/DirDiff.cpp Normal file
View file

@ -0,0 +1,118 @@
#include "TextDiffCtrl.h"
namespace Upp {
void DirDiffDlg::GatherFilesDeep(Index<String>& files, const String& base, const String& path)
{
FindFile ff(AppendFileName(AppendFileName(base, path), "*.*"));
while(ff) {
String p = (path.GetCount() ? path + '/' : String()) + ff.GetName();
if(hidden || !ff.IsHidden()) {
if(ff.IsFile())
files.FindAdd(p);
else
if(ff.IsFolder())
GatherFilesDeep(files, base, p);
}
ff.Next();
}
}
bool FileEqual(const String& f1, const String& f2)
{
FileIn in1(f1);
FileIn in2(f2);
if(in1 && in2) {
while(!in1.IsEof() && !in2.IsEof()) {
String a = in1.Get(256 * 1024);
String b = in2.Get(256 * 1024);
if(a != b)
return false;
}
return true;
}
return false;
}
void DirDiffDlg::Compare()
{
Index<String> fs;
GatherFilesDeep(fs, ~dir1, Null);
GatherFilesDeep(fs, ~dir2, Null);
files.Clear();
Vector<String> f = fs.PickKeys();
Sort(f);
Progress pi(t_("Comparing.."));
pi.SetTotal(f.GetCount());
for(int i = 0; i < f.GetCount(); i++) {
if(pi.StepCanceled())
break;
String p1 = AppendFileName(~dir1, f[i]);
String p2 = AppendFileName(~dir2, f[i]);
if(!FileEqual(p1, p2))
files.Add(f[i], NativePathIcon(FileExists(p1) ? p1 : p2));
}
}
void DirDiffDlg::ClearFiles()
{
files.Clear();
compare.Enable(!IsNull(dir1) && !IsNull(dir2));
}
void DirDiffDlg::File()
{
String fn = files.GetCurrentName();
String p1 = AppendFileName(~dir1, fn);
String p2 = AppendFileName(~dir2, fn);
diff.Set(Null, Null);
if(GetFileLength(p1) < 4 * 1024 * 1024 && GetFileLength(p2) < 4 * 1024 * 1024)
diff.Set(LoadFile(p1), LoadFile(p2));
lfile <<= p1;
rfile <<= p2;
}
DirDiffDlg::DirDiffDlg()
{
int div = HorzLayoutZoom(4);
int cy = dir1.GetStdSize().cy;
int bcx = GetTextSize(t_("Compare"), StdFont()).cx * 12 / 10 + 2 * div;
hidden.SetLabel(t_("Hidden"));
compare.SetLabel(t_("Compare"));
int bcy = compare.GetStdSize().cy;
files_pane.Add(dir1.TopPos(0, cy).HSizePos());
files_pane.Add(dir2.TopPos(cy + div, cy).HSizePos());
files_pane.Add(hidden.TopPos(2 * cy + 2 * div, bcy).HSizePos(0, bcx));
files_pane.Add(compare.TopPos(2 * cy + 2 * div, bcy).RightPos(0, bcx));
files_pane.Add(files.VSizePos(2 * cy + bcy + 3 * div, 0).HSizePos());
Add(files_diff.SizePos());
files_diff.Set(files_pane, diff);
files_diff.SetPos(2000);
Sizeable().Zoomable();
seldir1.Attach(dir1);
seldir2.Attach(dir2);
compare <<= THISBACK(Compare);
dir1 <<= THISBACK(ClearFiles);
dir2 <<= THISBACK(ClearFiles);
files.WhenSel = THISBACK(File);
lfile.Height(EditField::GetStdHeight());
lfile.SetReadOnly();
diff.InsertFrameLeft(lfile);
rfile.Height(EditField::GetStdHeight());
rfile.SetReadOnly();
diff.InsertFrameRight(rfile);
Icon(DiffImg::Diff());
}
};