-
Notifications
You must be signed in to change notification settings - Fork 172
Improve playback error handling and retry logic #4053
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.
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
Draft
SergioEstevao
wants to merge
6
commits into
trunk
Choose a base branch
from
sergio/improve_error_handling
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+62
−6
Draft
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
40684b7
Add error detection and log on full screen player.
SergioEstevao d824b3e
Force a reload of player when retrying playback
SergioEstevao 48e4e25
Compile missing string
SergioEstevao a6817a9
Merge branch 'trunk' into sergio/improve_error_handling
SergioEstevao feeebee
Add error view
SergioEstevao 1ceeca7
Add containers and style them
SergioEstevao File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -17,6 +17,7 @@ extension NowPlayingPlayerItemViewController { | |||||||||||||||||||||||||||||||||||||
| addCustomObserver(Constants.Notifications.podcastChapterChanged, selector: #selector(updateChapterInfo)) | ||||||||||||||||||||||||||||||||||||||
| addCustomObserver(Constants.Notifications.episodeDownloaded, selector: #selector(update)) | ||||||||||||||||||||||||||||||||||||||
| addCustomObserver(UIApplication.willEnterForegroundNotification, selector: #selector(update)) | ||||||||||||||||||||||||||||||||||||||
| addCustomObserver(Constants.Notifications.playbackFailed, selector: #selector(update)) | ||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||
| addCustomObserver(Constants.Notifications.sleepTimerChanged, selector: #selector(sleepTimerUpdated)) | ||||||||||||||||||||||||||||||||||||||
| addCustomObserver(Constants.Notifications.playerActionsUpdated, selector: #selector(reloadShelfActions)) | ||||||||||||||||||||||||||||||||||||||
|
|
@@ -63,6 +64,7 @@ extension NowPlayingPlayerItemViewController { | |||||||||||||||||||||||||||||||||||||
| updateChapterInfo() | ||||||||||||||||||||||||||||||||||||||
| updateChapterProgress() | ||||||||||||||||||||||||||||||||||||||
| updateColors() | ||||||||||||||||||||||||||||||||||||||
| updateError() | ||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||
| if !showingCustomImage { | ||||||||||||||||||||||||||||||||||||||
| ImageManager.sharedManager.loadImage(episode: playingEpisode, imageView: episodeImage, size: .page) | ||||||||||||||||||||||||||||||||||||||
|
|
@@ -170,6 +172,21 @@ extension NowPlayingPlayerItemViewController { | |||||||||||||||||||||||||||||||||||||
| timeSlider.indeterminant = PlaybackManager.shared.buffering() && PlaybackManager.shared.playing() | ||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||
| func updateError() { | ||||||||||||||||||||||||||||||||||||||
| guard let playingEpisode = PlaybackManager.shared.currentEpisode() else { return } | ||||||||||||||||||||||||||||||||||||||
| var errorMessage = "" | ||||||||||||||||||||||||||||||||||||||
| if let playbackError = playingEpisode.playbackErrorDetails { | ||||||||||||||||||||||||||||||||||||||
| errorMessage = playbackError | ||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||
| if !errorMessage.isEmpty { | ||||||||||||||||||||||||||||||||||||||
| print("Error: \(errorMessage)") | ||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||
| if let downloadError = playingEpisode.downloadErrorDetails { | ||||||||||||||||||||||||||||||||||||||
| print("Error: \(downloadError)") | ||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+177
to
+186
|
||||||||||||||||||||||||||||||||||||||
| var errorMessage = "" | |
| if let playbackError = playingEpisode.playbackErrorDetails { | |
| errorMessage = playbackError | |
| } | |
| if !errorMessage.isEmpty { | |
| print("Error: \(errorMessage)") | |
| } | |
| if let downloadError = playingEpisode.downloadErrorDetails { | |
| print("Error: \(downloadError)") | |
| let episodeTitle = playingEpisode.displayableTitle() | |
| if let playbackError = playingEpisode.playbackErrorDetails, !playbackError.isEmpty { | |
| FileLog.shared.addMessage("Playback error for episode '\(episodeTitle)': \(playbackError)") | |
| } | |
| if let downloadError = playingEpisode.downloadErrorDetails, !downloadError.isEmpty { | |
| FileLog.shared.addMessage("Download error for episode '\(episodeTitle)': \(downloadError)") |
Comment on lines
+175
to
+187
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Constants.Notifications.playbackFailedis wired toupdate(), andupdate()now callsupdateError(). This can cause the same error details to be logged repeatedly on unrelated update triggers (play/pause, chapter updates, foreground, etc.) and does a full UI refresh on playback-failed events. Consider observingplaybackFailedwith a dedicated handler that only invokesupdateError()(and/or removeupdateError()from the generalupdate()path).