Skip to content

Display transfer kbps as human readable INFO message #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jedie wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Display transfer kbps as human readable INFO message #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions src/eyefiserver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,19 @@ LOG_FORMAT = '%(asctime)s %(levelname)s %(message)s'
eyeFiLogger = logging.Logger("eyeFiLogger", logging.DEBUG)


def human_bps(bps):
"""
human-readable bytes per second, e.g. 13 KB/s, 4.1 MB/s, 102 bytes/s, etc.
"""
bps = float(bps)
if bps < 1024:
return "%d Byte%s/s" % (bps, bps != 1 and "s" or "")
if bps < 1024 * 1024:
return "%.1f KB/s" % (bps / 1024)
if bps < 1024 * 1024 * 1024:
return "%.1f MB/s" % (bps / (1024 * 1024))
return "%.1f GB/s" % (bps / (1024 * 1024 * 1024))


class IntegrityDigestFile(file):
"""
Expand Down Expand Up @@ -610,13 +623,14 @@ class EyeFiRequestHandler(BaseHTTPRequestHandler):
+ elapsed_time.seconds \
+ elapsed_time.microseconds / 1000000.

speed = (received_length-speedtest_startsize)/elapsed_seconds*8
eyeFiLogger.debug("%s: Read %s / %s bytes (%02.02f%%) %d kbps",
speed = (received_length - speedtest_startsize) / elapsed_seconds * 8
human_speed = human_bps(speed)
eyeFiLogger.info("%s: Read %s / %s bytes (%02.02f%%) %s",
soapdata['filename'],
received_length,
content_length,
received_length * 100. / content_length,
speed/1000
human_speed
)

speedtest_starttime = datetime.utcnow()
Expand All @@ -629,7 +643,7 @@ class EyeFiRequestHandler(BaseHTTPRequestHandler):
execute_cmd = [execute_cmd,
tarpath,
str(tarfinalsize),
str(speed)]
human_speed]
eyeFiLogger.debug('Executing command "%s"',
' '.join(execute_cmd))
subprocess.Popen(execute_cmd)
Expand Down