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

Cache inner_path to sha512 hash for bigfiles to avoid loading content.json every time

Browse source
This commit is contained in:
shortcutme 2018-03-18 21:25:28 +01:00
parent 8828629a30
commit ad1d81dccf
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
plugins/OptionalManager/UiWebsocketPlugin.py
View file

@ -12,6 +12,8 @@ from Translate import Translate
if "_" not in locals(): if "_" not in locals():
_ = Translate("plugins/OptionalManager/languages/") _ = Translate("plugins/OptionalManager/languages/")
bigfile_sha512_cache = {}
@PluginManager.registerTo("UiWebsocket") @PluginManager.registerTo("UiWebsocket")
class UiWebsocketPlugin(object): class UiWebsocketPlugin(object):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@ -38,16 +40,23 @@ class UiWebsocketPlugin(object):
self.site.updateWebsocket(peernumber_updated=True) self.site.updateWebsocket(peernumber_updated=True)
def addBigfileInfo(self, row): def addBigfileInfo(self, row):
global bigfile_sha512_cache
content_db = self.site.content_manager.contents.db content_db = self.site.content_manager.contents.db
site = content_db.sites[row["address"]] site = content_db.sites[row["address"]]
if not site.settings.get("has_bigfile"): if not site.settings.get("has_bigfile"):
return False return False
file_info = site.content_manager.getFileInfo(row["inner_path"]) file_key = row["address"] + "/" + row["inner_path"]
if not file_info or not file_info.get("piece_size"): sha512 = bigfile_sha512_cache.get(file_key)
return False file_info = None
if not sha512:
file_info = site.content_manager.getFileInfo(row["inner_path"])
if not file_info or not file_info.get("piece_size"):
return False
sha512 = file_info["sha512"]
bigfile_sha512_cache[file_key] = sha512
sha512 = file_info["sha512"]
if sha512 in site.storage.piecefields: if sha512 in site.storage.piecefields:
piecefield = site.storage.piecefields[sha512].tostring() piecefield = site.storage.piecefields[sha512].tostring()
else: else:
@ -57,7 +66,13 @@ class UiWebsocketPlugin(object):
row["pieces"] = len(piecefield) row["pieces"] = len(piecefield)
row["pieces_downloaded"] = piecefield.count("1") row["pieces_downloaded"] = piecefield.count("1")
row["downloaded_percent"] = 100 * row["pieces_downloaded"] / row["pieces"] row["downloaded_percent"] = 100 * row["pieces_downloaded"] / row["pieces"]
row["bytes_downloaded"] = row["pieces_downloaded"] * file_info["piece_size"] if row["pieces_downloaded"]:
if not file_info:
file_info = site.content_manager.getFileInfo(row["inner_path"])
row["bytes_downloaded"] = row["pieces_downloaded"] * file_info.get("piece_size", 0)
else:
row["bytes_downloaded"] = 0
row["is_downloading"] = bool(next((task for task in site.worker_manager.tasks if task["inner_path"].startswith(row["inner_path"])), False)) row["is_downloading"] = bool(next((task for task in site.worker_manager.tasks if task["inner_path"].startswith(row["inner_path"])), False))
# Add leech / seed stats # Add leech / seed stats