Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: macOS Sequoia download #90

Merged
merged 9 commits into from
Oct 4, 2024
Merged

fix: macOS Sequoia download #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8f06036
Rename recovery.py to fetch.py
kroese Oct 4, 2024
baee9f7
fix: Download latest OS
kroese Oct 4, 2024
57d9122
Update fetch.py
kroese Oct 4, 2024
c3098ec
Update fetch.py
kroese Oct 4, 2024
3e37fbc
Update fetch.py
kroese Oct 4, 2024
ccbd647
Update fetch.py
kroese Oct 4, 2024
cfa517b
Update fetch.py
kroese Oct 4, 2024
8ec3eb5
Update fetch.py
kroese Oct 4, 2024
5866a98
Update fetch.py
kroese Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/recovery.py → src/fetch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ def save_image(url, sess, filename='', directory=''):
totalsize = int(headers[header])
break
size = 0
last = 0
while True:
chunk = response.read(2**20)
if not chunk:
Expand All @@ -223,10 +224,15 @@ def save_image(url, sess, filename='', directory=''):
size += len(chunk)
if totalsize > 0:
progress = size / totalsize
print(f'\r{progress*100:.1f}% downloaded', end='')
if (progress - last) >= 0.01 or progress >= 1:
last = progress
print(f'\r{progress*100:.1f}% downloaded', end='')
else:
# Fallback if Content-Length isn't available
print(f'\r{size / (2**20)} MB downloaded...', end='')
progress = size / (2**20)
if (progress - last) >= 10:
last = progress
print(f'\r{progress} MB downloaded...', end='')
sys.stdout.flush()
print('\nDownload complete!')

Expand All @@ -237,8 +243,11 @@ def verify_image(dmgpath, cnkpath):
print('Verifying image with chunklist...')

with open(dmgpath, 'rb') as dmgf:
last=0
for cnkcount, (cnksize, cnkhash) in enumerate(verify_chunklist(cnkpath), 1):
print(f'\rChunk {cnkcount} ({cnksize} bytes)', end='')
if (cnkcount - last) >= 10:
last = cnkcount
print(f'\rChunk {cnkcount} ({cnksize} bytes)', end='')
sys.stdout.flush()
cnk = dmgf.read(cnksize)
if len(cnk) != cnksize:
Expand Down
2 changes: 1 addition & 1 deletion src/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ downloadImage() {

/run/progress.sh "$path" "" "$msg ([P])..." &

if ! /run/recovery.py -b "$board" -n "$file" -o "$TMP" download; then
if ! /run/fetch.py -b "$board" -n "$file" -os latest -o "$TMP" download; then
error "Failed to fetch macOS \"${version^}\" recovery image with board id \"$board\"!"
fKill "progress.sh"
return 1
Expand Down