Bitmessage/PyBitmessage-2024-12-20
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 52 Actions Packages Projects Releases 5 Wiki Activity

Fix appending in storage.filesystem for python3

Browse Source
This commit is contained in:
Lee Miller 2023-09-21 03:06:24 +03:00
parent 8af1a13e10
commit a629c15f7d
Signed by untrusted user: lee.miller
GPG Key ID: 4F97A5EA88F4AB63
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/storage/filesystem.py
View File

@ -2,7 +2,6 @@
Module for using filesystem (directory with files) for inventory storage
"""
import logging
import string
import time
from binascii import hexlify, unhexlify
from os import listdir, makedirs, path, remove, rmdir
@ -71,7 +70,7 @@ class FilesystemInventory(InventoryStorage):
makedirs(path.join(
self.baseDir,
FilesystemInventory.objectDir,
hexlify(hashval)))
hexlify(hashval).decode()))
except OSError:
pass
try:
@ -79,7 +78,7 @@ class FilesystemInventory(InventoryStorage):
path.join(
self.baseDir,
FilesystemInventory.objectDir,
hexlify(hashval),
hexlify(hashval).decode(),
FilesystemInventory.metadataFilename,
),
"w",
@ -88,15 +87,15 @@ class FilesystemInventory(InventoryStorage):
value.type,
value.stream,
value.expires,
hexlify(value.tag)))
hexlify(value.tag).decode()))
with open(
path.join(
self.baseDir,
FilesystemInventory.objectDir,
hexlify(hashval),
hexlify(hashval).decode(),
FilesystemInventory.dataFilename,
),
"w",
"wb",
) as f:
f.write(value.payload)
except IOError:
@ -120,7 +119,7 @@ class FilesystemInventory(InventoryStorage):
path.join(
self.baseDir,
FilesystemInventory.objectDir,
hexlify(hashval),
hexlify(hashval).decode(),
FilesystemInventory.metadataFilename))
except IOError:
pass
@ -129,7 +128,7 @@ class FilesystemInventory(InventoryStorage):
path.join(
self.baseDir,
FilesystemInventory.objectDir,
hexlify(hashval),
hexlify(hashval).decode(),
FilesystemInventory.dataFilename))
except IOError:
pass
@ -137,7 +136,7 @@ class FilesystemInventory(InventoryStorage):
rmdir(path.join(
self.baseDir,
FilesystemInventory.objectDir,
hexlify(hashval)))
hexlify(hashval).decode()))
except IOError:
pass
@ -189,7 +188,7 @@ class FilesystemInventory(InventoryStorage):
path.join(
self.baseDir,
FilesystemInventory.objectDir,
hexlify(hashId),
hexlify(hashId).decode(),
FilesystemInventory.dataFilename,
),
"r",
@ -205,13 +204,13 @@ class FilesystemInventory(InventoryStorage):
path.join(
self.baseDir,
FilesystemInventory.objectDir,
hexlify(hashId),
hexlify(hashId).decode(),
FilesystemInventory.metadataFilename,
),
"r",
) as f:
objectType, streamNumber, expiresTime, tag = string.split(
f.read(), ",", 4)[:4]
objectType, streamNumber, expiresTime, tag = f.read().split(
",", 4)[:4]
return [
int(objectType),
int(streamNumber),