Skip to content

Commit

Permalink
Bumped version to v1.16.1
Browse files Browse the repository at this point in the history
Merge pull request #253 from Natizyskunk/develop
  • Loading branch information
Natizyskunk authored Nov 2, 2022
2 parents 000f135 + 600d38e commit e29a3af
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 27 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 1.16.1 - 2022-11-02
* [#251] Add multiple select + Update `Download File` & `Downalod Folder` commands to the remote view + Add `Upload File` & `Upload Folder` commands to the remote view (Pull request [#221](https://github.com/Natizyskunk/vscode-sftp/pull/221) from @NyaPPuu vscode-sftp:add_multiple_select).

## 1.16.0 - 2022-10-29
* [#242] Add order option and fix typos in docs (Pull request [#157](https://github.com/Natizyskunk/vscode-sftp/pull/157) from @NyaPPuu vscode-sftp:add_order_option).
* [#243] Fix refresh when creating/deleting file/folder + Fix 'Reveal in Remote Explorer' and Refresh Button in Remote Explorer. (Pull request [#159](https://github.com/Natizyskunk/vscode-sftp/pull/159) from @NyaPPuu vscode-sftp:fix_refresh).
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ You can see the full list of configuration options [here](https://github.com/Nat
- [Multiple Hop](#multiple-hop)
- [Configuration in User Setting](#configuration-in-user-setting)
- [Remote Explorer](#remote-explorer)
- [Multiple Select](#multiple-select)
- [Order](#order)
- [Debug](#debug)
- [FAQ](#faq)
- [Donation](#donation)
Expand Down Expand Up @@ -270,8 +272,12 @@ Remote Explorer lets you explore files in remote. You can open Remote Explorer b

You can only view a files content with Remote Explorer. Run command `SFTP: Edit in Local` to edit it in local.

_Note:_ You need to manually refresh the parent folder after you **delete** a file to make the explorer updated.
### Multiple Select
You are able to select multiple files/folders at once on the remote server to download and upload. You can do it simply by holding down Ctrl or Shift while selecting all desired files, just like on the regular explorer view.

_Note:_ You need to manually refresh the parent folder after you **delete** a file if the explorer isn't correctly updated.

### Order
You can order the remote Explorer by adding the `remoteExplorer.order` parameter inside your `sftp.json` config file.

In sftp.json:
Expand Down
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 25 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "sftp",
"displayName": "SFTP",
"description": "SFTP/FTP sync",
"version": "1.16.0",
"version": "1.16.1",
"publisher": "Natizyskunk",
"author": "Natizyskunk <[email protected]> (https://github.com/Natizyskunk)",
"engines": {
Expand Down Expand Up @@ -96,7 +96,7 @@
},
{
"command": "sftp.upload.file",
"title": "Upload",
"title": "Upload File",
"category": "SFTP"
},
{
Expand Down Expand Up @@ -489,6 +489,28 @@
"group": "2_files",
"when": "view == remoteExplorer && viewItem != root"
},
{
"command": "sftp.upload.folder",
"group": "3_trans@1",
"alt": "sftp.forceUpload",
"when": "sftp.enabled && viewItem != file"
},
{
"command": "sftp.upload.file",
"group": "3_trans@1",
"when": "view == remoteExplorer && viewItem != root && viewItem == file"
},
{
"command": "sftp.download.folder",
"group": "3_trans@2",
"alt": "sftp.forceDownload",
"when": "sftp.enabled && viewItem != file"
},
{
"command": "sftp.download.file",
"group": "3_trans@2",
"when": "view == remoteExplorer && viewItem != root && viewItem == file"
},
{
"command": "sftp.delete.remote",
"group": "7_modification",
Expand All @@ -503,19 +525,6 @@
"command": "sftp.create.file",
"group": "7_modification",
"when": "view == remoteExplorer && viewItem != file"
},
{
"command": "sftp.download.file",
"group": "2_files",
"when": "view == remoteExplorer && viewItem != root && viewItem == file",
"_comment": "!custom"
},
{
"command": "sftp.download.folder",
"group": "2_files",
"alt": "sftp.forceDownload",
"when": "sftp.enabled && viewItem != file",
"_comment": "!custom - (using != file so that whole site can be downloaded)"
}
],
"scm/title": [
Expand Down Expand Up @@ -584,7 +593,7 @@
"@types/jest": "^23.3.5",
"@types/lru-cache": "^4.1.1",
"@types/node": "^8.10.51",
"@types/vscode": "1.30",
"@types/vscode": "1.40",
"@types/webpack-env": "^1.13.6",
"braces": ">=2.3.1",
"glob-parent": ">=5.1.2",
Expand Down
7 changes: 6 additions & 1 deletion src/commands/shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,12 @@ export function uriFromExplorerContextOrEditorContext(item, items): undefined |
}
} else if ((item as ExplorerItem).resource) {
// from remote explorer
return item.resource.uri;
if (Array.isArray(items) && (items[0] as ExplorerItem).resource) {
// multi-select in remote explorer
return items.map(_ => _.resource.uri);
} else {
return item.resource.uri;
}
}

return;
Expand Down
1 change: 1 addition & 0 deletions src/modules/remoteExplorer/explorer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export default class RemoteExplorer {
this._explorerView = vscode.window.createTreeView('remoteExplorer', {
showCollapseAll: true,
treeDataProvider: this._treeDataProvider,
canSelectMany: true,
});

registerCommand(context, COMMAND_REMOTEEXPLORER_REFRESH, () => this._refreshSelection());
Expand Down

0 comments on commit e29a3af

Please sign in to comment.