0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

trigger upload speed(still wrong values)

Browse source
This commit is contained in:
j 2015-12-01 14:40:30 +01:00
parent ad1c341d35
commit 57aaecd1db
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
oml/node/server.py
View file

@ -1,9 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vi:si:et:sw=4:sts=4:ts=4 # vi:si:et:sw=4:sts=4:ts=4
from datetime import datetime
from socketserver import ThreadingMixIn from socketserver import ThreadingMixIn
from threading import Thread from threading import Thread
import base64 import base64
import db
import gzip import gzip
import hashlib import hashlib
import http.server import http.server
@ -21,6 +21,7 @@ from OpenSSL.SSL import (
VERIFY_PEER, VERIFY_FAIL_IF_NO_PEER_CERT, VERIFY_CLIENT_ONCE VERIFY_PEER, VERIFY_FAIL_IF_NO_PEER_CERT, VERIFY_CLIENT_ONCE
) )
import db
import settings import settings
import state import state
import user import user
@ -129,12 +130,19 @@ class Handler(http.server.SimpleHTTPRequestHandler):
self.send_header('X-Node-Protocol', settings.NODE_PROTOCOL) self.send_header('X-Node-Protocol', settings.NODE_PROTOCOL)
self.send_header('Content-Length', str(os.path.getsize(path))) self.send_header('Content-Length', str(os.path.getsize(path)))
self.end_headers() self.end_headers()
ct = datetime.utcnow()
with open(path, 'rb') as f: with open(path, 'rb') as f:
size = 0
while 1: while 1:
data = f.read(16384) data = f.read(16384)
if not data: if not data:
break break
size += len(data)
self.wfile.write(data) self.wfile.write(data)
if state.bandwidth:
since_ct = (datetime.utcnow() - ct).total_seconds()
state.bandwidth.upload(size/since_ct)
size = 0
else: else:
self.send_response(200, 'OK') self.send_response(200, 'OK')
self.send_header('Content-type', 'text/plain') self.send_header('Content-type', 'text/plain')