Comparing version 0.2.0 to 0.3.0
27
cli.js
#!/usr/bin/env node | ||
require('graceful-fs'); | ||
var minimist = require('minimist'); | ||
@@ -80,2 +81,3 @@ var osenv = require('osenv'); | ||
var localDir, s3Url, method; | ||
var getS3Params; | ||
var s3Params = {}; | ||
@@ -86,2 +88,3 @@ if (sourceS3 && !destS3) { | ||
method = client.downloadDir; | ||
getS3Params = downloadGetS3Params; | ||
} else if (!sourceS3 && destS3) { | ||
@@ -92,2 +95,3 @@ localDir = source; | ||
s3Params.ACL = getAcl(); | ||
getS3Params = uploadGetS3Params; | ||
} else { | ||
@@ -110,8 +114,7 @@ console.error("one target must be from S3, the other must be from local file system."); | ||
var syncer = method.call(client, params); | ||
console.error("fetching file list"); | ||
process.stderr.write("Listing objects..."); | ||
setUpProgress(syncer); | ||
} | ||
function getS3Params(filePath, stat, callback) { | ||
function uploadGetS3Params(filePath, stat, callback) { | ||
console.error("Uploading", filePath); | ||
@@ -123,2 +126,7 @@ callback(null, { | ||
function downloadGetS3Params(filePath, s3Object, callback) { | ||
console.error("Downloading", filePath); | ||
callback(null, {}); | ||
} | ||
function cmdList() { | ||
@@ -244,8 +252,15 @@ var recursive = args.recursive; | ||
function setUpProgress(o, notBytes) { | ||
var start = new Date(); | ||
function setUpProgress(o, notBytes, notObjects) { | ||
var start; | ||
var sawAnyProgress = false; | ||
o.on('progress', function() { | ||
if (o.objectsFound != null && o.progressAmount === 0) { | ||
process.stderr.write("\rListing objects... " + o.objectsFound + " objects found "); | ||
sawAnyProgress = true; | ||
} | ||
if (o.progressTotal === 0) return; | ||
sawAnyProgress = true; | ||
if (!start) { | ||
sawAnyProgress = true; | ||
start = new Date(); | ||
} | ||
var percent = Math.floor(o.progressAmount / o.progressTotal * 100); | ||
@@ -252,0 +267,0 @@ var line = "\rProgress: " + |
{ | ||
"name": "s3-cli", | ||
"version": "0.2.0", | ||
"version": "0.3.0", | ||
"description": "command line utility to go along with s3 module", | ||
@@ -12,3 +12,3 @@ "main": "index.js", | ||
"dependencies": { | ||
"s3": "^1.2.0", | ||
"s3": "^1.2.1", | ||
"osenv": "0.0.3", | ||
@@ -18,3 +18,4 @@ "ini": "^1.2.0", | ||
"mime": "^1.2.11", | ||
"file-size": "0.0.3" | ||
"file-size": "0.0.3", | ||
"graceful-fs": "^2.0.3" | ||
}, | ||
@@ -21,0 +22,0 @@ "devDependencies": {}, |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
9486
276
7
+ Addedgraceful-fs@^2.0.3
+ Addedgraceful-fs@2.0.3(transitive)
Updateds3@^1.2.1