DodoTech-Public/DodoSSH
Public Access
3
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Type a path on the SFTP pane, and put a file right without deleting it
ci / build and test (pull_request) Successful in 2m30s
Details
ci / desktop nightly (pull_request) Skipped
Details
ci / android head (pull_request) Successful in 7m21s
Details
ci / api image (pull_request) Successful in 23s
Details
ci / build and test (push) Successful in 2m28s
Details
ci / android head (push) Successful in 3m27s
Details
ci / desktop nightly (push) Successful in 53s
Details
ci / api image (push) Successful in 36s
Details

Browse Source 
Three things the file browser could not do. Somewhere to go had to be walked
to, a file that landed under the wrong name could only be removed and sent
again, and the listing went on showing the directory as it was before this
application put something in it.

◆ THE PATH IS A BOX NOW, not a TextBlock printing where the pane was. A
breadcrumb only reaches what is under the directory already listed, so crossing
a host's filesystem cost a click and a round trip a level, and a path somebody
already knew could not be entered at all. Enter goes; Escape puts back what the
pane is really showing.

What is typed may be absolute, relative to the directory showing, or start at
~ — the four shapes a shell takes, because somebody typing into a box is typing
what they would type into a shell. SftpPath.Resolve turns all of them into one
absolute path, and it resolves them here rather than handing a relative path to
the server: the server would resolve it against the session's own working
directory, which is not necessarily the directory the breadcrumb above the box
is showing. `..` is collapsed textually, which differs from cd through a
symbolic link; the alternative is a realpath round trip before anything lists.

The box holds its own value rather than RemotePath itself. Binding it straight
to the path would navigate on every keystroke — `/`, then `/v`, then `/va` — a
round trip and a failed listing per character. Every other way of moving writes
the real path back into it; a refused listing deliberately does not, because
the path that did not resolve is the one worth having in front of you.

◆ RENAME AND MOVE, and DELETE moves to join them. It had been sitting in the
pane header beside UP and REFRESH — two things that move the pane and one that
destroys a file, in one row — and the three that act on the selected row are
now together in a row of their own, under the name of the row they are about.

One SFTP rename underneath both new operations and two separate questions on
the screen, because the answer is a different kind of thing each time: a rename
takes a name and must not take a path, a move takes a directory and must not
take a name. One box asking for a destination path would be fewer controls and
a worse question — the two mistakes it invites are exactly the ones the split
makes impossible. Each form opens on the answer that changes nothing, so what
gets edited is the half somebody came to change.

Three refusals are made here, and they are the ones a server's message would
not explain: a separator in a name (no such file, about a directory nobody
meant to name), a destination equal to the source (success, and a file that did
not move), and a directory into itself (EINVAL, true and useless). Everything
else is the server's — a name already taken, a path that is not there, a mount
that cannot be crossed — and arrives in the status line in its own words.
Neither is painted in the deletion card's red: a rename is undone by renaming
back, and spending that red twice makes it stop meaning anything.

◆ THE LISTING REFRESHES ITSELF when a transfer lands in it. Both panes, since
an upload lands on the host and a download lands here and either leaves the
pane that is showing that directory a step behind. Only the directory actually
on screen: a queue moving a hundred files elsewhere must not be a round trip
per file for a listing nobody is looking at.

It waits rather than interrupting. Another operation running would have two
listings racing for one collection, and re-listing under an open question is
how the row somebody answered about stops being the row that gets acted on — so
the staleness is remembered and settled at the end of the operation or when the
question is dismissed. It says nothing either way: nobody asked for it, and the
status line at that moment is carrying the news about the transfer. The
selection survives, re-found by path, which is what makes an unasked-for
refresh safe to run under somebody's pointer at all.

◆ THE LAYOUT SUITE FOUND A REAL FAULT and the fix is where the height goes. The
rename form did not fit the 204 pixels the session shell's own sidebar leaves
this pane — MKDIR and the listing were pushed off the bottom. The form is
shorter now (the placeholder says what the box wants, so there is no field
label above it), and the item row and the breadcrumb step aside while any of
the three questions is up, which is what the phone head already did with its
own buttons.

Measuring also settled something the markup had been claiming and is not true:
at that width the listing collapses to nothing under any of the three cards,
the deletion card included, and has done since the sidebar arrived. So "the row
it is about is still on screen" is retired from the deletion card's remark, and
the full path each card carries is what identifies the row instead. Recorded
where it is drawn rather than left to be rediscovered.

TESTS. SftpPath.Resolve gets the four shapes, ~ with and without a home to
expand it to, a blank box, and climbing past the root. ShellFlowTests gets nine
against a session that records what it was asked to do — which path was
renamed, which directories were listed — rather than against the sentence this
code writes about itself: the path box absolute and relative, rename in place,
the separator refusal, a move by relative path, the no-op refusal, the three
questions displacing each other, and the three rules the automatic refresh
follows. The local half is in TransferQueueingTests, where a real folder
answers. Two new shapes are measured, and the deletion card's own measurement
moves to the connected state — the only state it can be asked in, and the
narrow one.

