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

Make BigfileUploadInit merger sites compatible

Browse source
This commit is contained in:
shortcutme 2017-10-26 10:43:45 +02:00
parent e8f049a765
commit 99e5af67b7
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/Bigfile/BigfilePlugin.py
View file

@ -142,12 +142,12 @@ class UiWebsocketPlugin(object):
"piece_size": piece_size, "piece_size": piece_size,
"piecemap": inner_path + ".piecemap.msgpack" "piecemap": inner_path + ".piecemap.msgpack"
} }
self.response(to, { return {
"url": "/ZeroNet-Internal/BigfileUpload?upload_nonce=" + nonce, "url": "/ZeroNet-Internal/BigfileUpload?upload_nonce=" + nonce,
"pice_size": piece_size, "pice_size": piece_size,
"inner_path": inner_path, "inner_path": inner_path,
"file_relative_path": file_relative_path "file_relative_path": file_relative_path
}) }
@PluginManager.registerTo("ContentManager") @PluginManager.registerTo("ContentManager")

11
plugins/MergerSite/MergerSitePlugin.py
View file

@ -135,9 +135,7 @@ class UiWebsocketPlugin(object):
req_self.site = self.server.sites.get(merged_address) # Change the site to the merged one req_self.site = self.server.sites.get(merged_address) # Change the site to the merged one
func = getattr(super(UiWebsocketPlugin, req_self), func_name) func = getattr(super(UiWebsocketPlugin, req_self), func_name)
back = func(to, merged_inner_path, *args, **kwargs) return func(to, merged_inner_path, *args, **kwargs)
return back
else: else:
func = getattr(super(UiWebsocketPlugin, self), func_name) func = getattr(super(UiWebsocketPlugin, self), func_name)
return func(to, inner_path, *args, **kwargs) return func(to, inner_path, *args, **kwargs)
@ -166,6 +164,13 @@ class UiWebsocketPlugin(object):
def actionOptionalFileDelete(self, to, inner_path, *args, **kwargs): def actionOptionalFileDelete(self, to, inner_path, *args, **kwargs):
return self.mergerFuncWrapper("actionOptionalFileDelete", to, inner_path, *args, **kwargs) return self.mergerFuncWrapper("actionOptionalFileDelete", to, inner_path, *args, **kwargs)
def actionBigfileUploadInit(self, to, inner_path, *args, **kwargs):
back = self.mergerFuncWrapper("actionBigfileUploadInit", to, inner_path, *args, **kwargs)
if inner_path.startswith("merged-"):
merged_address, merged_inner_path = checkMergerPath(self.site.address, inner_path)
back["inner_path"] = "merged-%s/%s/%s" % (merged_db[merged_address], merged_address, back["inner_path"])
return back
# Add support merger sites for file commands with privatekey parameter # Add support merger sites for file commands with privatekey parameter
def mergerFuncWrapperWithPrivatekey(self, func_name, to, privatekey, inner_path, *args, **kwargs): def mergerFuncWrapperWithPrivatekey(self, func_name, to, privatekey, inner_path, *args, **kwargs):
func = getattr(super(UiWebsocketPlugin, self), func_name) func = getattr(super(UiWebsocketPlugin, self), func_name)