github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

theide: Fixed ordering issue in package import

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1317 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-06-17 06:40:36 +00:00
parent e28a33616f
commit fa03625eee
1 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

48
uppsrc/ide/UppWspc.cpp
View file

@ -360,28 +360,35 @@ void WorkspaceWork::DoImport(const String& dir, const String& mask, bool sep, Pr
String active = GetActivePackage();
if(active.IsEmpty()) return;
FindFile ff(AppendFileName(dir, "*.*"));
Vector<String> files;
Vector<String> dirs;
while(ff) {
String ft = ff.GetName();
String p = AppendFileName(dir, ft);
if(ff.IsFile()) {
if(ff.IsFile() && PatternMatchMulti(mask, ff.GetName())) {
if(pi.StepCanceled()) return;
if(sep) {
Package::File& f = actual.file.Add();
f = GetFileName(dir);
f.separator = f.readonly = true;
sep = false;
}
SaveFile(PackagePath(ft), LoadFile(p));
Package::File& f = actual.file.Add();
f = ft;
f.separator = f.readonly = false;
}
}
String p = AppendFileName(dir, ff.GetName());
if(ff.IsFile() && PatternMatchMulti(mask, ff.GetName()))
files.Add(p);
if(ff.IsFolder())
DoImport(p, mask, true, pi);
dirs.Add(p);
ff.Next();
}
if(sep && files.GetCount()) {
Package::File& f = actual.file.Add();
f = GetFileTitle(dir);
f.separator = f.readonly = true;
sep = false;
}
Sort(files);
Sort(dirs);
for(int i = 0; i < files.GetCount(); i++) {
if(pi.StepCanceled())
throw String();
String name = GetFileName(files[i]);
SaveFile(SourcePath(active, name), LoadFile(files[i]));
Package::File& f = actual.file.Add();
f = name;
f.separator = f.readonly = false;
}
for(int i = 0; i < dirs.GetCount(); i++)
DoImport(dirs[i], mask, true, pi);
}
void WorkspaceWork::Import()
@ -395,7 +402,10 @@ void WorkspaceWork::Import()
int fci = filelist.GetCursor();
int cs = filelist.GetSbPos();
int ci = fci >= 0 && fci < fileindex.GetCount() ? fileindex[fci] : -1;
DoImport(~dlg.folder, ~dlg.files, false, pi);
try {
DoImport(~dlg.folder, ~dlg.files, false, pi);
}
catch(String) {}
SaveLoadPackage();
filelist.SetSbPos(cs);
filelist.SetCursor(fci >= 0 ? fci : filelist.GetCount() - 1);