Skip to content

Commit

Permalink
bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@wangyucode
wangyucode committed Feb 21, 2023
1 parent db975f4 commit 0ce8147
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 35 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ this is a github action script for upload files to server via SFTP protocol.

```yml
- name: SFTP uploader
uses: wangyucode/[email protected].1
uses: wangyucode/[email protected].2
with:
host: 'wycode.cn'
password: ${{ secrets.password }}
Expand All @@ -43,7 +43,7 @@ this is a github action script for upload files to server via SFTP protocol.
```yml
- name: SFTP uploader
uses: wangyucode/[email protected].1
uses: wangyucode/[email protected].2
with:
host: 'wycode.cn'
privateKey: ${{ secrets.key }}
Expand All @@ -66,7 +66,7 @@ jobs:
uses: actions/checkout@v2

- name: 📂 SFTP uploader # Upload to SFTP
uses: wangyucode/[email protected].1
uses: wangyucode/[email protected].2
with:
host: ${{ secrets.HOST }} # Recommended to put the credentials in github secrets.
username: ${{ secrets.USER }}
Expand Down
41 changes: 26 additions & 15 deletions dist/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ class Deployer {
continue;
}
const r = this.remoteFiles.find(r => r.path === l.path);
const localFile = path.posix.join(this.config.localDir, l.path);
const remoteFile = path.posix.join(this.config.remoteDir, l.path);
const localFile = path.join(this.config.localDir, l.path);
const remoteFile = path.join(this.config.remoteDir, l.path).replace(/\\/g, '/');
if (this.options.forceUpload) {
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''} force upload -> ${l.path}`);
if (!this.options.dryRun) {
Expand All @@ -72,18 +72,24 @@ class Deployer {
throw new Error(`remote has different file type and same name of ${r.path}, consider using 'forceUpload' to overwrite it.`);
} else if (!r.isDirectory) {
if (r.size !== l.size) {
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''}uploading different -> ${l.path}`);
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''}replace different -> ${l.path}`);
if (!this.options.dryRun) await this.sftp.put(localFile, remoteFile);
} else if (r.mtime < l.mtime) {
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''}uploading newer -> ${l.path}`);
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''}replace newer -> ${l.path}`);
if (!this.options.dryRun) await this.sftp.put(localFile, remoteFile);
} else {
console.log(`server has same file: ${localFile}, skipping upload.`);
}
}
} else if (!l.isDirectory) {
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''}creating file -> ${remoteFile}`);
if (!this.options.dryRun){
await this.sftp.mkdir(path.dirname(remoteFile), true);
await this.sftp.put(localFile, remoteFile);
}
} else {
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''}uploading: ${l.path}`);
if (!this.options.dryRun) await this.sftp.put(localFile, remoteFile);
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''}creating folder -> ${remoteFile}`);
if (!this.options.dryRun) await this.sftp.mkdir(remoteFile, true);
}
}
}
Expand All @@ -98,28 +104,33 @@ class Deployer {
const filePath = path.join(localPath, file.name);
if (file.isDirectory()) {
console.log(`reading local folder -> ${filePath}`);
this.localFiles.push({ path: this.getRelativePath(filePath, this.config.localDir), isDirectory: true });
this.localFiles.push({ path: this.getRelativePath(filePath, false), isDirectory: true });
// recursion
await this.readLocalFiles(filePath);
} else {
console.log(`reading local file -> ${filePath}`);
const fileState = await lstat(filePath);
this.localFiles.push({ path: this.getRelativePath(filePath, this.config.localDir), size: fileState.size, mtime: fileState.mtimeMs });
this.localFiles.push({ path: this.getRelativePath(filePath, false), size: fileState.size, mtime: fileState.mtimeMs });
}
}
} else {
console.log(`reading local file -> ${localPath}`);
this.localFiles.push({ path: this.getRelativePath(localPath, this.config.localDir), size: stats.size, mtime: stats.mtimeMs });
this.localFiles.push({ path: this.getRelativePath(localPath, false), size: stats.size, mtime: stats.mtimeMs });
}
}

