Skip to content

Commit 5359bcf

Browse files
committed
fix: Refactor more
1 parent 6d9ab7d commit 5359bcf

File tree

1 file changed

+8
-24
lines changed

1 file changed

+8
-24
lines changed

src/c2pa/c2pa.py

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,17 +1012,13 @@ def read_callback(ctx, data, length):
10121012
Returns:
10131013
Number of bytes read, or -1 on error
10141014
"""
1015-
initialized = self._initialized
1016-
closed = self._closed
1017-
file_stream = self._file_like_stream
1018-
1019-
if not initialized or closed:
1015+
if not self._initialized or self._closed:
10201016
return -1
10211017
try:
10221018
if not data or length <= 0:
10231019
return -1
10241020

1025-
buffer = file_stream.read(length)
1021+
buffer = self._file_like_stream.read(length)
10261022
if not buffer: # EOF
10271023
return 0
10281024

@@ -1052,11 +1048,8 @@ def seek_callback(ctx, offset, whence):
10521048
Returns:
10531049
New position in the stream, or -1 on error
10541050
"""
1055-
initialized = self._initialized
1056-
closed = self._closed
10571051
file_stream = self._file_like_stream
1058-
1059-
if not initialized or closed:
1052+
if not self._initialized or self._closed:
10601053
return -1
10611054
try:
10621055
file_stream.seek(offset, whence)
@@ -1082,11 +1075,7 @@ def write_callback(ctx, data, length):
10821075
Returns:
10831076
Number of bytes written, or -1 on error
10841077
"""
1085-
initialized = self._initialized
1086-
closed = self._closed
1087-
file_stream = self._file_like_stream
1088-
1089-
if not initialized or closed:
1078+
if not self._initialized or self._closed:
10901079
return -1
10911080
try:
10921081
if not data or length <= 0:
@@ -1098,7 +1087,7 @@ def write_callback(ctx, data, length):
10981087
# Copy data to our temporary buffer
10991088
ctypes.memmove(temp_buffer, data, length)
11001089
# Write from our safe buffer
1101-
file_stream.write(bytes(temp_buffer))
1090+
self._file_like_stream.write(bytes(temp_buffer))
11021091
return length
11031092
finally:
11041093
# Ensure temporary buffer is cleared
@@ -1120,14 +1109,10 @@ def flush_callback(ctx):
11201109
Returns:
11211110
0 on success, -1 on error
11221111
"""
1123-
initialized = self._initialized
1124-
closed = self._closed
1125-
file_stream = self._file_like_stream
1126-
1127-
if not initialized or closed:
1112+
if not self._initialized or self._closed:
11281113
return -1
11291114
try:
1130-
file_stream.flush()
1115+
self._file_like_stream.flush()
11311116
return 0
11321117
except Exception:
11331118
return -1
@@ -1197,8 +1182,7 @@ def close(self):
11971182
Errors during cleanup are logged but not raised to ensure cleanup.
11981183
Multiple calls to close() are handled gracefully.
11991184
"""
1200-
closed = self._closed
1201-
if closed:
1185+
if self._closed:
12021186
return
12031187

12041188
try:

0 commit comments

Comments
 (0)