GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2024-12-24 13:55:36 +03:00
Code Issues Projects Releases Wiki Activity

fixed several FTP bugs (thanks bail!)

Browse Source
This commit is contained in:
Christian Hammacher 2007-03-07 20:38:42 +00:00
parent ea34c2c78a
commit b793b80360
3 changed files with 95 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
installer/installer/AMXInstaller.exe
View File

Binary file not shown.

25
installer/installer/UnitfrmMain.dfm
View File

@ -4,7 +4,7 @@ object frmMain: TfrmMain
BorderIcons = [biSystemMenu, biMinimize] BorderIcons = [biSystemMenu, biMinimize]
BorderStyle = bsSingle BorderStyle = bsSingle
Caption = 'AMX Mod X Installer' Caption = 'AMX Mod X Installer'
ClientHeight = 355 ClientHeight = 396
ClientWidth = 527 ClientWidth = 527
Color = clBtnFace Color = clBtnFace
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -46,7 +46,7 @@ object frmMain: TfrmMain
TextHeight = 13 TextHeight = 13
object bvlSpace: TBevel object bvlSpace: TBevel
Left = 0 Left = 0
Top = 314 Top = 355
Width = 527 Width = 527
Height = 3 Height = 3
Align = alBottom Align = alBottom
@ -56,8 +56,8 @@ object frmMain: TfrmMain
Left = 0 Left = 0
Top = 0 Top = 0
Width = 527 Width = 527
Height = 314 Height = 355
ActivePage = jspWelcome ActivePage = jspFTP
PropagateEnable = False PropagateEnable = False
Align = alClient Align = alClient
OnChange = jplWizardChange OnChange = jplWizardChange
@ -65,13 +65,13 @@ object frmMain: TfrmMain
Left = 0 Left = 0
Top = 0 Top = 0
Width = 527 Width = 527
Height = 314 Height = 355
Color = clWhite Color = clWhite
object imgInstall: TImage object imgInstall: TImage
Left = 0 Left = 0
Top = 0 Top = 0
Width = 164 Width = 164
Height = 314 Height = 355
Align = alLeft Align = alLeft
AutoSize = True AutoSize = True
Picture.Data = { Picture.Data = {
@ -4968,7 +4968,7 @@ object frmMain: TfrmMain
Left = 0 Left = 0
Top = 0 Top = 0
Width = 527 Width = 527
Height = 314 Height = 355
object pnlLicense: TPanel object pnlLicense: TPanel
Left = 0 Left = 0
Top = 0 Top = 0
@ -5760,7 +5760,7 @@ object frmMain: TfrmMain
Left = 0 Left = 0
Top = 0 Top = 0
Width = 527 Width = 527
Height = 314 Height = 355
object lblLocalHint: TLabel object lblLocalHint: TLabel
Left = 136 Left = 136
Top = 118 Top = 118
@ -5967,7 +5967,7 @@ object frmMain: TfrmMain
Left = 0 Left = 0
Top = 0 Top = 0
Width = 527 Width = 527
Height = 314 Height = 355
object lblInfo: TLabel object lblInfo: TLabel
Left = 134 Left = 134
Top = 110 Top = 110
@ -6091,7 +6091,7 @@ object frmMain: TfrmMain
Left = 0 Left = 0
Top = 0 Top = 0
Width = 527 Width = 527
Height = 314 Height = 355
OnShow = jspFTPShow OnShow = jspFTPShow
object lblStep1: TLabel object lblStep1: TLabel
Left = 44 Left = 44
@ -6346,6 +6346,7 @@ object frmMain: TfrmMain
Indent = 19 Indent = 19
ReadOnly = True ReadOnly = True
TabOrder = 0 TabOrder = 0
OnChange = trvDirectoriesChange
OnCollapsing = trvDirectoriesCollapsing OnCollapsing = trvDirectoriesCollapsing
OnExpanding = trvDirectoriesExpanding OnExpanding = trvDirectoriesExpanding
OnExpanded = trvDirectoriesExpanded OnExpanded = trvDirectoriesExpanded
@ -6413,7 +6414,7 @@ object frmMain: TfrmMain
Left = 0 Left = 0
Top = 0 Top = 0
Width = 527 Width = 527
Height = 314 Height = 355
Caption = 'jspInstallProgress' Caption = 'jspInstallProgress'
object ggeAll: TFlatGauge object ggeAll: TFlatGauge
Left = 8 Left = 8
@ -6559,7 +6560,7 @@ object frmMain: TfrmMain
end end
object pnlButtons: TPanel object pnlButtons: TPanel
Left = 0 Left = 0
Top = 317 Top = 358
Width = 527 Width = 527
Height = 38 Height = 38
Align = alBottom Align = alBottom

119
installer/installer/UnitfrmMain.pas
View File

@ -137,6 +137,7 @@ type
procedure trvModsClick(Sender: TObject); procedure trvModsClick(Sender: TObject);
procedure trvDirectoriesMouseDown(Sender: TObject; procedure trvDirectoriesMouseDown(Sender: TObject;
Button: TMouseButton; Shift: TShiftState; X, Y: Integer); Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
procedure trvDirectoriesChange(Sender: TObject; Node: TTreeNode);
private private
OldProgress: Integer; OldProgress: Integer;
CurrProgress: Integer; CurrProgress: Integer;
@ -605,7 +606,7 @@ end;
procedure TfrmMain.cmdConnectClick(Sender: TObject); procedure TfrmMain.cmdConnectClick(Sender: TObject);
var i: integer; var i: integer;
eStr: TStringList; eStr: TStringList;
CurNode: TTreeNode; CurNode, HomeNode, OldNode: TTreeNode;
Path: String; Path: String;
begin begin
if (Trim(txtHost.Text) = '') or (Trim(txtUsername.Text) = '') then if (Trim(txtHost.Text) = '') or (Trim(txtUsername.Text) = '') then
@ -649,49 +650,66 @@ begin
cmdCancel.Caption := '&Close'; cmdCancel.Caption := '&Close';
cmdNext.Enabled := True; cmdNext.Enabled := True;
// ... change to / and create all the directories ... // ... change to / and create all the directories ...
CurNode := nil; HomeNode := nil;
if (Path <> '/') then begin try
try if (Path <> '/') then
IdFTP.ChangeDir('/'); IdFTP.ChangeDir('/');
with GetAllDirs do begin
for i := 0 to Count -1 do begin trvDirectories.Items.BeginUpdate;
if (Assigned(CurNode)) then with GetAllDirs do begin
trvDirectories.Items.AddChild(trvDirectories.Items.Add(nil, Strings[i]), 'Scanning...') for i := 0 to Count -1 do begin
else begin CurNode := trvDirectories.Items.Add(nil, Strings[i]);
CurNode := trvDirectories.Items.Add(nil, Strings[i]); if (Pos('/' + CurNode.Text + '/', Path) = 0) then begin
trvDirectories.Items.AddChild(CurNode, 'Scanning...'); trvDirectories.Items.AddChild(CurNode, 'Scanning...');
if (Pos('/' + CurNode.Text + '/', Path) = 0) then CurNode.Data := Pointer(2);
CurNode := nil; end
end else begin
HomeNode := CurNode;
CurNode.Data := Pointer(1);
Repaint;
end; end;
Free;
end; end;
IdFTP.ChangeDir(Path); Free;
except
if (IdFTP.Connected) then
IdFTP.ChangeDir(Path)
else
IdFTP.Connect;
end; end;
trvDirectories.Items.EndUpdate;
trvDirectories.TopItem := HomeNode;
IdFTP.ChangeDir(Path);
except
trvDirectories.Items.EndUpdate;
if (IdFTP.Connected) then
IdFTP.ChangeDir(Path)
else
IdFTP.Connect;
end; end;
// ... find directories in start path ... // ... find directories in start path ...
if eStr.Count <> 0 then begin CurNode := HomeNode;
for i := 0 to eStr.Count -1 do begin OldNode := nil;
if (not ((i = 0) and (Assigned(CurNode)))) then for i := 1 to eStr.Count -1 do begin
CurNode := trvDirectories.Items.AddChild(CurNode, eStr[i]); if (Assigned(CurNode)) then begin
CurNode := trvDirectories.Items.AddChild(CurNode, eStr[i]);
if (Assigned(OldNode)) then
OldNode.Expand(False);
CurNode.Data := Pointer(1);
OldNode := CurNode;
end; end;
end; end;
trvDirectories.Selected := CurNode;
eStr.Free;
// ... scan for directories ...
with GetAllDirs do begin
for i := 0 to Count -1 do
trvDirectories.Items.AddChild(trvDirectories.Items.AddChild(CurNode, Strings[i]), 'Scanning...');
Free;
end;
if (Assigned(CurNode)) then begin
trvDirectories.Items.AddChild(CurNode, 'Scanning...');
CurNode.Data := Pointer(2);
end;
// ... expand home node ...
if (Assigned(HomeNode)) and (HomeNode <> CurNode) then begin
HomeNode.Data := Pointer(0);
trvDirectories.TopItem := HomeNode;
HomeNode.Expand(False);
HomeNode.Data := Pointer(1);
end;
eStr.Free;
// ... scan for directories in home dir ...
if Assigned(CurNode) then if Assigned(CurNode) then
CurNode.Expand(False); CurNode.Expand(False);
trvDirectories.TopItem := HomeNode;
except except
on E: Exception do begin on E: Exception do begin
Screen.Cursor := crDefault; Screen.Cursor := crDefault;
@ -841,11 +859,24 @@ end;
procedure TfrmMain.trvDirectoriesExpanded(Sender: TObject; procedure TfrmMain.trvDirectoriesExpanded(Sender: TObject;
Node: TTreeNode); Node: TTreeNode);
function NodeExists(const SNode: TTreeNode; const Text: String): Boolean;
var i: integer;
begin
Result := False;
for i := 0 to SNode.Count -1 do begin
if (SNode.Item[i].Text = Text) then begin
Result := True;
break;
end;
end;
end;
var ePath: String; var ePath: String;
CurNode: TTreeNode; CurNode: TTreeNode;
i: integer; i: integer;
begin begin
if Node.Item[0].Text = 'Scanning...' then begin // no directories added yet if (Integer(Node.Data) <> 0) then begin // no directories added yet
Screen.Cursor := crHourGlass; Screen.Cursor := crHourGlass;
// get complete path // get complete path
ePath := '/'; ePath := '/';
@ -861,15 +892,23 @@ begin
Repaint; Repaint;
IdFTP.ChangeDir(ePath); IdFTP.ChangeDir(ePath);
with GetAllDirs do begin with GetAllDirs do begin
Node.Item[0].Free; if (Integer(Node.Data) = 2) and (Node.Count > 0) then
Node.Item[0].Free;
for i := 0 to Count -1 do begin for i := 0 to Count -1 do begin
trvDirectories.Items.AddChild(trvDirectories.Items.AddChild(Node, Strings[i]), 'Scanning...'); if (not NodeExists(Node, Strings[i])) then begin
CurNode := trvDirectories.Items.AddChild(Node, Strings[i]);
trvDirectories.Items.AddChild(CurNode, 'Scanning...');
CurNode.Data := Pointer(2);
end;
end; end;
Free; Free;
end; end;
finally except
if (Integer(Node.Data) = 2) and (Node.Count > 0) then
Node.Item[0].Free;
Application.ProcessMessages; Application.ProcessMessages;
end; end;
Node.Data := Pointer(0); // scan done
Screen.Cursor := crDefault; Screen.Cursor := crDefault;
end; end;
end; end;
@ -978,4 +1017,10 @@ begin
end; end;
end; end;
procedure TfrmMain.trvDirectoriesChange(Sender: TObject; Node: TTreeNode);
begin
if (Screen.Cursor <> crHourGlass) and (Assigned(Node)) and (Integer(Node.Data) = 1) then
Node.Expand(False);
end;
end. end.