async readRemoteFiles(remotePath) {
const stats = await this.sftp.stat(remotePath);
let canNotReadFolder = false;
const stats = await this.sftp.stat(remotePath).catch(() => {
console.error(`can not read remote folder -> ${remotePath}`);
canNotReadFolder = true;
});
if (canNotReadFolder) return;
if (stats.isDirectory) {
const filesOnServer = await this.sftp.list(remotePath);
for (const file of filesOnServer) {
const filePath = path.posix.join(remotePath, file.name);
const relativePath = this.getRelativePath(filePath, this.config.remoteDir);
const relativePath = this.getRelativePath(filePath, true);
let removed = false;
// remove extra files on remote side
if (this.options.removeExtraFilesOnServer) {
Expand All @@ -141,7 +152,7 @@ class Deployer {
}
} else {
console.log(`reading remote file -> ${remotePath}`);
this.remoteFiles.push({ path: this.getRelativePath(remotePath, this.config.remoteDir), size: stats.size, mtime: stats.modifyTime });
this.remoteFiles.push({ path: this.getRelativePath(remotePath, true), size: stats.size, mtime: stats.modifyTime });
}
}

Expand All @@ -158,9 +169,9 @@ class Deployer {
return true;
}

getRelativePath(file, dir) {
const dirPath = path.resolve(dir);
const filePath = path.resolve(file);
getRelativePath(file, isRemote) {
const dirPath = isRemote ? path.resolve(this.config.remoteDir) : path.resolve(this.config.localDir);
const filePath = isRemote ? path.resolve(file) : path.resolve(file);
return dirPath === filePath ? filePath : filePath.replace(dirPath, '');
}

Expand Down
41 changes: 26 additions & 15 deletions lib/deployer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ class Deployer {
continue;
}
const r = this.remoteFiles.find(r => r.path === l.path);
const localFile = path.posix.join(this.config.localDir, l.path);
const remoteFile = path.posix.join(this.config.remoteDir, l.path);
const localFile = path.join(this.config.localDir, l.path);
const remoteFile = path.join(this.config.remoteDir, l.path).replace(/\\/g, '/');
if (this.options.forceUpload) {
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''} force upload -> ${l.path}`);
if (!this.options.dryRun) {
Expand All @@ -66,18 +66,24 @@ class Deployer {
throw new Error(`remote has different file type and same name of ${r.path}, consider using 'forceUpload' to overwrite it.`);
} else if (!r.isDirectory) {
if (r.size !== l.size) {
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''}uploading different -> ${l.path}`);
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''}replace different -> ${l.path}`);
if (!this.options.dryRun) await this.sftp.put(localFile, remoteFile);
} else if (r.mtime < l.mtime) {
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''}uploading newer -> ${l.path}`);
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''}replace newer -> ${l.path}`);
if (!this.options.dryRun) await this.sftp.put(localFile, remoteFile);
} else {
console.log(`server has same file: ${localFile}, skipping upload.`);
}
}
} else if (!l.isDirectory) {
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''}creating file -> ${remoteFile}`);
if (!this.options.dryRun){
await this.sftp.mkdir(path.dirname(remoteFile), true);
await this.sftp.put(localFile, remoteFile);
}
} else {
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''}uploading: ${l.path}`);
if (!this.options.dryRun) await this.sftp.put(localFile, remoteFile);
console.log(`${this.options.dryRun ? 'Dry-run: ' : ''}creating folder -> ${remoteFile}`);
if (!this.options.dryRun) await this.sftp.mkdir(remoteFile, true);
}
}
}
Expand All @@ -92,28 +98,33 @@ class Deployer {
const filePath = path.join(localPath, file.name);
if (file.isDirectory()) {
console.log(`reading local folder -> ${filePath}`);
this.localFiles.push({ path: this.getRelativePath(filePath, this.config.localDir), isDirectory: true });
this.localFiles.push({ path: this.getRelativePath(filePath, false), isDirectory: true });
// recursion
await this.readLocalFiles(filePath);
} else {
console.log(`reading local file -> ${filePath}`);
const fileState = await lstat(filePath);
this.localFiles.push({ path: this.getRelativePath(filePath, this.config.localDir), size: fileState.size, mtime: fileState.mtimeMs });
this.localFiles.push({ path: this.getRelativePath(filePath, false), size: fileState.size, mtime: fileState.mtimeMs });
}
}
} else {
console.log(`reading local file -> ${localPath}`);
this.localFiles.push({ path: this.getRelativePath(localPath, this.config.localDir), size: stats.size, mtime: stats.mtimeMs });
this.localFiles.push({ path: this.getRelativePath(localPath, false), size: stats.size, mtime: stats.mtimeMs });
}
}

async readRemoteFiles(remotePath) {
const stats = await this.sftp.stat(remotePath);
let canNotReadFolder = false;
const stats = await this.sftp.stat(remotePath).catch(() => {
console.error(`can not read remote folder -> ${remotePath}`);
canNotReadFolder = true;
});
if (canNotReadFolder) return;
if (stats.isDirectory) {
const filesOnServer = await this.sftp.list(remotePath);
for (const file of filesOnServer) {
const filePath = path.posix.join(remotePath, file.name);
const relativePath = this.getRelativePath(filePath, this.config.remoteDir);
const relativePath = this.getRelativePath(filePath, true);
let removed = false;
// remove extra files on remote side
if (this.options.removeExtraFilesOnServer) {
Expand All @@ -135,7 +146,7 @@ class Deployer {
}
} else {
console.log(`reading remote file -> ${remotePath}`);
this.remoteFiles.push({ path: this.getRelativePath(remotePath, this.config.remoteDir), size: stats.size, mtime: stats.modifyTime });
this.remoteFiles.push({ path: this.getRelativePath(remotePath, true), size: stats.size, mtime: stats.modifyTime });
}
}

Expand All @@ -152,9 +163,9 @@ class Deployer {
return true;
}

getRelativePath(file, dir) {
const dirPath = path.resolve(dir);
const filePath = path.resolve(file);
getRelativePath(file, isRemote) {
const dirPath = isRemote ? path.resolve(this.config.remoteDir) : path.resolve(this.config.localDir);
const filePath = isRemote ? path.resolve(file) : path.resolve(file);
return dirPath === filePath ? filePath : filePath.replace(dirPath, '');
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sftp-upload-action",
"version": "2.0.1",
"version": "2.0.2",
"description": "sftp upload using sftp-sync-deploy",
"private": true,
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ new Deployer({
remoteDir: '/root/test/'
}, {
exclude: ['folder4', '**/file3'],
dryRun: true,
dryRun: false,
removeExtraFilesOnServer: true,
}).sync();
// console.log(minimatch('/aaa/folder4/'.replace(/^\//,""), 'aaa/folder4/'))

0 comments on commit 0ce8147

Please sign in to comment.