Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

add comment, code review

Browse Source
This commit is contained in:
Peter Bieringer
2025-12-28 13:12:41 +01:00
parent b60718a21b
commit 17a3816e91
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
radicale/item/__init__.py
View File

@@ -341,7 +341,7 @@ def verify(file: str, encoding: str):
with open(file, "rb") as f: with open(file, "rb") as f:
content_raw = f.read() content_raw = f.read()
content = content_raw.decode(encoding) content = content_raw.decode(encoding)
logger.info("Verifying item: %s has sha256sum %r", file, utils.sha256_str(content)) logger.info("Verifying item: %s has sha256sum %r", file, utils.sha256_bytes(content_raw))
try: try:
vobject_items = read_components(content) # noqa: F841 vobject_items = read_components(content) # noqa: F841
except Exception as e: except Exception as e:

18
radicale/utils.py
View File

@@ -382,11 +382,11 @@ def dataToSpecial(data, count):
result += 'C' result += 'C'
elif char == '\n': elif char == '\n':
result += 'L' result += 'L'
elif (ord(char) & 0xf8) == 0xf0: elif (ord(char) & 0xf8) == 0xf0: # assuming UTF-8
result += '4' result += '4'
elif (ord(char) & 0xf0) == 0xf0: elif (ord(char) & 0xf0) == 0xf0: # assuming UTF-8
result += '3' result += '3'
elif (ord(char) & 0xe0) == 0xe0: elif (ord(char) & 0xe0) == 0xe0: # assuming UTF-8
result += '2' result += '2'
else: else:
result += '.' result += '.'
@@ -397,7 +397,7 @@ def hexdump_str(content: str, limit: int = 2000) -> str:
result = "Hexdump of string: index <bytes> | <ASCII> | <CTRL: C=CR L=LF 2/3/4=UTF-8-length> |\n" result = "Hexdump of string: index <bytes> | <ASCII> | <CTRL: C=CR L=LF 2/3/4=UTF-8-length> |\n"
index = 0 index = 0
size = 16 size = 16
bytestring = content.encode("utf-8") bytestring = content.encode("utf-8") # assuming UTF-8
length = len(bytestring) length = len(bytestring)
while (index < length) and (index < limit): while (index < length) and (index < limit):
@@ -421,7 +421,7 @@ def hexdump_str(content: str, limit: int = 2000) -> str:
def hexdump_line(line: str, limit: int = 200) -> str: def hexdump_line(line: str, limit: int = 200) -> str:
result = "" result = ""
length_str = len(line) length_str = len(line)
bytestring = line.encode("utf-8") bytestring = line.encode("utf-8") # assuming UTF-8
length = len(bytestring) length = len(bytestring)
size = length size = length
if (size > limit): if (size > limit):
@@ -456,5 +456,11 @@ def hexdump_lines(lines: str, limit: int = 200) -> str:
def sha256_str(content: str) -> str: def sha256_str(content: str) -> str:
_hash = sha256() _hash = sha256()
_hash.update(content.encode("utf-8")) _hash.update(content.encode("utf-8")) # assuming UTF-8
return _hash.hexdigest()
def sha256_bytes(content: bytes) -> str:
_hash = sha256()
_hash.update(content)
return _hash.hexdigest() return _hash.hexdigest()