修复 jsftp 的一个 bug，参见 sergi/jsftp#138

qiu8310 · Sep 19, 2015 · 7933c8d · 7933c8d
1 parent 096a394
commit 7933c8d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/cli.js b/cli.js
@@ -112,8 +112,16 @@ require('./')(dir, globPatterns, opts, function(err, all) {
 
       if (program.homeLog) {
         var daLogDir = path.join(path.homedir(), '.da_log');
+        var d = new Date();
+        var s = ['FullYear', 'Month', 'Date', 'Hours', 'Minutes', 'Seconds'].map(function (k) {
+          var v = d['get' + k]();
+          if (k === 'Month') v += 1;
+          v = new String(v);
+          if (v.length < 2) v = '0' + v;
+          return v;
+        });
         fs.ensureDirSync(daLogDir);
-        write(path.join(daLogDir, Date.now() + '.log.json'), logMap);
+        write(path.join(daLogDir, s.join('-') + '.log.json'), logMap);
       }
 
       if (program.mapLocalPath) {

diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "commander": "^2.8.0",
     "fs-extra": "^0.18.2",
     "glob": "^5.0.5",
-    "jsftp": "^1.5.2",
+    "jsftp": "qiu8310/jsftp",
     "lodash": "^3.7.0",
     "mime": "^1.3.4",
     "mkdirp": "^0.5.0",

diff --git a/src/uploader.js b/src/uploader.js
@@ -28,6 +28,7 @@ function Uploader(opts) {
    * @type {Boolean}
    */
   this.enableBatchUpload = false;
+
 }
 
 

diff --git a/src/uploaders/ftp.js b/src/uploaders/ftp.js
@@ -85,6 +85,7 @@ function FtpUploader(opts) {
 
   self.port = opts.port || 21;
 
+  log.info('Create ftp');
   self.ftp = new FTP({host: self.host, user: self.user, pass: self.pass, port: self.port});
 
   self.baseUrl = self.normalizeBaseUrl(opts.baseUrl);
@@ -129,7 +130,6 @@ FtpUploader.prototype.batchUploadFiles = function(files, cb) {
       self.endFtp();
       return cb(err);
     }
-
     async.eachSeries(
       files,
       function (file, done) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ function Uploader(opts) { @@
        * @type {Boolean}
        */
       this.enableBatchUpload = false;
     }
@@ Expand Down @@