What the tests cannot reach is in docs/manual-checks.md as phase 2b: a real
server's cross-device and name-taken refusals, and a soft keyboard, which is
why the phone's path box has a GO button rather than trusting whatever the IME
decided to draw on its return key.
This commit is contained in:
jaap-jan committed 2026-08-21 12:05:33 +02:00
1 parent 2f8daacb60
commit 882f01c515
11 files changed
+1508 -50
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/DodoSSH.Client.Android/Views/FilesScreen.axaml
+73 -8
View File
@@ -48,7 +48,7 @@
the refusal has no continue button here either.
-->
<Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,*,Auto">
<Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,*,Auto">
<!-- ============ header ============ -->
<Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,*,Auto" Height="56" Margin="8,0">
@@ -174,8 +174,31 @@
</StackPanel>
</Border>
<!-- ============ ◆ typing where to go ============ -->
<!--
The breadcrumb below reaches only what is under the directory already listed, so crossing a host's
filesystem was a tap and a round trip a level and a path somebody already knew could not be entered at
all. This is the way in for one that is: absolute, relative to the directory showing, or starting at
~. See SftpPath.Resolve.
GO is a real button rather than only the keyboard's own action key, and that is a phone decision: a
software keyboard's return key is whatever the IME decided to draw, this application does not set the
IME action, and a path box whose only commit was a key that may say "newline" would be a box nothing
could be submitted from. The Enter binding stays for the hardware keyboards this head does meet.
-->
<Grid Grid.Row="3" ColumnDefinitions="*,8,Auto" Margin="14,0,14,6" IsVisible="{Binding IsConnected}">
<TextBox Grid.Column="0" Classes="field" Text="{Binding RemotePathDraft}"
PlaceholderText="/path/to/somewhere">
<TextBox.KeyBindings>
<KeyBinding Gesture="Enter" Command="{Binding GoToTypedRemotePathCommand}" />
</TextBox.KeyBindings>
</TextBox>
<Button Grid.Column="2" Classes="secondary" Height="44" Padding="16,0" Content="GO"
Command="{Binding GoToTypedRemotePathCommand}" />
</Grid>
<!-- ============ where we are ============ -->
<ScrollViewer Grid.Row="3" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled"
<ScrollViewer Grid.Row="4" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled"
IsVisible="{Binding IsConnected}" Margin="0,0,0,4">
<StackPanel Orientation="Horizontal" Spacing="4" Margin="14,0" VerticalAlignment="Center">
<Button Classes="row" MinHeight="36" Padding="9,0" CornerRadius="10"
@@ -215,7 +238,7 @@
answers: an empty scrolling strip under the breadcrumb would read as a loading row rather than as
"this host has nothing pinned".
-->
<ScrollViewer Grid.Row="4" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled"
<ScrollViewer Grid.Row="5" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled"
IsVisible="{Binding HasConnectedPins}" Margin="0,0,0,4">
<ItemsControl ItemsSource="{Binding ConnectedPinnedPaths}">
<ItemsControl.ItemsPanel>
@@ -240,7 +263,7 @@
</ScrollViewer>
<!-- ============ the listing ============ -->
<Panel Grid.Row="5">
<Panel Grid.Row="6">
<TextBlock Classes="body" IsVisible="{Binding !IsConnected}" Margin="24,12"
VerticalAlignment="Top" Text="{Binding Status}" />
@@ -306,7 +329,7 @@
<!-- ============ what to do with the chosen entry ============ -->
<!-- DeepChrome rather than Chrome, since v5 — see the remark on PhoneShell's vault header. -->
<Border Grid.Row="6" IsVisible="{Binding IsConnected}" Background="{StaticResource DeepChrome}"
<Border Grid.Row="7" IsVisible="{Binding IsConnected}" Background="{StaticResource DeepChrome}"
BorderBrush="{StaticResource Border}" BorderThickness="0,1,0,0" Padding="12,10">
<StackPanel Spacing="9">
@@ -328,6 +351,36 @@
</StackPanel>
</Border>
<!--
◆ Renaming and moving, in the place the deletion question already occupies and never at the same
time as it. One form for both — see RemoteMoveRequest for why the two questions share a shape and
differ only in their words — and no danger colours on it, because a rename is undone by renaming
back and the deletion above is the one thing here that nothing can walk back.
-->
<Border IsVisible="{Binding IsMovingRemote}" Background="{StaticResource Raised}"
BorderBrush="{StaticResource Border}" BorderThickness="1" CornerRadius="12"
Padding="13,11">
<StackPanel Spacing="6">
<TextBlock Classes="mono" FontSize="12" TextWrapping="Wrap"
Text="{Binding PendingRemoteMove.Question}" />
<TextBlock Classes="detail" TextWrapping="Wrap" Text="{Binding PendingRemoteMove.FullPath}" />
<TextBox Classes="field" Text="{Binding RemoteMoveTarget}"
PlaceholderText="{Binding PendingRemoteMove.FieldHint}">
<TextBox.KeyBindings>
<KeyBinding Gesture="Enter" Command="{Binding ConfirmMoveRemoteCommand}" />
</TextBox.KeyBindings>
</TextBox>
<TextBlock Classes="body" Text="{Binding PendingRemoteMove.Note}" />
<Grid ColumnDefinitions="*,8,*" Margin="0,4,0,0">
<Button Grid.Column="0" Classes="primary" Height="44"
Content="{Binding PendingRemoteMove.ConfirmLabel}"
Command="{Binding ConfirmMoveRemoteCommand}" IsEnabled="{Binding !IsBusy}" />
<Button Grid.Column="2" Classes="secondary" Height="44" Content="CANCEL"
Command="{Binding CancelMoveRemoteCommand}" />
</Grid>
</StackPanel>
</Border>
<!--
◆ The queue, above the actions and only when it has something in it. Bounded and scrolling rather
than growing: five files queued must not push the buttons off the bottom of the screen, which on a
@@ -386,20 +439,32 @@
save picker names one destination. CanDownload is the desktop's own flag for the same question —
a file is selected and something is connected — and is reused rather than restated here.
-->
<Grid ColumnDefinitions="*,8,*" IsVisible="{Binding !IsConfirmingRemoteDeletion}">
<Grid ColumnDefinitions="*,8,*" IsVisible="{Binding !IsAskingAboutRemoteEntry}">
<Button Grid.Column="0" Classes="primary" Height="44" Content="ADD FILES" Click="OnAddFiles" />
<Button Grid.Column="2" Classes="secondary" Height="44" Content="SAVE FILE" Click="OnSaveFile"
IsEnabled="{Binding CanDownload}" />
</Grid>
<Grid ColumnDefinitions="*,8,*" IsVisible="{Binding !IsConfirmingRemoteDeletion}">
<!--
◆ The two that put a file right rather than taking it away, above the row DELETE is on and away
from it. Both open a form in place of these buttons — see the card above — because a phone has
nowhere to put a text field except where something else already was.
-->
<Grid ColumnDefinitions="*,8,*" IsVisible="{Binding !IsAskingAboutRemoteEntry}">
<Button Grid.Column="0" Classes="secondary" Height="44" Content="RENAME"
Command="{Binding RenameRemoteCommand}" IsEnabled="{Binding CanRenameRemote}" />
<Button Grid.Column="2" Classes="secondary" Height="44" Content="MOVE"
Command="{Binding MoveRemoteCommand}" IsEnabled="{Binding CanMoveRemote}" />
</Grid>
<Grid ColumnDefinitions="*,8,*" IsVisible="{Binding !IsAskingAboutRemoteEntry}">
<Button Grid.Column="0" Classes="secondary" Height="44" Content="DELETE"
Command="{Binding DeleteRemoteCommand}" IsEnabled="{Binding CanDeleteRemote}" />
<Button Grid.Column="2" Classes="secondary" Height="44" Content="CLOSE"
Command="{Binding DisconnectCommand}" />
</Grid>
<TextBlock Classes="body" IsVisible="{Binding !IsConfirmingRemoteDeletion}"
<TextBlock Classes="body" IsVisible="{Binding !IsAskingAboutRemoteEntry}"
Text="ADD FILES picks documents to send. SAVE FILE asks where the selected file should be kept — the file is created there when you choose it, so a transfer that fails leaves it empty." />
<TextBlock Classes="detail" Foreground="{StaticResource TextDim}" TextWrapping="Wrap"
src/DodoSSH.Client.App/App.axaml
+35
View File
@@ -828,6 +828,41 @@
<Setter Property="BorderThickness" Value="1.5" />
</Style>
<!--
◆ THE FILE PANE'S PATH BOX, which used to be a TextBlock.
The SFTP pane's header printed where it was and gave no way to say where to go: reaching a directory
the breadcrumb could not see meant walking to a common ancestor and back down, one round trip a level,
and a path somebody already knew could not be typed at all. It is a real TextBox now, and this style
is the whole of what keeps it looking like the label it replaced — no fill and no border until it is
pointed at, the same mono weight and colour the TextBlock carried, and the same height, so a header
that gained an input did not gain a control that shouts about being one.
Declared after the base TextBox rules and after .address for the reason this file keeps restating:
Avalonia has no specificity, so an exception written before the rules it overrides does nothing.
-->
<Style Selector="TextBox.pathbox">
<Setter Property="FontFamily" Value="{StaticResource MonoFont}" />
<Setter Property="FontSize" Value="13.5" />
<Setter Property="FontWeight" Value="Medium" />
<Setter Property="Foreground" Value="{StaticResource TextDim}" />
<Setter Property="MinHeight" Value="26" />
<Setter Property="Padding" Value="6,2" />
<Setter Property="CornerRadius" Value="6" />
</Style>
<Style Selector="TextBox.pathbox /template/ Border#PART_BorderElement">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Transparent" />
</Style>
<Style Selector="TextBox.pathbox:pointerover /template/ Border#PART_BorderElement">
<Setter Property="Background" Value="{StaticResource Field}" />
<Setter Property="BorderBrush" Value="{StaticResource BorderMid}" />
</Style>
<Style Selector="TextBox.pathbox:focus /template/ Border#PART_BorderElement">
<Setter Property="Background" Value="{StaticResource Field}" />
<Setter Property="BorderBrush" Value="{StaticResource AccentSoft}" />
</Style>
<!--
Lists. The rows in this design are drawn by their own templates and marked as selected with an accent
strip down the left edge, so the theme's rounded blue selection block has to go — it would sit behind
src/DodoSSH.Client.App/Views/TransfersScreen.axaml
+145 -28
View File
@@ -327,10 +327,12 @@
<!-- ==== The host ==== -->
<!--
Six rows rather than five: the connection's own strip is the new one, and it is inside this pane
rather than above both because it is about this pane and nothing else.
Seven rows. Two of them are furniture over a listing rather than part of it: the connection's own
strip, and the row of things that can be done to whichever row is chosen. Both are inside this pane
rather than above both panes because both are about this one and nothing else. The two questions —
deleting, and renaming or moving — share a single row, since only one of the two is ever on screen.
-->
<Grid Grid.Column="2" x:Name="RemotePane" RowDefinitions="Auto,Auto,Auto,Auto,Auto,*"
<Grid Grid.Column="2" x:Name="RemotePane" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,*"
DragDrop.AllowDrop="True">
<!--
@@ -344,25 +346,42 @@
distinct glyphs; see that pane's own remark on why the pair differs without the actions differing.
-->
<!--
The path is alone in the star column for the reason the local pane's header remark spells out:
TextTrimming needs the finite width only a star column gives it, and this is the pane where the
long path is not even unusual — it is any host with a deep directory tree.
◆ THE PATH IS TYPED HERE, and that is what the star column is now holding.
It was a TextBlock printing where the pane was. A breadcrumb only reaches what is under the
directory already listed, so crossing a host's filesystem was a walk to the common ancestor and
back down — a click and a round trip a level — and a path somebody already knew could not be
entered at all. Enter goes; Escape puts back what the pane is really showing. See
TransfersViewModel.RemotePathDraft for why the box holds its own value rather than RemotePath
itself, and SftpPath.Resolve for what an entry that is not absolute means.
Still alone in the star column, for the reason the local pane's header remark spells out: this box
has to be bounded, and an Auto column beside a StackPanel would measure it at its content's width
and push the buttons past the pane's edge.
DELETE has left this row. It acts on the selected row rather than on the pane, and it is one of
three that do now — see the item row below, which is where the three of them are together and
where there is room for three rather than for one.
-->
<Border Grid.Row="0" Padding="0,0,0,10" BorderThickness="0">
<Grid ColumnDefinitions="Auto,*,Auto">
<StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="12" VerticalAlignment="Center"
Margin="0,0,12,0">
Margin="0,0,8,0">
<TextBlock Classes="label" FontSize="10" Text="HOST" VerticalAlignment="Center"
IsVisible="{Binding ShowsHostPicker}" />
<TextBlock Classes="label" FontSize="10" Text="BUCKET" VerticalAlignment="Center"
IsVisible="{Binding ShowsBucketPicker}" />
</StackPanel>
<TextBlock Grid.Column="1" Classes="mono" FontSize="13.5" FontWeight="Medium"
Foreground="{StaticResource TextDim}" VerticalAlignment="Center"
HorizontalAlignment="Left"
Text="{Binding RemotePath}" TextTrimming="CharacterEllipsis"
ToolTip.Tip="{Binding RemotePath}" />
<StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="4" Margin="12,0,0,0">
<TextBox Grid.Column="1" Classes="pathbox" VerticalAlignment="Center"
Text="{Binding RemotePathDraft}" IsEnabled="{Binding IsConnected}"
PlaceholderText="/path/to/somewhere"
ToolTip.Tip="Type a path and press Enter. A relative path is taken from here; ~ is the account's home directory.">
<TextBox.KeyBindings>
<KeyBinding Gesture="Enter" Command="{Binding GoToTypedRemotePathCommand}" />
<KeyBinding Gesture="Escape" Command="{Binding RevertTypedRemotePathCommand}" />
</TextBox.KeyBindings>
</TextBox>
<StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="4" Margin="8,0,0,0">
<Button Classes="paneicon" Command="{Binding RemoteUpCommand}"
IsEnabled="{Binding IsConnected}" ToolTip.Tip="Up one directory">
<TextBlock FontFamily="{StaticResource IconFont}" FontSize="16" Text="&#xE5DB;" />
@@ -371,10 +390,6 @@
IsEnabled="{Binding IsConnected}" ToolTip.Tip="Refresh">
<TextBlock FontFamily="{StaticResource IconFont}" FontSize="16" Text="&#xE5D5;" />
</Button>
<Button Classes="paneicon danger" Command="{Binding DeleteRemoteCommand}"
IsEnabled="{Binding CanDeleteRemote}" ToolTip.Tip="Delete on the host">
<TextBlock FontFamily="{StaticResource IconFont}" FontSize="15" Text="&#xE872;" />
</Button>
</StackPanel>
</Grid>
</Border>
@@ -402,9 +417,53 @@
</Border>
<!--
The question DELETE asks. Under the button rather than over the pane, so the row it is about is
still on screen and still selected while it is being answered — and it names the full path rather
than the file, because a name is the half that does not identify anything.
◆ WHAT CAN BE DONE TO THE ROW THAT IS CHOSEN. Only while something is connected.
Three buttons in one place, which is the point. DELETE used to sit alone in the pane header beside
UP and REFRESH — two things that move the pane and one that destroys a file, in one row — and
there was no rename and no move at all, so a file that had landed under the wrong name could only
be put right by deleting it and sending it again. These three act on the selection, so they belong
together and away from the two that act on the pane.
The name beside them is the row they are about, ellipsized. It says which row rather than which
path: the listing directly underneath has that row highlighted, so a full path here would be
repeating what the selection is already showing. The forms the buttons open do print the path,
because that is the moment something is committed rather than merely looked at.
The row goes while one of the three questions is up rather than sitting there greyed out, and so
does the breadcrumb below it — see ShowsRemoteItemActions. The form that opens is the answer to
what these buttons asked, and inside the session shell this pane is 204 pixels wide: the height
goes to the question or to the buttons that raised it, not to both.
-->
<Border Grid.Row="2" Padding="12,5" BorderBrush="{StaticResource BorderSubtle}"
BorderThickness="0,0,0,1" IsVisible="{Binding ShowsRemoteItemActions}">
<Grid ColumnDefinitions="*,Auto">
<TextBlock Grid.Column="0" Classes="mono" FontSize="11.5" VerticalAlignment="Center"
Foreground="{StaticResource TextFaint}" TextTrimming="CharacterEllipsis"
Text="{Binding SelectedRemoteName}" />
<StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="4" Margin="8,0,0,0">
<Button Classes="paneicon" Command="{Binding RenameRemoteCommand}"
IsEnabled="{Binding CanRenameRemote}" ToolTip.Tip="Rename on the host">
<TextBlock FontFamily="{StaticResource IconFont}" FontSize="15" Text="&#xE9AD;" />
</Button>
<Button Classes="paneicon" Command="{Binding MoveRemoteCommand}"
IsEnabled="{Binding CanMoveRemote}" ToolTip.Tip="Move to another directory">
<TextBlock FontFamily="{StaticResource IconFont}" FontSize="15" Text="&#xE675;" />
</Button>
<Button Classes="paneicon danger" Command="{Binding DeleteRemoteCommand}"
IsEnabled="{Binding CanDeleteRemote}" ToolTip.Tip="Delete on the host">
<TextBlock FontFamily="{StaticResource IconFont}" FontSize="15" Text="&#xE872;" />
</Button>
</StackPanel>
</Grid>
</Border>
<!--
The question DELETE asks. It names the full path rather than the file, because a name is the half
that does not identify anything — and that is now the whole of how the question says which row it
is about: at the session shell's own 204-pixel width there is no height left for a listing under
it, so "the row is still on screen and still selected" is no longer true and the path in the card
is what carries the identity. See the rename form below, which is measured in the same shape.
This is the strongest warning on any of these screens, and deliberately: everything else this
application deletes is a tombstone against a copy the server still has, and a file on somebody's
@@ -415,7 +474,7 @@
CANCEL side by side want closer to 220, so at the narrow width they wrap onto their own line
instead of one of them going off the edge, which the WrapPanel achieves for free.
-->
<Border Grid.Row="2" Padding="12,10" Background="{StaticResource DangerWash}"
<Border Grid.Row="3" Padding="12,10" Background="{StaticResource DangerWash}"
BorderBrush="{StaticResource DangerSoft}" BorderThickness="0,0,0,1"
IsVisible="{Binding IsConfirmingRemoteDeletion}">
<StackPanel Spacing="7">
@@ -435,7 +494,65 @@
</StackPanel>
</Border>
<Grid Grid.Row="3" ColumnDefinitions="*,Auto" Margin="12,6,12,4">
<!--
◆ RENAME AND MOVE, in the row the deletion question uses and never at the same time as it.
One form for both, because they differ only in what the box starts out holding and in the words
around it — see RemoteMoveRequest, where both sets are chosen. It shares this Grid row with
the deletion card above: the three questions are mutually exclusive by construction, each one's
own opening clearing the others, so a row of its own would be a row that is empty whenever this
one is not.
It is not painted in the deletion card's danger colours, and that is deliberate rather than an
oversight. A rename is undone by renaming back; the deletion beside it is the one thing this
application does that nothing can walk back, and spending the same red on both would make the red
stop meaning anything.
Enter commits from inside the box, which is where the hands already are once an answer has been
typed.
◆ IT TAKES THE WHOLE PANE at the session shell's own 204-pixel width, and that is measured rather
than hoped: the listing's star row is squeezed to nothing while either question is open, exactly
as the deletion card above already squeezed it. There is no room for a form and a listing in 336
pixels, and the form carries the full path precisely so the row underneath does not have to be
visible for the question to be about something identifiable. That is why the item row and the
breadcrumb step aside instead — the height they free is what keeps the form itself un-clipped,
which is what ScreenLayoutTests measures.
-->
<Border Grid.Row="3" Padding="12,10" Background="{StaticResource Raised}"
BorderBrush="{StaticResource BorderSubtle}" BorderThickness="0,0,0,1"
IsVisible="{Binding IsMovingRemote}">
<StackPanel Spacing="7">
<TextBlock Classes="heading" FontSize="14" TextWrapping="Wrap"
Text="{Binding PendingRemoteMove.Question}" />
<SelectableTextBlock Classes="mono" FontSize="11.5" TextWrapping="Wrap"
Foreground="{StaticResource TextFaint}"
Text="{Binding PendingRemoteMove.FullPath}" />
<TextBox Text="{Binding RemoteMoveTarget}"
PlaceholderText="{Binding PendingRemoteMove.FieldHint}">
<TextBox.KeyBindings>
<KeyBinding Gesture="Enter" Command="{Binding ConfirmMoveRemoteCommand}" />
<KeyBinding Gesture="Escape" Command="{Binding CancelMoveRemoteCommand}" />
</TextBox.KeyBindings>
</TextBox>
<TextBlock Classes="hint" FontSize="11.5" TextWrapping="Wrap"
Text="{Binding PendingRemoteMove.Note}" />
<WrapPanel>
<Button Classes="accent" Content="{Binding PendingRemoteMove.ConfirmLabel}" Margin="0,0,8,4"
Command="{Binding ConfirmMoveRemoteCommand}" IsEnabled="{Binding !IsBusy}" />
<Button Classes="ghost" Content="CANCEL" Margin="0,0,0,4"
Command="{Binding CancelMoveRemoteCommand}" />
</WrapPanel>
</StackPanel>
</Border>
<!--
Away while a question is up, for the reason the item row above states: the trail is where the pane
is and MKDIR makes a directory, and neither is what somebody answering a question about one row
is doing.
-->
<Grid Grid.Row="4" ColumnDefinitions="*,Auto" Margin="12,6,12,4"
IsVisible="{Binding !IsAskingAboutRemoteEntry}">
<ItemsControl Grid.Column="0" ItemsSource="{Binding RemoteTrail}" VerticalAlignment="Center">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
@@ -480,14 +597,14 @@
48 pixels rather than the drawer's own wider habit, and SIZE/MODIFIED shrink to match the local
pane's narrower numbers. See the local pane's own remark on why 204 rather than the design's 1920.
-->
<Grid Grid.Row="4" ColumnDefinitions="20,*,56,52,48" Margin="0,2,10,4">
<Grid Grid.Row="5" ColumnDefinitions="20,*,56,52,48" Margin="0,2,10,4">
<TextBlock Grid.Column="1" Classes="label" Text="NAME" FontSize="9.5" Margin="8,0,8,0" />
<TextBlock Grid.Column="2" Classes="label" Text="SIZE" FontSize="9.5" HorizontalAlignment="Right" />
<TextBlock Grid.Column="3" Classes="label" Text="MODIFIED" FontSize="9.5" HorizontalAlignment="Right" />
<TextBlock Grid.Column="4" Classes="label" Text="PERMS" FontSize="9.5" HorizontalAlignment="Right" />
</Grid>
<ListBox Grid.Row="5" x:Name="RemoteList" Classes="filerows" ItemsSource="{Binding RemoteEntries}"
<ListBox Grid.Row="6" x:Name="RemoteList" Classes="filerows" ItemsSource="{Binding RemoteEntries}"
SelectedItem="{Binding SelectedRemoteEntry}">
<ListBox.ItemTemplate>
<DataTemplate x:DataType="vm:RemoteEntryRowViewModel">
@@ -513,7 +630,7 @@
A directory with nothing in it. It no longer has to say anything about not being connected: that
state is the invitation below, which covers this pane whole.
-->
<TextBlock Grid.Row="5" Classes="hint" FontSize="12" Margin="24" MaxWidth="300"
<TextBlock Grid.Row="6" Classes="hint" FontSize="12" Margin="24" MaxWidth="300"
HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center"
Text="Nothing in this directory." IsVisible="{Binding !HasRemoteEntries}" />
@@ -535,7 +652,7 @@
the picker arrives, so the tall shape is the form rather than form-plus-prose, and neither shape
reaches the floor. Anything added here has to hold that; the layout suite measures both.
-->
<Border Grid.Row="1" Grid.RowSpan="5" Background="{StaticResource Canvas}"
<Border Grid.Row="1" Grid.RowSpan="6" Background="{StaticResource Canvas}"
IsVisible="{Binding !IsConnected}">
<StackPanel Spacing="10" Margin="20" MaxWidth="320"
HorizontalAlignment="Center" VerticalAlignment="Center">
@@ -679,11 +796,11 @@
window that has stopped answering, and the answer arriving after the drop is the answer arriving
too late. See the local pane for why neither may hit-test.
-->
<Border Grid.Row="0" Grid.RowSpan="6" IsHitTestVisible="False"
<Border Grid.Row="0" Grid.RowSpan="7" IsHitTestVisible="False"
Background="{StaticResource AccentWash}" BorderBrush="{StaticResource Accent}"
BorderThickness="2" IsVisible="{Binding IsRemoteDropTarget}" />
<Border Grid.Row="0" Grid.RowSpan="6" IsHitTestVisible="False"
<Border Grid.Row="0" Grid.RowSpan="7" IsHitTestVisible="False"
Background="{StaticResource DangerWash}" BorderBrush="{StaticResource DangerSoft}"
BorderThickness="2" IsVisible="{Binding IsRemoteDropRefused}">
<TextBlock Classes="hint" Text="Connect to a host first." FontSize="12"
src/DodoSSH.Client.Shell/ViewModels/TransfersViewModel.cs
+548 -6
View File
@@ -306,6 +306,83 @@ internal sealed record RemoteDeletionRequest(string Name, string FullPath, bool
+ "touched, and there is no undo.";
}
/// <summary>Which of the two things a rename actually is, from where the user is standing.</summary>
/// <remarks>
/// One SFTP operation underneath — <c>ISftpSession.RenameAsync</c> is the whole of both — and two separate
/// questions on the screen, because the answer a person types is a different kind of thing each time. A
/// rename takes a name and must not take a path; a move takes a directory and must not take a name. Folding
/// them into one box asking for a destination path would be fewer controls and a worse question: the two
/// mistakes it invites — typing a directory where a name goes, or a name where a directory goes — are
/// exactly the ones this split makes impossible to make.
/// </remarks>
internal enum RemoteMoveKind
{
/// <summary>Same directory, different name.</summary>
Rename,
/// <summary>Same name, different directory.</summary>
Move,
}
/// <summary>
/// Something on the host that is being given a new name or a new home, and has not been committed yet.
/// </summary>
/// <remarks>
/// <para>
/// The shape <see cref="RemoteDeletionRequest"/> already established, and here for the same reason: it
/// carries the full path rather than the name, so nothing that happens between opening the form and
/// pressing its button can point the operation at a different file. The selection can move underneath it —
/// a refresh nulls it — and the request stays about what was asked about.
/// </para>
/// <para>
/// <b>It asks rather than warns.</b> Renaming and moving on the host are not deletions: what they change is
/// where the bytes are reached from, and both are undone by doing them again the other way. So this form
/// carries a field and a verb instead of <see cref="RemoteDeletionRequest.Consequence"/>'s "there is no
/// undo" — the one warning on this screen that is earned, and worth not spending twice.
/// </para>
/// </remarks>
/// <param name="Name">What the row is called now.</param>
/// <param name="FullPath">Where it is now, which is the end of the operation nothing may re-point.</param>
/// <param name="IsDirectory">Whether it is a directory, which changes what moving it can be asked to do.</param>
/// <param name="Kind">Which question is being asked.</param>
internal sealed record RemoteMoveRequest(string Name, string FullPath, bool IsDirectory, RemoteMoveKind Kind)
{
/// <summary>Whether this is the rename question rather than the move one.</summary>
internal bool IsRename => Kind is RemoteMoveKind.Rename;
/// <summary>The heading, which names the thing rather than only the verb.</summary>
internal string Question => IsRename
? $"Rename '{Name}' on the host"
: $"Move '{Name}' to another directory";
/// <summary>
/// What an empty box shows, which is the shape of the answer rather than an example of one.
/// </summary>
/// <remarks>
/// The placeholder is the whole of what says which of the two kinds of answer the box wants — there is
/// no label above it. A field label would be a second line saying what this line already says, and the
/// pane this form opens in is 204 pixels wide inside the session shell: every line it does not need is
/// a line of the listing underneath that survives.
/// </remarks>
internal string FieldHint => IsRename ? "new name" : "/path/to/directory";
/// <summary>What the button that commits it says.</summary>
internal string ConfirmLabel => IsRename ? "RENAME" : "MOVE";
/// <summary>
/// What it does, in the one sentence the form has room for.
/// </summary>
/// <remarks>
/// Both halves state the refusal rather than the action, because the action is already in the heading
/// and the refusal is the part nobody expects: SFTP's rename does not replace, so a name already taken
/// is a failure rather than a silent overwrite — which is the same promise the transfer queue makes and
/// rests on the same server behaviour.
/// </remarks>
internal string Note => IsRename
? "A name already taken is refused, not overwritten."
: "Relative to the directory showing. A name already taken is refused, not overwritten.";
}
/// <summary>
/// The transfers screen: a host, two directory panes, and the queue between them.
/// </summary>
@@ -382,6 +459,15 @@ internal sealed partial class TransfersViewModel : ObservableObject, IAsyncDispo
private bool disposed;
/// <summary>Whether the remote listing on screen is known to be out of date.</summary>
/// <remarks>
/// Set by <see cref="NoteTransferLanded"/> and cleared by any listing of the directory it is about.
/// Read back by <see cref="RemoteListingIsStale"/>, which exists so that the deferral this drives can be
/// asserted on in the state where it defers — the moment a transfer lands over an open question is not
/// one a test can otherwise see the inside of.
/// </remarks>
private bool remoteListingIsStale;
/// <param name="sftp">Opens SFTP sessions.</param>
/// <param name="clock">Time source, for transfer rates and timestamps.</param>
/// <param name="post">
@@ -706,6 +792,26 @@ internal sealed partial class TransfersViewModel : ObservableObject, IAsyncDispo
internal ObservableCollection<CrumbViewModel> RemoteTrail { get; } = [];
/// <summary>
/// What is in the pane's path box, which is not where the pane is.
/// </summary>
/// <remarks>
/// <para>
/// A draft beside <see cref="RemotePath"/> rather than the path itself made editable, and the two facts
/// really are different: <see cref="RemotePath"/> is the directory that was listed, and this is what
/// somebody is halfway through typing. Binding the box straight to the path would navigate on every
/// keystroke — <c>/</c>, then <c>/v</c>, then <c>/va</c> — which is a round trip and a failed listing
/// per character.
/// </para>
/// <para>
/// It is written back from <see cref="ListRemoteAsync"/>, so every other way of moving — a breadcrumb,
/// UP, a pin, connecting — puts the real path back in the box. What a failed listing leaves is what was
/// typed, on purpose: the path that did not resolve is the one worth having in front of you to correct.
/// </para>
/// </remarks>
[ObservableProperty]
private string remotePathDraft = string.Empty;
[ObservableProperty]
private RemoteEntryRowViewModel? selectedRemoteEntry;
@@ -721,13 +827,75 @@ internal sealed partial class TransfersViewModel : ObservableObject, IAsyncDispo
internal bool IsConfirmingRemoteDeletion => PendingRemoteDeletion is not null;
/// <summary>The rename or move being filled in, or null when none is.</summary>
[ObservableProperty]
private RemoteMoveRequest? pendingRemoteMove;
/// <summary>
/// What has been typed into whichever of the two forms is open — a name, or a directory.
/// </summary>
/// <remarks>
/// One box for both, because only one of the two forms is ever open: they replace each other, and a
/// second field would be a second thing to clear at every place this one is. Seeded from the row when
/// the form opens — the current name for a rename, the current directory for a move — so that both
/// questions start from the answer that changes nothing, and what somebody edits is the part they came
/// to change.
/// </remarks>
[ObservableProperty]
private string remoteMoveTarget = string.Empty;
internal bool IsMovingRemote => PendingRemoteMove is not null;
/// <summary>
/// Whether the pane is waiting on an answer about the selected row.
/// </summary>
/// <remarks>
/// The three item buttons and the automatic refresh all read this rather than the two flags separately.
/// Deleting, renaming and moving are one at a time by construction — each form's own opening clears the
/// other — and what this names is the state where none of them may be started and nothing may pull the
/// listing out from under the question. See <see cref="SettleRemoteListingAsync"/>.
/// </remarks>
internal bool IsAskingAboutRemoteEntry => IsConfirmingRemoteDeletion || IsMovingRemote;
/// <summary>Whether the pane's DELETE is live.</summary>
/// <remarks>
/// Off while its own question is up, so a second press cannot arm a second one behind the card — and
/// disabled rather than hidden, because this button sits in a row of three and a gap where it was would
/// move UP and REFRESH out from under the pointer.
/// Off while any of the three questions is up, so a second press cannot arm a second one behind the
/// form — and disabled rather than hidden, because these buttons sit in a row and a gap where one was
/// would move the other two out from under the pointer.
/// </remarks>
internal bool CanDeleteRemote => IsConnected && !IsConfirmingRemoteDeletion;
internal bool CanDeleteRemote => IsConnected && !IsAskingAboutRemoteEntry;
/// <inheritdoc cref="CanDeleteRemote" />
internal bool CanRenameRemote => CanDeleteRemote;
/// <inheritdoc cref="CanDeleteRemote" />
internal bool CanMoveRemote => CanDeleteRemote;
/// <summary>
/// Whether the pane shows the row of things that can be done to the chosen row.
/// </summary>
/// <remarks>
/// Gone while one of the three questions is up, rather than merely disabled, and the phone head does
/// the same with its own buttons for the same reason: the form is the answer to the question those
/// buttons ask, and a pane 204 pixels wide inside the session shell has to spend the height on one or
/// the other. What is not on screen is not a control somebody can press by mistake either.
/// </remarks>
internal bool ShowsRemoteItemActions => IsConnected && !IsAskingAboutRemoteEntry;
/// <summary>Whether a transfer has landed in the directory showing and it has not been re-read yet.</summary>
/// <remarks>See <see cref="SettleRemoteListingAsync"/> for when that is allowed to be true for a while.</remarks>
internal bool RemoteListingIsStale => remoteListingIsStale;
/// <summary>
/// What the item row says it is about — the chosen row's name, or the sentence that says to choose one.
/// </summary>
/// <remarks>
/// A name rather than a full path, unlike the questions the buttons open: this line sits directly above
/// the listing with the row it names highlighted in it, so the disambiguation a confirmation needs is
/// already on screen. The forms carry the path, because by then the answer is being committed rather
/// than merely looked at.
/// </remarks>
internal string SelectedRemoteName => SelectedRemoteEntry?.Name ?? "Choose a row to act on it";
// ---- The local pane ----
@@ -1199,6 +1367,58 @@ internal sealed partial class TransfersViewModel : ObservableObject, IAsyncDispo
}
}
/// <summary>
/// Goes wherever the path box says.
/// </summary>
/// <remarks>
/// <para>
/// The way out of the breadcrumb's own limit: it can only offer what is under the directory already
/// listed, so crossing the filesystem meant walking down to the root and back up again, a round trip a
/// level. What is typed may be absolute, relative to the directory showing, or start at <c>~</c> — see
/// <see cref="SftpPath.Resolve"/>, which is where all three become one absolute path.
/// </para>
/// <para>
/// A blank box is not a request to go to the root. It puts the current path back and stays where it is:
/// somebody who cleared the box and pressed Enter has not asked for anything, and <c>/</c> is a long way
/// from where they were.
/// </para>
/// <para>
/// Nothing is validated here beyond that. Whether the path exists, is a directory and may be read are
/// three questions only the server can answer, and it answers all three at once by refusing the listing
/// — which lands in the status line with the server's own words in it.
/// </para>
/// </remarks>
[RelayCommand]
private async Task GoToTypedRemotePathAsync(CancellationToken cancellationToken)
{
if (session is not { } open)
{
Status = "Connect to a host first.";
return;
}
if (RemotePathDraft.Trim().Length == 0)
{
RemotePathDraft = RemotePath;
return;
}
var from = RemotePath.Length > 0 ? RemotePath : open.HomeDirectory;
await NavigateRemoteAsync(
SftpPath.Resolve(from, RemotePathDraft, open.HomeDirectory), cancellationToken)
.ConfigureAwait(true);
}
/// <summary>Puts the real path back in the box, for the Escape key.</summary>
/// <remarks>
/// Half-typed text left in a box that says where you are is a box that is lying about where you are, and
/// the pane underneath it goes on showing the directory it always was. Escape is the way out of that
/// without having to remember what was in the box before.
/// </remarks>
[RelayCommand]
private void RevertTypedRemotePath() => RemotePathDraft = RemotePath;
/// <summary>
/// Opens whatever is selected in the remote pane, if it is somewhere to go.
/// </summary>
@@ -1631,6 +1851,9 @@ internal sealed partial class TransfersViewModel : ObservableObject, IAsyncDispo
return;
}
// The other question goes, so the two forms cannot be on screen at once over one row.
PendingRemoteMove = null;
PendingRemoteDeletion = new RemoteDeletionRequest(row.Name, row.FullPath, !row.IsFile);
}
@@ -1666,8 +1889,173 @@ internal sealed partial class TransfersViewModel : ObservableObject, IAsyncDispo
}
/// <summary>Thinks better of it.</summary>
/// <remarks>
/// Settles the listing on the way out. A transfer that landed while the question was up left the pane
/// out of date and was not allowed to refresh it — see <see cref="SettleRemoteListingAsync"/> — so
/// dismissing the question is the moment that refresh becomes safe.
/// </remarks>
[RelayCommand]
private void CancelDeleteRemote() => PendingRemoteDeletion = null;
private async Task CancelDeleteRemoteAsync()
{
PendingRemoteDeletion = null;
await SettleRemoteListingAsync().ConfigureAwait(true);
}
/// <summary>Opens the rename form on the chosen row.</summary>
[RelayCommand]
private void RenameRemote() => AskAboutMoving(RemoteMoveKind.Rename);
/// <summary>Opens the move form on the chosen row.</summary>
[RelayCommand]
private void MoveRemote() => AskAboutMoving(RemoteMoveKind.Move);
/// <remarks>
/// Both forms, because they differ only in what the box starts out holding and what the labels say —
/// see <see cref="RemoteMoveRequest"/>. The rename starts from the current name and the move from the
/// current directory, so each opens showing the answer that changes nothing and what gets edited is the
/// half somebody actually came to change.
/// </remarks>
private void AskAboutMoving(RemoteMoveKind kind)
{
if (SelectedRemoteEntry is not { } row)
{
Status = kind is RemoteMoveKind.Rename
? "Choose something on the host to rename."
: "Choose something on the host to move.";
return;
}
// The other question goes, so the two forms cannot be on screen at once over one row.
PendingRemoteDeletion = null;
PendingRemoteMove = new RemoteMoveRequest(row.Name, row.FullPath, !row.IsFile, kind);
RemoteMoveTarget = kind is RemoteMoveKind.Rename
? row.Name
: SftpPath.Parent(row.FullPath);
}
/// <summary>
/// Carries out whichever of the two was filled in.
/// </summary>
/// <remarks>
/// <para>
/// One SFTP rename underneath both, which is what the protocol offers and the whole of what a move is
/// on one host. It follows that neither works across hosts and neither works across a filesystem
/// boundary on the same host: the server refuses with <c>EXDEV</c>, and that refusal arrives in the
/// status line as the server's own sentence rather than being pre-empted by a guess here about which of
/// its mounts a path is on.
/// </para>
/// <para>
/// It acts on the path the form named rather than on the selection, for the reason
/// <see cref="ConfirmDeleteRemoteAsync"/> does: nothing between opening the form and pressing its button
/// may re-point it at a different file.
/// </para>
/// </remarks>
[RelayCommand]
private async Task ConfirmMoveRemoteAsync(CancellationToken cancellationToken)
{
if (PendingRemoteMove is not { } request)
{
return;
}
if (!TryResolveMoveDestination(request, out var destination, out var refusal))
{
// The form stays open. What was typed is what has to be corrected, and taking the form away
// would take the box holding it as well.
Status = refusal;
return;
}
PendingRemoteMove = null;
await RunAsync(
request.IsRename ? $"Renaming {request.Name}…" : $"Moving {request.Name}…",
async () =>
{
await RequireSession()
.RenameAsync(request.FullPath, destination, cancellationToken)
.ConfigureAwait(true);
await ListRemoteAsync(RemotePath, cancellationToken).ConfigureAwait(true);
Status = request.IsRename
? $"Renamed {request.Name} to {SftpPath.Name(destination)}."
: $"Moved {request.Name} to {SftpPath.Parent(destination)}.";
}).ConfigureAwait(true);
}
/// <summary>Thinks better of it.</summary>
/// <inheritdoc cref="CancelDeleteRemoteAsync" path="/remarks" />
[RelayCommand]
private async Task CancelMoveRemoteAsync()
{
PendingRemoteMove = null;
RemoteMoveTarget = string.Empty;
await SettleRemoteListingAsync().ConfigureAwait(true);
}
/// <summary>
/// Works out where the typed answer actually points, or why it points nowhere.
/// </summary>
/// <remarks>
/// The three refusals here are the ones a server's own error message would not explain. A separator in
/// a name is a move wearing a rename's clothing and the server would simply say "no such file" about a
/// directory nobody meant to name; a destination equal to the source is a request that succeeds while
/// doing nothing; and a directory moved inside itself is <c>EINVAL</c>, which is true and says nothing.
/// Everything else — a path that is not there, a name already taken, a mount that cannot be crossed —
/// is left to the server, which knows and this does not.
/// </remarks>
private bool TryResolveMoveDestination(
RemoteMoveRequest request, out string destination, out string refusal)
{
destination = string.Empty;
var typed = RemoteMoveTarget.Trim();
if (typed.Length == 0)
{
refusal = request.IsRename
? "Type a new name for it."
: "Type the directory to move it into.";
return false;
}
if (request.IsRename)
{
if (typed.Contains('/', StringComparison.Ordinal))
{
refusal = "A name cannot contain '/'. Use MOVE to put it in another directory.";
return false;
}
destination = SftpPath.Combine(SftpPath.Parent(request.FullPath), typed);
}
else
{
var into = SftpPath.Resolve(RemotePath, typed, session?.HomeDirectory);
destination = SftpPath.Combine(into, request.Name);
}
if (string.Equals(destination, request.FullPath, StringComparison.Ordinal))
{
refusal = $"{request.Name} is already there.";
return false;
}
if (request.IsDirectory
&& destination.StartsWith(request.FullPath + "/", StringComparison.Ordinal))
{
refusal = "A directory cannot be moved inside itself.";
return false;
}
refusal = string.Empty;
return true;
}
/// <inheritdoc />
public async ValueTask DisposeAsync()
@@ -1713,13 +2101,31 @@ internal sealed partial class TransfersViewModel : ObservableObject, IAsyncDispo
return RunAsync($"Reading {path}…", () => ListRemoteAsync(path, cancellationToken));
}
/// <remarks>
/// <para>
/// <b>The selection survives if the row it was on does.</b> Every listing replaces every row object, so
/// keeping the object would keep a selection pointing at something no longer in the list; it is re-found
/// by path instead. This matters because a listing is no longer only something somebody asked for — a
/// finished upload refreshes this pane on its own, and a refresh that cleared the selection would take
/// the row out from under whoever was about to press RENAME on it.
/// </para>
/// <para>
/// The path box is written back here rather than by each caller, so that every way of moving — a crumb,
/// UP, a pin, connecting, a rename that lands — leaves the box saying where the pane actually is.
/// </para>
/// </remarks>
private async Task ListRemoteAsync(string path, CancellationToken cancellationToken)
{
var entries = await RequireSession().ListAsync(path, cancellationToken).ConfigureAwait(true);
var wasSelected = SelectedRemoteEntry?.FullPath;
RemotePath = path;
RemotePathDraft = path;
SelectedRemoteEntry = null;
// Whatever made it stale, this is a fresh read of the very directory that was stale.
remoteListingIsStale = false;
RemoteEntries.Clear();
foreach (var entry in entries)
@@ -1734,10 +2140,99 @@ internal sealed partial class TransfersViewModel : ObservableObject, IAsyncDispo
RemoteTrail.Add(new CrumbViewModel(name, crumb));
}
SelectedRemoteEntry = wasSelected is null
? null
: RemoteEntries.FirstOrDefault(
row => string.Equals(row.FullPath, wasSelected, StringComparison.Ordinal));
Status = string.Empty;
}
/// <summary>
/// Re-reads the remote directory because something landed in it, if now is a moment to.
/// </summary>
/// <remarks>
/// <para>
/// <b>An upload that finished is a listing that is wrong.</b> The pane went on showing the directory as
/// it was before the file arrived, and the only way to see the file that had just been sent was to press
/// REFRESH — which is the application asking somebody to tell it about something it did itself.
/// </para>
/// <para>
/// <b>It waits rather than interrupting.</b> Three states are not the moment: another operation is
/// running, which would have two listings racing for the same collection; one of the three questions is
/// on screen, and pulling the listing out from under a question about a row is how the row somebody
/// answered about stops being the row that was acted on; or nothing is connected. In all three the
/// staleness is remembered and settled later — at the end of the operation, or when the question is
/// dismissed.
/// </para>
/// <para>
/// <b>It says nothing.</b> Nobody asked for this listing, so it neither announces itself nor reports a
/// failure: the status line at that moment is carrying the word about the transfer that just finished,
/// which is the news. A refresh that failed leaves the pane as it was and the staleness set, so the next
/// settling tries again.
/// </para>
/// </remarks>
internal async Task SettleRemoteListingAsync()
{
if (!remoteListingIsStale || !IsConnected || IsBusy || IsAskingAboutRemoteEntry
|| RemotePath.Length == 0)
{
return;
}
var said = Status;
IsBusy = true;
try
{
await ListRemoteAsync(RemotePath, CancellationToken.None).ConfigureAwait(true);
Status = said;
}
catch (Exception exception) when (exception is not OutOfMemoryException)
{
remoteListingIsStale = true;
}
finally
{
IsBusy = false;
}
}
/// <summary>
/// Notices that a finished transfer changed a directory that is on screen.
/// </summary>
/// <remarks>
/// Both panes, because both go stale the same way and for the same reason — an upload lands on the host
/// and a download lands on this machine, and whichever pane is showing that directory is now showing it
/// as it was a moment ago. Only the directory actually on screen: a transfer into somewhere else changed
/// nothing anybody is looking at, and re-listing for it would be a round trip per completed transfer in
/// a queue that may be moving a hundred files elsewhere.
/// </remarks>
internal void NoteTransferLanded(TransferSnapshot transfer)
{
if (transfer.Direction is TransferDirection.Upload)
{
if (string.Equals(SftpPath.Parent(transfer.RemotePath), RemotePath, StringComparison.Ordinal))
{
remoteListingIsStale = true;
_ = SettleRemoteListingAsync();
}
return;
}
// The local pane is a filesystem call rather than a round trip, so there is nothing to defer: it is
// re-read where it stands. Compared case-insensitively because this end is Windows as often as not.
if (string.Equals(
Path.GetDirectoryName(transfer.LocalPath), LocalPath, StringComparison.OrdinalIgnoreCase))
{
NavigateLocal(LocalPath);
}
}
/// <remarks>
/// Synchronous, unlike its remote counterpart. A local directory listing is a filesystem call rather than
/// a network round trip, and wrapping it in a task would put a state machine and a thread hop behind
@@ -1748,6 +2243,7 @@ internal sealed partial class TransfersViewModel : ObservableObject, IAsyncDispo
try
{
var entries = LocalDirectory.List(path);
var wasSelected = SelectedLocalEntry?.FullPath;
LocalPath = Path.GetFullPath(path);
SelectedLocalEntry = null;
@@ -1761,6 +2257,13 @@ internal sealed partial class TransfersViewModel : ObservableObject, IAsyncDispo
RebuildLocalTrail();
// Re-found by path rather than kept, for the reason ListRemoteAsync gives: a finished download
// re-reads this pane on its own, and a refresh that cleared the selection would take the row
// out from under whoever was about to send it somewhere.
SelectedLocalEntry = wasSelected is null
? null
: LocalEntries.FirstOrDefault(
row => string.Equals(row.FullPath, wasSelected, StringComparison.OrdinalIgnoreCase));
}
catch (Exception exception) when (exception is IOException or UnauthorizedAccessException)
{
@@ -1877,10 +2380,19 @@ internal sealed partial class TransfersViewModel : ObservableObject, IAsyncDispo
ConnectedPinnedPaths.Clear();
OnPropertyChanged(nameof(HasConnectedPins));
RemotePath = string.Empty;
RemotePathDraft = string.Empty;
RemoteEntries.Clear();
RemoteTrail.Clear();
SelectedRemoteEntry = null;
// Both questions go with the session they were about, and the box either of them was filled in
// from with them. A form left open over a pane that is no longer connected to anything would
// commit against RequireSession's own refusal.
PendingRemoteDeletion = null;
PendingRemoteMove = null;
RemoteMoveTarget = string.Empty;
remoteListingIsStale = false;
// Same ordering reason as the raise at the end of MarkHostConnected: both properties this reads are
// already null above, so the raise belongs after them rather than in OnIsConnectedChanged. This also
// covers OpenBucketAsync, which calls this method first and never itself turns HasLiveFileSession on.
@@ -1911,6 +2423,9 @@ internal sealed partial class TransfersViewModel : ObservableObject, IAsyncDispo
{
ReleaseStaged(e.Transfer.LocalPath);
}
// Whichever pane the bytes landed in is showing that directory as it was before they did.
NoteTransferLanded(e.Transfer);
}
if (Transfers.FirstOrDefault(row => row.Id == e.Transfer.Id) is { } existing)
@@ -1961,6 +2476,10 @@ internal sealed partial class TransfersViewModel : ObservableObject, IAsyncDispo
{
IsBusy = false;
}
// The one place every command on this screen passes through on its way out, which makes it the one
// place a listing that went stale while it was running can safely be settled.
await SettleRemoteListingAsync().ConfigureAwait(true);
}
partial void OnSelectedHostChanged(HostRowViewModel? value) =>
@@ -2002,7 +2521,7 @@ internal sealed partial class TransfersViewModel : ObservableObject, IAsyncDispo
{
OnPropertyChanged(nameof(CanDownload));
OnPropertyChanged(nameof(CanUpload));
OnPropertyChanged(nameof(CanDeleteRemote));
RaiseItemActionState();
// Both ways, and the disconnecting half is the one worth stating: closing a session puts the pane
// back to its invitation rather than to the form, so what the pane shows after a disconnect is the
@@ -2019,14 +2538,37 @@ internal sealed partial class TransfersViewModel : ObservableObject, IAsyncDispo
partial void OnSelectedRemoteEntryChanged(RemoteEntryRowViewModel? value)
{
OnPropertyChanged(nameof(CanDownload));
OnPropertyChanged(nameof(SelectedRemoteName));
PendingRemoteDeletion = null;
PendingRemoteMove = null;
}
partial void OnPendingRemoteDeletionChanged(RemoteDeletionRequest? value)
{
OnPropertyChanged(nameof(IsConfirmingRemoteDeletion));
RaiseItemActionState();
}
partial void OnPendingRemoteMoveChanged(RemoteMoveRequest? value)
{
OnPropertyChanged(nameof(IsMovingRemote));
RaiseItemActionState();
}
/// <summary>Raises the flags the three item buttons and their two forms are drawn from.</summary>
/// <remarks>
/// Together, because they are one fact — is there a question on screen, and is anything connected —
/// read five ways, and a caller that raised some of them would leave a button live beside a form that
/// says it is not.
/// </remarks>
private void RaiseItemActionState()
{
OnPropertyChanged(nameof(IsAskingAboutRemoteEntry));
OnPropertyChanged(nameof(ShowsRemoteItemActions));
OnPropertyChanged(nameof(CanDeleteRemote));
OnPropertyChanged(nameof(CanRenameRemote));
OnPropertyChanged(nameof(CanMoveRemote));
}
partial void OnSelectedLocalEntryChanged(LocalEntryRowViewModel? value) =>
src/DodoSSH.Client.Ssh/SftpSession.cs
+87
View File
@@ -234,6 +234,93 @@ public static class SftpPath
return trail;
}
/// <summary>
/// Turns something a person typed into an absolute path.
/// </summary>
/// <remarks>
/// <para>
/// The file browser's path box is the reason this exists. A breadcrumb can only offer the path it is
/// already standing on, so reaching <c>/var/log/nginx</c> from a home directory is a click and a round
/// trip per level — and somebody who already knows where they are going types it instead. What they
/// type is not always absolute: <c>..</c>, <c>logs</c> and <c>~/.ssh</c> are all ordinary answers to
/// "where to", and a box that took only a leading slash would refuse three of the four shapes every
/// shell accepts.
/// </para>
/// <para>
/// <b>Resolved here rather than left to the server.</b> An SFTP server does resolve a relative path —
/// against the session's own working directory, which is not necessarily the directory this pane is
/// showing — so handing one over would navigate somewhere the breadcrumb above it did not predict. What
/// this returns is absolute, which is the only kind every other member here takes.
/// </para>
/// <para>
/// <c>..</c> is collapsed textually, which is one thing a shell's own <c>cd</c> does not do: through a
/// symbolic link, <c>..</c> leads to the link's parent here and to the target's parent on the server.
/// The difference shows only on a path that walks into a link and back out of it, and the alternative is
/// a <c>realpath</c> round trip before anything is listed at all.
/// </para>
/// </remarks>
/// <param name="current">The directory a relative path is taken to be relative to.</param>
/// <param name="typed">What was typed. Blank answers <paramref name="current"/>.</param>
/// <param name="home">
/// What <c>~</c> means, or null in a session that has not said. A leading <c>~</c> with no home to
/// expand stays an ordinary segment rather than being guessed at — a directory really can be called
/// that, and inventing a home directory to point at would be worse than listing the one that is there.
/// </param>
public static string Resolve(string current, string typed, string? home = null)
{
ArgumentException.ThrowIfNullOrEmpty(current);
ArgumentNullException.ThrowIfNull(typed);
var wanted = typed.Trim();
if (wanted.Length == 0)
{
return Normalize(current);
}
if (home is { Length: > 0 }
&& (string.Equals(wanted, "~", StringComparison.Ordinal)
|| wanted.StartsWith("~/", StringComparison.Ordinal)))
{
wanted = wanted.Length == 1 ? home : Combine(home, wanted[2..]);
}
return Normalize(IsAbsolute(wanted) ? wanted : Combine(current, wanted));
}
/// <summary>Collapses <c>.</c>, <c>..</c> and repeated separators, anchored at the root.</summary>
/// <remarks>
/// <c>..</c> above the root is the root, as it is in every shell: <c>/../..</c> is <c>/</c> rather than
/// a failure, because there is nowhere else for it to be.
/// </remarks>
private static string Normalize(string path)
{
var walked = new List<string>();
foreach (var segment in path.Split('/', StringSplitOptions.RemoveEmptyEntries))
{
switch (segment)
{
case ".":
break;
case "..":
if (walked.Count > 0)
{
walked.RemoveAt(walked.Count - 1);
}
break;
default:
walked.Add(segment);
break;
}
}
return walked.Count == 0 ? Root : Root + string.Join('/', walked);
}
}
/// <summary>