oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Py3 compatibility of FileRequest module

Browse source
This commit is contained in:
shortcutme 2019-03-16 02:43:07 +01:00
parent e92f3ea100
commit ac325c5c5e
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/File/FileRequest.py
View file

@ -12,7 +12,7 @@ import gevent
from Debug import Debug from Debug import Debug
from Config import config from Config import config
from util import RateLimit from util import RateLimit
from util import StreamingMsgpack from util import Msgpack
from util import helper from util import helper
from Plugin import PluginManager from Plugin import PluginManager
from contextlib import closing from contextlib import closing
@ -200,7 +200,7 @@ class FileRequest(object):
if streaming: if streaming:
file_obj = site.storage.open(params["inner_path"]) file_obj = site.storage.open(params["inner_path"])
else: else:
file_obj = StreamingMsgpack.FilePart(file_path, "rb") file_obj = Msgpack.FilePart(file_path, "rb")
with file_obj as file: with file_obj as file:
file.seek(params["location"]) file.seek(params["location"])
@ -347,7 +347,7 @@ class FileRequest(object):
peer.time_my_hashfield_sent = time.time() # Don't send again if not changed peer.time_my_hashfield_sent = time.time() # Don't send again if not changed
self.response({"hashfield_raw": site.content_manager.hashfield.tostring()}) self.response({"hashfield_raw": site.content_manager.hashfield.tobytes()})
def findHashIds(self, site, hash_ids, limit=100): def findHashIds(self, site, hash_ids, limit=100):
back = collections.defaultdict(lambda: collections.defaultdict(list)) back = collections.defaultdict(lambda: collections.defaultdict(list))
@ -400,7 +400,7 @@ class FileRequest(object):
peer = site.addPeer(self.connection.ip, self.connection.port, return_peer=True, connection=self.connection, source="request") peer = site.addPeer(self.connection.ip, self.connection.port, return_peer=True, connection=self.connection, source="request")
if not peer.connection: if not peer.connection:
peer.connect(self.connection) peer.connect(self.connection)
peer.hashfield.replaceFromString(params["hashfield_raw"]) peer.hashfield.replaceFromBytes(params["hashfield_raw"])
self.response({"ok": "Updated"}) self.response({"ok": "Updated"})
# Send a simple Pong! answer # Send a simple Pong! answer