Skip to content

Commit 1e438b9

Browse files
committed
resolve #34
1 parent f676bca commit 1e438b9

File tree

3 files changed

+24
-11
lines changed

3 files changed

+24
-11
lines changed

lib/Logger.coffee

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,35 @@ class Logger
1212
title: @title
1313

1414
@panel.attach() if @panel.parents('html').length == 0
15-
16-
@panel.add new PlainMessageView
15+
msg = new PlainMessageView
1716
message: message
1817
className: className
1918

19+
@panel.add msg
20+
2021
@panel.setSummary
2122
summary: message
2223
className: className
2324

2425
@panel.body.scrollTop(1e10)
26+
msg
2527

2628
log: (message) ->
29+
date = new Date
30+
startTime = date.getTime()
31+
message = "[#{date.toLocaleTimeString()}] #{message}"
2732
if atom.config.get("remote-sync.logToConsole")
2833
console.log message
34+
()->
35+
console.log "#{message} Complete (#{Date.now() - startTime}ms)"
2936
else
30-
@showInPanel message,"text-info"
37+
msg = @showInPanel message, "text-info"
38+
()=>
39+
endMsg = "Complete (#{Date.now() - startTime}ms)"
40+
msg.append endMsg
41+
@panel.setSummary
42+
summary: "#{message} #{endMsg}"
43+
className: "text-info"
3144

3245
error: (message) ->
3346
@showInPanel "#{message}","text-error"

lib/transports/FtpTransport.coffee

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ class ScpTransport
2525
@_getConnection (err, c) =>
2626
return errorHandler err if err
2727

28-
@logger.log "Uploading: #{localFilePath} to #{targetFilePath}"
28+
end = @logger.log "Upload: #{localFilePath} to #{targetFilePath} ... "
2929

3030
c.mkdir path.dirname(targetFilePath), true, (err) =>
3131
return errorHandler err if err
3232

3333
c.put localFilePath, targetFilePath, (err) =>
3434
return errorHandler err if err
3535

36-
@logger.log "Uploaded: #{localFilePath} to #{targetFilePath}"
36+
end()
3737

3838
callback()
3939

@@ -50,7 +50,7 @@ class ScpTransport
5050
@_getConnection (err, c) =>
5151
return errorHandler err if err
5252

53-
@logger.log "Downloading: #{targetFilePath} to #{localFilePath}"
53+
end = @logger.log "Download: #{targetFilePath} to #{localFilePath}"
5454

5555
mkdirp = require "mkdirp" if not mkdirp
5656
mkdirp path.dirname(localFilePath), (err) =>
@@ -62,7 +62,7 @@ class ScpTransport
6262
fs = require "fs-plus" if not fs
6363
writableStream = fs.createWriteStream(localFilePath)
6464
writableStream.on "unpipe", =>
65-
@logger.log "Downloaded: #{targetFilePath} to #{localFilePath}"
65+
end()
6666
callback?()
6767
readableStream.pipe writableStream
6868

lib/transports/ScpTransport.coffee

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class ScpTransport
2424
@_getConnection (err, c) =>
2525
return errorHandler err if err
2626

27-
@logger.log "Uploading: #{localFilePath} to #{targetFilePath}"
27+
end = @logger.log "Upload: #{localFilePath} to #{targetFilePath} ... "
2828

2929
c.sftp (err, sftp) =>
3030
return errorHandler err if err
@@ -35,7 +35,7 @@ class ScpTransport
3535
sftp.fastPut localFilePath, targetFilePath, (err) =>
3636
return errorHandler err if err
3737

38-
@logger.log "Uploaded: #{localFilePath} to #{targetFilePath}"
38+
end()
3939

4040
sftp.end()
4141
callback()
@@ -53,7 +53,7 @@ class ScpTransport
5353
@_getConnection (err, c) =>
5454
return errorHandler err if err
5555

56-
@logger.log "Downloading: #{targetFilePath} to #{localFilePath}"
56+
end = @logger.log "Download: #{targetFilePath} to #{localFilePath} ... "
5757

5858
c.sftp (err, sftp) =>
5959
return errorHandler err if err
@@ -64,7 +64,7 @@ class ScpTransport
6464
sftp.fastGet targetFilePath, localFilePath, (err) =>
6565
return errorHandler err if err
6666

67-
@logger.log "Downloaded: #{targetFilePath} to #{localFilePath}"
67+
end()
6868

6969
sftp.end()
7070
callback?()

0 commit comments

Comments
 (0)