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

Make Bigfile plugin compatible with optionalDownloaded changes

Browse source
This commit is contained in:
shortcutme 2018-03-29 03:15:49 +02:00
parent 7d3d0f7ceb
commit 5c644d1b36
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
plugins/Bigfile/BigfilePlugin.py
View file

@ -61,7 +61,8 @@ class UiRequestPlugin(object):
if len(piecemap_info["sha512_pieces"]) == 1: # Small file, don't split if len(piecemap_info["sha512_pieces"]) == 1: # Small file, don't split
hash = piecemap_info["sha512_pieces"][0].encode("hex") hash = piecemap_info["sha512_pieces"][0].encode("hex")
site.content_manager.optionalDownloaded(inner_path, hash, upload_info["size"], own=True) hash_id = self.site.content_manager.hashfield.getHashId(hash)
site.content_manager.optionalDownloaded(inner_path, hash_id, upload_info["size"], own=True)
else: # Big file else: # Big file
file_name = helper.getFilename(inner_path) file_name = helper.getFilename(inner_path)
@ -88,7 +89,8 @@ class UiRequestPlugin(object):
"piece_size": piece_size "piece_size": piece_size
} }
site.content_manager.optionalDownloaded(inner_path, merkle_root, upload_info["size"], own=True) merkle_root_hash_id = self.site.content_manager.hashfield.getHashId(merkle_root)
site.content_manager.optionalDownloaded(inner_path, merkle_root_hash_id, upload_info["size"], own=True)
site.storage.writeJson(file_info["content_inner_path"], content) site.storage.writeJson(file_info["content_inner_path"], content)
site.content_manager.contents.loadItem(file_info["content_inner_path"]) # reload cache site.content_manager.contents.loadItem(file_info["content_inner_path"]) # reload cache
@ -301,7 +303,8 @@ class ContentManagerPlugin(object):
piece_num = int(math.ceil(float(file_size) / piece_size)) piece_num = int(math.ceil(float(file_size) / piece_size))
# Add the merkle root to hashfield # Add the merkle root to hashfield
self.optionalDownloaded(inner_path, hash, file_size, own=True) hash_id = self.site.content_manager.hashfield.getHashId(hash)
self.optionalDownloaded(inner_path, hash_id, file_size, own=True)
self.site.storage.piecefields[hash].fromstring("1" * piece_num) self.site.storage.piecefields[hash].fromstring("1" * piece_num)
back[file_relative_path] = {"sha512": hash, "size": file_size, "piecemap": piecemap_relative_path, "piece_size": piece_size} back[file_relative_path] = {"sha512": hash, "size": file_size, "piecemap": piecemap_relative_path, "piece_size": piece_size}
@ -331,7 +334,7 @@ class ContentManagerPlugin(object):
return self.verifyPiece(inner_path, pos_from, file) return self.verifyPiece(inner_path, pos_from, file)
def optionalDownloaded(self, inner_path, hash, size=None, own=False): def optionalDownloaded(self, inner_path, hash_id, size=None, own=False):
if "|" in inner_path: if "|" in inner_path:
inner_path, file_range = inner_path.split("|") inner_path, file_range = inner_path.split("|")
pos_from, pos_to = map(int, file_range.split("-")) pos_from, pos_to = map(int, file_range.split("-"))
@ -342,7 +345,7 @@ class ContentManagerPlugin(object):
self.site.storage.piecefields[file_info["sha512"]][piece_i] = True self.site.storage.piecefields[file_info["sha512"]][piece_i] = True
# Only add to site size on first request # Only add to site size on first request
if hash in self.hashfield: if hash_id in self.hashfield:
size = 0 size = 0
elif size > 1024 * 1024: elif size > 1024 * 1024:
file_info = self.getFileInfo(inner_path) file_info = self.getFileInfo(inner_path)
@ -351,9 +354,9 @@ class ContentManagerPlugin(object):
if sha512 not in self.site.storage.piecefields: if sha512 not in self.site.storage.piecefields:
self.site.storage.checkBigfile(inner_path) self.site.storage.checkBigfile(inner_path)
return super(ContentManagerPlugin, self).optionalDownloaded(inner_path, hash, size, own) return super(ContentManagerPlugin, self).optionalDownloaded(inner_path, hash_id, size, own)
def optionalRemove(self, inner_path, hash, size=None): def optionalRemoved(self, inner_path, hash_id, size=None):
if size and size > 1024 * 1024: if size and size > 1024 * 1024:
file_info = self.getFileInfo(inner_path) file_info = self.getFileInfo(inner_path)
sha512 = file_info["sha512"] sha512 = file_info["sha512"]
@ -364,7 +367,7 @@ class ContentManagerPlugin(object):
for key in self.site.bad_files.keys(): for key in self.site.bad_files.keys():
if key.startswith(inner_path + "|"): if key.startswith(inner_path + "|"):
del self.site.bad_files[key] del self.site.bad_files[key]
return super(ContentManagerPlugin, self).optionalRemove(inner_path, hash, size) return super(ContentManagerPlugin, self).optionalRemoved(inner_path, hash_id, size)
@PluginManager.registerTo("SiteStorage") @PluginManager.registerTo("SiteStorage")