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

Adjust error message for stuck/slow videos [if elapsed_time >= timeout, e.g. due to unavailable fragments &/or xklb media_check] #223

Merged
merged 13 commits into from
Aug 17, 2024
Merged

Adjust error message for stuck/slow videos [if elapsed_time >= timeout, e.g. due to unavailable fragments &/or xklb media_check] #223

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
146cfd0
Adjust error message for stuck videos due to unavailable fragments
deldesir Jul 15, 2024
8ddb222
Additional adjustments
deldesir Jul 15, 2024
3e80b64
Make link clickable
deldesir Jul 15, 2024
444ccd1
Add context url
deldesir Jul 16, 2024
8e98f0e
Merge branch 'iiab:master' into deldesir-patch-9
deldesir Jul 19, 2024
64c0b55
Make message less categoric
deldesir Jul 19, 2024
e44dd98
Merge branch 'iiab:master' into deldesir-patch-9
deldesir Aug 16, 2024
03265a0
Rename fragment_stuck_timeout variable
deldesir Aug 16, 2024
28c9554
Improve stuck error message with context
deldesir Aug 16, 2024
61acf54
Make tickets URL clickable
deldesir Aug 16, 2024
35d9959
Fix bad quotes
deldesir Aug 16, 2024
37adc96
Add missing quote
deldesir Aug 16, 2024
e52fd6e
Add parentheses around yt-dlp link for readability
deldesir Aug 17, 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
7 changes: 3 additions & 4 deletions cps/tasks/download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def run(self, worker_thread):
complete_progress_cycle = 0

last_progress_time = datetime.now()
fragment_stuck_timeout = 120 # seconds
timeout = 120 # seconds

self.message = f"Downloading {self.media_url_link}..."
if self.live_status == "was_live":
Expand All @@ -80,9 +80,8 @@ def run(self, worker_thread):
last_progress_time = datetime.now()
else:
elapsed_time = (datetime.now() - last_progress_time).total_seconds()
if elapsed_time >= fragment_stuck_timeout:
self.message += f"<br>Some fragments are taking longer than expected to download. Please wait..."

if elapsed_time >= timeout:
self.message = f"{self.media_url_link} is taking longer than expected. It could be a stuck download due to unavailable fragments (<a href='https://github.com/yt-dlp/yt-dlp/issues/2137' target='_blank'>yt-dlp/yt-dlp#2137</a>) and/or an error in xklb's media check. Please wait as we try again. See <a href='https://github.com/iiab/calibre-web/pull/223' target='_blank'>#223</a> for more info."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@deldesir @avni is the revision below more accurate? (Or if I'm wrong, LMK!)

Suggested change
self.message = f"{self.media_url_link} is taking longer than expected. It could be a stuck download due to unavailable fragments (<a href='https://github.com/yt-dlp/yt-dlp/issues/2137' target='_blank'>yt-dlp/yt-dlp#2137</a>) and/or an error in xklb's media check. Please wait as we try again. See <a href='https://github.com/iiab/calibre-web/pull/223' target='_blank'>#223</a> for more info."
self.message = f"{self.media_url_link} is taking longer than expected. It could be a stuck download due to unavailable fragments (<a href='https://github.com/yt-dlp/yt-dlp/issues/2137' target='_blank'>yt-dlp/yt-dlp#2137</a>) and/or an error in xklb's media_check. Please wait as we keep trying. See <a href='https://github.com/iiab/calibre-web/pull/223' target='_blank'>#223</a> for more info."

Copy link
Member

@avni avni Aug 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"keep trying" is more accurate, yes! TY! I don't know if 'media_check' is more accurate than 'media check'. @deldesir is more familiar with xklb.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@deldesir please revise at any time (e.g. with a new PR) if improvement's helpful 💯

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merging of this PR is now cleaned up with this separate commit:

(Apologies I messed up, and didn't get that revision from ~30min ago properly into this PR!)

sleep(0.1)

p.wait()
Expand Down