ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow researching for local servers and cancelling requests

This commit is contained in:
Ethan Pippin 2021-10-15 11:31:36 -06:00
parent dfc8aedf78
commit f3a6cee8ca
4 changed files with 82 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
JellyfinPlayer/Views/ConnectToServerView.swift
View File

@ -21,46 +21,73 @@ struct ConnectToServerView: View {
.disableAutocorrection(true)
.autocapitalization(.none)
.keyboardType(.URL)
Button {
viewModel.connectToServer(uri: uri)
} label: {
HStack {
Text("Connect")
Spacer()
if viewModel.isLoading {
ProgressView()
}
if viewModel.isLoading {
Button(role: .destructive) {
viewModel.cancelConnection()
} label: {
Text("Cancel")
}
} else {
Button {
viewModel.connectToServer(uri: uri)
} label: {
Text("Connect")
}
.disabled(uri.isEmpty)
}
.disabled(viewModel.isLoading || uri.isEmpty)
} header: {
Text("Connect to a Jellyfin server")
}
Section(header: Text("Local Servers")) {
Section {
if viewModel.searching {
ProgressView()
}
ForEach(viewModel.discoveredServers.sorted(by: { $0.name < $1.name }), id: \.id) { discoveredServer in
Button(action: {
viewModel.connectToServer(uri: discoveredServer.url.absoluteString)
}, label: {
HStack {
Text(discoveredServer.name)
.font(.headline)
Text("• \(discoveredServer.host)")
.font(.subheadline)
HStack(alignment: .center, spacing: 5) {
Spacer()
ProgressView()
Text("Searching")
.foregroundColor(.secondary)
Spacer()
}
} else {
if viewModel.discoveredServers.isEmpty {
HStack(alignment: .center) {
Spacer()
Text("No local servers found")
.font(.callout)
.foregroundColor(.secondary)
Spacer()
if viewModel.isLoading {
ProgressView()
}
}
} else {
ForEach(viewModel.discoveredServers.sorted(by: { $0.name < $1.name }), id: \.id) { discoveredServer in
Button {
viewModel.connectToServer(uri: discoveredServer.url.absoluteString)
} label: {
VStack(alignment: .leading, spacing: 5) {
Text(discoveredServer.name)
.font(.title3)
Text(discoveredServer.host)
.font(.subheadline)
.foregroundColor(.secondary)
}
}
.disabled(viewModel.isLoading)
}
}
}
} header: {
HStack {
Text("Local Servers")
Spacer()
})
Button {
viewModel.discoverServers()
} label: {
Image(systemName: "arrow.clockwise.circle.fill")
}
.disabled(viewModel.searching || viewModel.isLoading)
}
}
.onAppear(perform: self.viewModel.discoverServers)
.headerProminence(.increased)
}
.alert(item: $viewModel.errorMessage) { _ in
@ -70,7 +97,9 @@ struct ConnectToServerView: View {
}
.navigationTitle("Connect")
.onAppear {
viewModel.discoverServers()
AppURLHandler.shared.appURLState = .allowedInLogin
}
.navigationBarBackButtonHidden(viewModel.isLoading)
}
}

24
JellyfinPlayer/Views/UserSignInView.swift
View File

@ -28,19 +28,20 @@ struct UserSignInView: View {
.disableAutocorrection(true)
.autocapitalization(.none)
Button {
viewModel.login(username: username, password: password)
} label: {
HStack {
Text("Connect")
Spacer()
if viewModel.isLoading {
ProgressView()
}
if viewModel.isLoading {
Button(role: .destructive) {
viewModel.cancelSignIn()
} label: {
Text("Cancel")
}
} else {
Button {
viewModel.login(username: username, password: password)
} label: {
Text("Connect")
}
.disabled(username.isEmpty)
}
.disabled(viewModel.isLoading || username.isEmpty)
} header: {
Text("Sign In to \(viewModel.server.name)")
}
@ -51,5 +52,6 @@ struct UserSignInView: View {
dismissButton: .cancel())
}
.navigationTitle("Sign In")
.navigationBarBackButtonHidden(viewModel.isLoading)
}
}

6
Shared/ViewModels/ConnectToServerViewModel.swift
View File

@ -64,4 +64,10 @@ final class ConnectToServerViewModel: ViewModel {
searching = false
}
}
func cancelConnection() {
for cancellable in cancellables {
cancellable.cancel()
}
}
}

6
Shared/ViewModels/UserSignInViewModel.swift
View File

@ -43,4 +43,10 @@ final class UserSignInViewModel: ViewModel {
}
.store(in: &cancellables)
}
func cancelSignIn() {
for cancellable in cancellables {
cancellable.cancel()
}
}
}