buzzert/QueueCube
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ios: add error handling

Browse Source
This commit is contained in:
James Magahern
2025-11-15 18:16:03 -08:00
parent bc54735d1f
commit cfc6e6c411
6 changed files with 104 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ios/QueueCube/Backend/API.swift
View File

@@ -12,10 +12,11 @@ struct MediaItem: Codable
let filename: String?
let title: String?
let id: Int
let current: Bool?
let playing: Bool?
let metadata: Metadata?
let playbackError: String?
var displayTitle: String {
metadata?.title ?? title ?? displayFilename ?? "item \(id)"
@@ -280,6 +281,7 @@ actor API
case favoritesUpdate = "favorites_update"
case metadataUpdate = "metadata_update"
case mpdUpdate = "mpd_update"
case playbackError = "playback_error"
// Private UI events
case receivedWebsocketPong

30
ios/QueueCube/Localizable/Localizable.xcstrings
View File

@@ -104,6 +104,16 @@
}
}
},
"DELETE" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Delete"
}
}
}
},
"DISCOVERED" : {
"localizations" : {
"en" : {
@@ -247,6 +257,16 @@
},
"Nothing here yet." : {
},
"PLAYBACK_ERROR" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Playback Error"
}
}
}
},
"PLAYLIST" : {
"localizations" : {
@@ -360,6 +380,16 @@
}
}
},
"Unknown error" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Unknown Error"
}
}
}
},
"URL" : {
"localizations" : {
"en" : {

2
ios/QueueCube/Localizable/Strings.swift
View File

@@ -46,4 +46,6 @@ extension LocalizedStringKey
static let notPlaying = LocalizedStringKey("NOT_PLAYING")
static let url = LocalizedStringKey("URL")
static let title = LocalizedStringKey("TITLE")
static let playbackError = LocalizedStringKey("PLAYBACK_ERROR")
static let delete = LocalizedStringKey("DELETE")
}

2
ios/QueueCube/Views/AutofocusingTextField.swift
View File

@@ -29,6 +29,8 @@ struct AutofocusingTextField: UIViewRepresentable
tf.delegate = context.coordinator
tf.returnKeyType = .done
tf.setContentHuggingPriority(.defaultHigh, for: .vertical)
tf.autocorrectionType = .no
tf.autocapitalizationType = .none
return tf
}

11
ios/QueueCube/Views/ContentView.swift
View File

@@ -87,7 +87,8 @@ extension ContentView
title: mediaItem.displayTitle,
filename: mediaItem.filename ?? "<null>",
index: idx,
isCurrent: mediaItem.current ?? false
isCurrent: mediaItem.current ?? false,
playbackError: mediaItem.playbackError
)
}
}
@@ -100,7 +101,8 @@ extension ContentView
id: String(mediaItem.id),
title: mediaItem.displayTitle,
filename: mediaItem.filename ?? "<null>",
isCurrent: nowPlaying.playingItem?.filename == mediaItem.filename
isCurrent: nowPlaying.playingItem?.filename == mediaItem.filename,
playbackError: mediaItem.playbackError
)
}
}
@@ -160,9 +162,10 @@ extension ContentView
case .websocketReconnected: fallthrough
case .metadataUpdate: fallthrough
case .mpdUpdate:
case .mpdUpdate: fallthrough
case .playbackError:
await refresh([.playlist, .nowPlaying, .favorites])
case .receivedWebsocketPong:
// This means we're online.
await clearConnectionErrorIfNecessary()

80
ios/QueueCube/Views/PlaylistView.swift
View File

@@ -14,17 +14,19 @@ struct MediaListItem: Identifiable
let filename: String
let index: Int?
let isCurrent: Bool
let playbackError: String?
var id: String {
_id + filename // temporary: we get duplicate ids from the server sometimes...
}
init(id: String, title: String, filename: String, index: Int? = nil, isCurrent: Bool = false) {
init(id: String, title: String, filename: String, index: Int? = nil, isCurrent: Bool = false, playbackError: String? = nil) {
self._id = id
self.title = title
self.filename = filename
self.index = index
self.isCurrent = isCurrent
self.playbackError = playbackError
}
}
@@ -45,6 +47,7 @@ class MediaListViewModel
var onQueue: (MediaListItem) -> Void = { _ in }
var onEdit: (MediaListItem) -> Void = { _ in }
var onFavorite: (MediaListItem) -> Void = { _ in }
var onDelete: (MediaListItem) -> Void = { _ in }
init(mode: MediaListMode) {
self.mode = mode
@@ -54,7 +57,8 @@ class MediaListViewModel
struct MediaListView: View
{
@Binding var model: MediaListViewModel
@State private var errorAlertItem: MediaListItem? = nil
var body: some View {
VStack {
if model.items.isEmpty {
@@ -68,22 +72,30 @@ struct MediaListView: View
List($model.items, editActions: .delete) { item in
let item = item.wrappedValue
let state = item.isCurrent ? (model.isPlaying ? MediaItemCell.State.playing : MediaItemCell.State.paused) : .queued
Button {
switch model.mode {
case .playlist:
model.onSeek(item)
case .favorites:
model.onPlay(item)
if let _ = item.playbackError {
errorAlertItem = item
} else {
switch model.mode {
case .playlist:
model.onSeek(item)
case .favorites:
model.onPlay(item)
}
}
} label: {
MediaItemCell(
title: item.title,
subtitle: item.filename,
state: state
state: state,
playbackError: item.playbackError
)
}
.listRowBackground((model.mode == .playlist && state != .queued) ? Color.accentColor.opacity(0.10) : nil)
.listRowBackground(
item.playbackError != nil ? Color.red.opacity(0.15) :
(model.mode == .playlist && state != .queued ? Color.accentColor.opacity(0.10) : nil)
)
.contextMenu {
Button(.copyTitle) {
UIPasteboard.general.string = item.title
@@ -123,6 +135,28 @@ struct MediaListView: View
}
}
}
.alert(.playbackError, isPresented: Binding(get: {
errorAlertItem != nil
}, set: { newValue in
if !newValue { errorAlertItem = nil }
}), actions: {
Button(.cancel, role: .cancel) {
errorAlertItem = nil
}
if let item = errorAlertItem {
Button(.delete, role: .destructive) {
model.items.removeAll { $0.id == item.id }
model.onDelete(item)
errorAlertItem = nil
}
}
}, message: {
if let message = errorAlertItem?.playbackError {
Text(message)
} else {
Text("Unknown error")
}
})
}
}
}
@@ -134,17 +168,12 @@ struct MediaItemCell: View
let title: String
let subtitle: String
let state: State
let playbackError: String?
var body: some View {
let icon: String = switch state {
case .queued: "play.fill"
case .playing: "speaker.wave.3.fill"
case .paused: "speaker.fill"
}
HStack {
Image(systemName: icon)
.tint(Color.primary)
Image(systemName: iconName)
.tint(playbackError == nil ? Color.primary : Color.orange)
.frame(width: 15.0)
.padding(.trailing, 10.0)
@@ -166,6 +195,18 @@ struct MediaItemCell: View
.padding([.top, .bottom], 4.0)
}
private var iconName: String {
if let playbackError {
return "exclamationmark.triangle.fill"
}
switch state {
case .queued: return "play.fill"
case .playing: return "speaker.wave.3.fill"
case .paused: return "speaker.fill"
}
}
// MARK: - Types
enum State {
@@ -174,4 +215,3 @@ struct MediaItemCell: View
case paused
}
}