m5/MicroPythonOS
0
0
Fork 0
mirror of https://github.com/m5stack/MicroPythonOS.git synced 2026-05-20 11:51:27 -07:00
Code Issues Packages Projects Releases Wiki Activity

OSUpdate app: fix resume logic

Browse Source
This commit is contained in:
Thomas Farstrike
2025-12-24 13:48:32 +01:00
parent 3135230c57
commit 13747b8a65
1 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal_filesystem/builtin/apps/com.micropythonos.osupdate/assets/osupdate.py
+17 -24
View File
@@ -442,8 +442,7 @@ class UpdateDownloader:
# Download state for pause/resume
self.is_paused = False
self.bytes_written_so_far = 0 # Bytes written to partition (in 4096-byte blocks)
self.bytes_received_so_far = 0 # Actual bytes received from network (for resume)
self.bytes_written_so_far = 0 # Bytes written to partition (in complete 4096-byte blocks)
self.total_size_expected = 0
# Internal state for chunk processing
@@ -524,9 +523,8 @@ class UpdateDownloader:
self.is_paused = True
raise OSError(-113, "Network lost during download")
# Track total bytes received (for accurate resume position)
# Track total bytes received
self._total_bytes_received += len(chunk)
self.bytes_received_so_far += len(chunk)
# Add chunk to buffer
self._chunk_buffer += chunk
@@ -603,14 +601,16 @@ class UpdateDownloader:
# Setup partition
self._setup_partition()
# Initialize block index from resume position (based on bytes written to partition)
# Initialize block index from resume position
self._block_index = self.bytes_written_so_far // self.CHUNK_SIZE
# Build headers for resume (based on bytes received from network)
# Build headers for resume - use bytes_written_so_far (last complete block)
# This ensures we re-download any partial/buffered data and overwrite any
# potentially corrupted block from when the error occurred
headers = None
if self.bytes_received_so_far > 0:
headers = {'Range': f'bytes={self.bytes_received_so_far}-'}
print(f"UpdateDownloader: Resuming from byte {self.bytes_received_so_far} (written: {self.bytes_written_so_far})")
if self.bytes_written_so_far > 0:
headers = {'Range': f'bytes={self.bytes_written_so_far}-'}
print(f"UpdateDownloader: Resuming from byte {self.bytes_written_so_far} (last complete block)")
# Get the download manager (use injected one for testing, or global)
dm = self.download_manager if self.download_manager else DownloadManager
@@ -624,7 +624,7 @@ class UpdateDownloader:
# For initial download, we need to get total size first
# DownloadManager doesn't expose Content-Length directly, so we estimate
if self.bytes_received_so_far == 0:
if self.bytes_written_so_far == 0:
# We'll update total_size_expected as we download
# For now, set a placeholder that will be updated
self.total_size_expected = 0
@@ -655,7 +655,6 @@ class UpdateDownloader:
# Reset state for next download
self.is_paused = False
self.bytes_written_so_far = 0
self.bytes_received_so_far = 0
self.total_size_expected = 0
self._current_partition = None
self._block_index = 0
@@ -676,34 +675,28 @@ class UpdateDownloader:
# Check if cancelled by user
if "cancelled" in error_msg.lower():
result['error'] = error_msg
result['bytes_written'] = self.bytes_received_so_far # Report actual bytes received
result['bytes_written'] = self.bytes_written_so_far
result['total_size'] = self.total_size_expected
# Check if this is a network error that should trigger pause
elif self._is_network_error(e):
print(f"UpdateDownloader: Network error ({e}), pausing download")
# Flush buffer before pausing to ensure all received data is written
# This prevents data loss/corruption on resume
# Clear buffer - we'll re-download this data on resume
# This ensures we overwrite any potentially corrupted block
if self._chunk_buffer:
buffer_len = len(self._chunk_buffer)
print(f"UpdateDownloader: Flushing {buffer_len} bytes from buffer before pause")
# Pad to 4096 bytes and write
padded = self._chunk_buffer + b'\xFF' * (self.CHUNK_SIZE - buffer_len)
if not self.simulate:
self._current_partition.writeblocks(self._block_index, padded)
self._block_index += 1
self.bytes_written_so_far += self.CHUNK_SIZE
print(f"UpdateDownloader: Discarding {buffer_len} bytes from buffer (will re-download on resume)")
self._chunk_buffer = b''
print(f"UpdateDownloader: Buffer flushed, bytes_written_so_far now: {self.bytes_written_so_far}, bytes_received: {self.bytes_received_so_far}")
self.is_paused = True
result['paused'] = True
result['bytes_written'] = self.bytes_received_so_far # Report actual bytes received for resume
result['bytes_written'] = self.bytes_written_so_far # Resume from last complete block
result['total_size'] = self.total_size_expected
print(f"UpdateDownloader: Will resume from byte {self.bytes_written_so_far} (last complete block)")
else:
# Non-network error
result['error'] = error_msg
result['bytes_written'] = self.bytes_received_so_far # Report actual bytes received
result['bytes_written'] = self.bytes_written_so_far
result['total_size'] = self.total_size_expected
print(f"UpdateDownloader: Error during download: {e}")