Skip to content
This repository has been archived by the owner on Aug 31, 2021. It is now read-only.

Commit

Permalink
bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mkloubert committed Mar 17, 2018
1 parent ed5133e commit 0b70157
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 22 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

[![Share via Facebook](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Facebook.png)](https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&quote=vscode-deploy-reloaded) [![Share via Twitter](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Twitter.png)](https://twitter.com/intent/tweet?source=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&text=vscode-deploy-reloaded:%20https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&via=mjkloubert) [![Share via Google+](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Google+.png)](https://plus.google.com/share?url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded) [![Share via Pinterest](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Pinterest.png)](https://pinterest.com/pin/create/button/?url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&media=https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/demo1.gif&description=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20%27vs-deploy%27%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.) [![Share via Reddit](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Reddit.png)](https://www.reddit.com/submit?url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&title=vscode-deploy-reloaded) [![Share via LinkedIn](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/LinkedIn.png)](https://www.linkedin.com/shareArticle?mini=true&url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&title=vscode-deploy-reloaded&summary=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20%27vs-deploy%27%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.&source=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded) [![Share via Wordpress](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Wordpress.png)](https://wordpress.com/press-this.php?u=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&quote=vscode-deploy-reloaded&s=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20%27vs-deploy%27%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.&i=https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/demo1.gif) [![Share via Email](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Email.png)](mailto:?subject=vscode-deploy-reloaded&body=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20'vs-deploy'%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.:%20https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded)

## 0.62.0 (March 17th, 2018; password prompts)
## 0.62.3 (March 17th, 2018; password prompts and bugfixes)

* fixed bugs in [SFTP](https://github.com/mkloubert/vscode-deploy-reloaded/wiki/target_sftp) and [FTP](https://github.com/mkloubert/vscode-deploy-reloaded/wiki/target_ftp) target, when deploying to root directory ... s. [issue #45](https://github.com/mkloubert/vscode-deploy-reloaded/issues/45) and [issue #46](https://github.com/mkloubert/vscode-deploy-reloaded/issues/46)
* automatic input boxes for username and/or password, if one of them is not defined in [SFTP](https://github.com/mkloubert/vscode-deploy-reloaded/wiki/target_sftp) and [FTP](https://github.com/mkloubert/vscode-deploy-reloaded/wiki/target_ftp) targets ... s. [issue #48](https://github.com/mkloubert/vscode-deploy-reloaded/issues/48)
* showing relative paths for single files, when using `showPopupWhenFinished` [setting](https://github.com/mkloubert/vscode-deploy-reloaded/wiki#settings--), now ... s. [issue #47](https://github.com/mkloubert/vscode-deploy-reloaded/issues/47#issuecomment-373940021)
* bugfixes
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "vscode-deploy-reloaded",
"displayName": "Deploy (Reloaded)",
"description": "Deploys files of a workspace to a destination.",
"version": "0.62.2",
"version": "0.62.3",
"publisher": "mkloubert",
"engines": {
"vscode": "^1.21.0"
Expand Down
16 changes: 11 additions & 5 deletions src/clients/ftp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ export abstract class FTPClientBase extends deploy_clients.AsyncFileListBase {
*/
protected async createDirectoryIfNeeded(dir: string) {
dir = toFTPPath(dir);
if ('/' === dir) {
return false;
}

// check if remote directory exists
if (true === this._existingRemoteDirs[dir]) {
Expand Down Expand Up @@ -744,8 +747,6 @@ class JsFTPClient extends FTPClientBase {
public list(dir: string): Promise<deploy_files.FileSystemInfo[]> {
const ME = this;

dir = toFTPPath(dir);

return new Promise<deploy_files.FileSystemInfo[]>((resolve, reject) => {
const COMPLETED = deploy_helpers.createCompletedAction(resolve, reject);

Expand Down Expand Up @@ -997,10 +998,15 @@ export async function openConnection(opts: FTPConnectionOptions): Promise<FTPCli
/**
* Converts to a FTP path.
*
* @param {string} path The path to convert.
* @param {string} p The path to convert.
*
* @return {string} The converted path.
*/
export function toFTPPath(path: string) {
return '/' + deploy_helpers.normalizePath(path);
export function toFTPPath(p: string) {
p = deploy_helpers.normalizePath(p);
if ('.' === p) {
p = '';
}

return '/' + p;
}
35 changes: 21 additions & 14 deletions src/clients/sftp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -312,18 +312,20 @@ export class SFTPClient extends deploy_clients.AsyncFileListBase {
}

// check if remote directory exists
if (true !== this._checkedRemoteDirs[REMOTE_DIR]) {
try {
// check if exist
await this.client.list(REMOTE_DIR);
}
catch (e) {
// no, try to create
await this.client.mkdir(REMOTE_DIR, true);
}
if ('/' !== REMOTE_DIR) {
if (true !== this._checkedRemoteDirs[REMOTE_DIR]) {
try {
// check if exist
await this.client.list(REMOTE_DIR);
}
catch (e) {
// no, try to create
await this.client.mkdir(REMOTE_DIR, true);
}

// mark as checked
this._checkedRemoteDirs[REMOTE_DIR] = true;
// mark as checked
this._checkedRemoteDirs[REMOTE_DIR] = true;
}
}

let modeToSet: number | false = false;
Expand Down Expand Up @@ -509,10 +511,15 @@ export async function openConnection(opts: SFTPConnectionOptions): Promise<SFTPC
/**
* Converts to a SFTP path.
*
* @param {string} path The path to convert.
* @param {string} p The path to convert.
*
* @return {string} The converted path.
*/
export function toSFTPPath(path: string) {
return '/' + deploy_helpers.normalizePath(path);
export function toSFTPPath(p: string) {
p = deploy_helpers.normalizePath(p);
if ('.' === p) {
p = '';
}

return '/' + p;
}

0 comments on commit 0b70157

Please sign in to comment.