SearchResults: Add more information to results

Reformat how RealDebrid availability is shown and add a size value
to the search result card.

Signed-off-by: kingbri <bdashore3@gmail.com>
This commit is contained in:
kingbri 2022-07-21 17:27:46 -04:00
parent 02b22c7c88
commit e0daa453c3
3 changed files with 52 additions and 12 deletions

View file

@ -11,6 +11,8 @@ import SwiftSoup
public struct SearchResult: Hashable, Codable { public struct SearchResult: Hashable, Codable {
let title: String let title: String
let source: String
let size: String
let magnetLink: String let magnetLink: String
let magnetHash: String? let magnetHash: String?
} }
@ -21,6 +23,7 @@ public struct TorrentSource: Hashable, Codable {
let rowQuery: String let rowQuery: String
let linkQuery: String let linkQuery: String
let titleQuery: String let titleQuery: String
let sizeQuery: String
} }
class ScrapingViewModel: ObservableObject { class ScrapingViewModel: ObservableObject {
@ -40,11 +43,12 @@ class ScrapingViewModel: ObservableObject {
//), //),
TorrentSource( TorrentSource(
name: "AnimeTosho", name: "AnimeTosho",
url: "https://mirror.animetosho.org/search?q=", url: "https://animetosho.org/search?q=",
rowQuery: "#content .home_list_entry", rowQuery: "#content .home_list_entry",
linkQuery: ".links > a:nth-child(4)", linkQuery: ".links > a:nth-child(4)",
titleQuery: ".link" titleQuery: ".link",
) sizeQuery: ".size"
)
] ]
@Published var searchResults: [SearchResult] = [] @Published var searchResults: [SearchResult] = []
@ -102,10 +106,15 @@ class ScrapingViewModel: ObservableObject {
let magnetHash = fetchMagnetHash(magnetLink: href) let magnetHash = fetchMagnetHash(magnetLink: href)
let title = try row.select(source.titleQuery).first() let title = try row.select(source.titleQuery).first()
let text = try title?.text() let titleText = try title?.text()
let size = try row.select(source.sizeQuery).first()
let sizeText = try size?.text()
let result = SearchResult( let result = SearchResult(
title: text ?? "No title provided", title: titleText ?? "No title provided",
source: source.name,
size: sizeText ?? "?B",
magnetLink: href, magnetLink: href,
magnetHash: magnetHash magnetHash: magnetHash
) )

View file

@ -23,7 +23,7 @@ struct MagnetChoiceView: View {
var body: some View { var body: some View {
NavView { NavView {
Form { Form {
if realDebridEnabled { if realDebridEnabled, debridManager.realDebridHashes.contains(selectedResult?.magnetHash ?? "") {
Section("Real Debrid options") { Section("Real Debrid options") {
Button("Play on Outplayer") { Button("Play on Outplayer") {
guard let downloadUrl = URL(string: "outplayer://\(debridManager.realDebridDownloadUrl)") else { guard let downloadUrl = URL(string: "outplayer://\(debridManager.realDebridDownloadUrl)") else {
@ -93,6 +93,16 @@ struct MagnetChoiceView: View {
struct MagnetChoiceView_Previews: PreviewProvider { struct MagnetChoiceView_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
MagnetChoiceView(selectedResult: .constant(SearchResult(title: "", magnetLink: "", magnetHash: nil))) MagnetChoiceView(
selectedResult:
.constant(
SearchResult(
title: "",
source: "",
size: "",
magnetLink: "",
magnetHash: nil)
)
)
} }
} }

View file

@ -19,12 +19,13 @@ struct SearchResultsView: View {
@State var selectedResult: SearchResult? @State var selectedResult: SearchResult?
@State private var showExternalSheet = false @State private var showExternalSheet = false
@State private var resultUsesRd = false
var body: some View { var body: some View {
List { List {
ForEach(scrapingModel.searchResults, id: \.self) { result in ForEach(scrapingModel.searchResults, id: \.self) { result in
VStack(alignment: .leading) { VStack(alignment: .leading) {
Button(result.title) { Button {
selectedResult = result selectedResult = result
if debridManager.realDebridHashes.contains(result.magnetHash ?? ""), realDebridEnabled { if debridManager.realDebridHashes.contains(result.magnetHash ?? ""), realDebridEnabled {
@ -35,20 +36,40 @@ struct SearchResultsView: View {
} else { } else {
showExternalSheet.toggle() showExternalSheet.toggle()
} }
} label: {
Text(result.title)
.font(.callout)
.fixedSize(horizontal: false, vertical: true)
} }
.sheet(isPresented: $showExternalSheet) { .sheet(isPresented: $showExternalSheet) {
MagnetChoiceView(selectedResult: $selectedResult) MagnetChoiceView(selectedResult: $selectedResult)
} }
.tint(colorScheme == .light ? .black : .white) .tint(colorScheme == .light ? .black : .white)
.font(.callout)
.padding(.bottom, 5) .padding(.bottom, 5)
HStack { HStack {
if realDebridEnabled { Text(result.source)
Text("Real Debrid available: \(debridManager.realDebridHashes.contains(result.magnetHash ?? "") ? "Yes" : "No")")
}
Spacer() Spacer()
Text(result.size)
if realDebridEnabled {
Text("RD")
.fontWeight(.bold)
.padding(2)
.background {
if debridManager.realDebridHashes.contains(result.magnetHash ?? "") {
Color.green
.cornerRadius(4)
.opacity(0.5)
} else {
Color.red
.cornerRadius(4)
.opacity(0.5)
}
}
}
} }
.font(.caption) .font(.caption)
} }