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

add LazyImage.placeholderAndFailure 

apply placeholderAndFailure too all LazyImage
This commit is contained in:
PangMo5 2021-06-02 16:18:38 +09:00
parent 082ce29a44
commit df0014592d
11 changed files with 99 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
JellyfinPlayer.xcodeproj/project.pbxproj
View File

@ -47,6 +47,7 @@
62133895266096EF00A81A2A /* LibraryListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62133894266096EF00A81A2A /* LibraryListViewModel.swift */; }; 62133895266096EF00A81A2A /* LibraryListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62133894266096EF00A81A2A /* LibraryListViewModel.swift */; };
621338B32660A07800A81A2A /* LazyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621338B22660A07800A81A2A /* LazyView.swift */; }; 621338B32660A07800A81A2A /* LazyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621338B22660A07800A81A2A /* LazyView.swift */; };
621C638026672A30004216EA /* NukeUI in Frameworks */ = {isa = PBXBuildFile; productRef = 621C637F26672A30004216EA /* NukeUI */; }; 621C638026672A30004216EA /* NukeUI in Frameworks */ = {isa = PBXBuildFile; productRef = 621C637F26672A30004216EA /* NukeUI */; };
621C638226676728004216EA /* LazyImage++.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621C638126676728004216EA /* LazyImage++.swift */; };
6225FCCB2663841E00E067F6 /* ParallaxHeaderScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6225FCCA2663841E00E067F6 /* ParallaxHeaderScrollView.swift */; }; 6225FCCB2663841E00E067F6 /* ParallaxHeaderScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6225FCCA2663841E00E067F6 /* ParallaxHeaderScrollView.swift */; };
6273DD43265F4195009C1D0B /* Moya in Frameworks */ = {isa = PBXBuildFile; productRef = 6273DD42265F4195009C1D0B /* Moya */; }; 6273DD43265F4195009C1D0B /* Moya in Frameworks */ = {isa = PBXBuildFile; productRef = 6273DD42265F4195009C1D0B /* Moya */; };
6273DD45265F4195009C1D0B /* CombineMoya in Frameworks */ = {isa = PBXBuildFile; productRef = 6273DD44265F4195009C1D0B /* CombineMoya */; }; 6273DD45265F4195009C1D0B /* CombineMoya in Frameworks */ = {isa = PBXBuildFile; productRef = 6273DD44265F4195009C1D0B /* CombineMoya */; };
@ -117,6 +118,7 @@
621338922660107500A81A2A /* String++.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String++.swift"; sourceTree = "<group>"; }; 621338922660107500A81A2A /* String++.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String++.swift"; sourceTree = "<group>"; };
62133894266096EF00A81A2A /* LibraryListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LibraryListViewModel.swift; sourceTree = "<group>"; }; 62133894266096EF00A81A2A /* LibraryListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LibraryListViewModel.swift; sourceTree = "<group>"; };
621338B22660A07800A81A2A /* LazyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LazyView.swift; sourceTree = "<group>"; }; 621338B22660A07800A81A2A /* LazyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LazyView.swift; sourceTree = "<group>"; };
621C638126676728004216EA /* LazyImage++.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "LazyImage++.swift"; sourceTree = "<group>"; };
6225FCCA2663841E00E067F6 /* ParallaxHeaderScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParallaxHeaderScrollView.swift; sourceTree = "<group>"; }; 6225FCCA2663841E00E067F6 /* ParallaxHeaderScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParallaxHeaderScrollView.swift; sourceTree = "<group>"; };
6273DD47265F41B3009C1D0B /* JellyfinAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JellyfinAPI.swift; sourceTree = "<group>"; }; 6273DD47265F41B3009C1D0B /* JellyfinAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JellyfinAPI.swift; sourceTree = "<group>"; };
6273DD4D265F47B2009C1D0B /* LibrarySearchViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LibrarySearchViewModel.swift; sourceTree = "<group>"; }; 6273DD4D265F47B2009C1D0B /* LibrarySearchViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LibrarySearchViewModel.swift; sourceTree = "<group>"; };
@ -221,6 +223,7 @@
621338B22660A07800A81A2A /* LazyView.swift */, 621338B22660A07800A81A2A /* LazyView.swift */,
621338922660107500A81A2A /* String++.swift */, 621338922660107500A81A2A /* String++.swift */,
6225FCCA2663841E00E067F6 /* ParallaxHeaderScrollView.swift */, 6225FCCA2663841E00E067F6 /* ParallaxHeaderScrollView.swift */,
621C638126676728004216EA /* LazyImage++.swift */,
); );
path = Extensions; path = Extensions;
sourceTree = "<group>"; sourceTree = "<group>";
@ -369,6 +372,7 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
621338932660107500A81A2A /* String++.swift in Sources */, 621338932660107500A81A2A /* String++.swift in Sources */,
621C638226676728004216EA /* LazyImage++.swift in Sources */,
53FF7F2A263CF3F500585C35 /* LatestMediaView.swift in Sources */, 53FF7F2A263CF3F500585C35 /* LatestMediaView.swift in Sources */,
5377CBFE263B596B003A4E83 /* PersistenceController.swift in Sources */, 5377CBFE263B596B003A4E83 /* PersistenceController.swift in Sources */,
5389276E263C25100035E14B /* ContinueWatchingView.swift in Sources */, 5389276E263C25100035E14B /* ContinueWatchingView.swift in Sources */,

4
JellyfinPlayer/ContinueWatchingView.swift
View File

@ -116,7 +116,7 @@ struct ContinueWatchingView: View {
Spacer().frame(height: 10) Spacer().frame(height: 10)
if(item.Type == "Episode") { if(item.Type == "Episode") {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=550&quality=80&tag=\(item.Image)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=550&quality=80&tag=\(item.Image)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 48, height: 32))!) Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 48, height: 32))!)
.resizable() .resizable()
.frame(width: 320, height: 180) .frame(width: 320, height: 180)
@ -144,7 +144,7 @@ struct ContinueWatchingView: View {
) )
} else { } else {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=550&quality=80&tag=\(item.Image)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=550&quality=80&tag=\(item.Image)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 48, height: 32))!) Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 48, height: 32))!)
.resizable() .resizable()
.frame(width: 320, height: 180) .frame(width: 320, height: 180)

14
JellyfinPlayer/EpisodeItemView.swift
View File

@ -203,9 +203,8 @@ struct EpisodeItemView: View {
} }
var portraitHeaderView: some View { var portraitHeaderView: some View {
VStack {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.ParentBackdropItemId)/Images/Backdrop?maxWidth=550&quality=90&tag=\(fullItem.Backdrop)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.ParentBackdropItemId)/Images/Backdrop?maxWidth=550&quality=90&tag=\(fullItem.Backdrop)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: fullItem Image(uiImage: UIImage(blurHash: fullItem
.BackdropBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem .BackdropBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem
.BackdropBlurHash, .BackdropBlurHash,
@ -216,13 +215,12 @@ struct EpisodeItemView: View {
.opacity(0.3) .opacity(0.3)
.shadow(radius: 5) .shadow(radius: 5)
} }
}
var portraitHeaderOverlayView: some View { var portraitHeaderOverlayView: some View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
HStack(alignment: .bottom, spacing: 12) { HStack(alignment: .bottom, spacing: 12) {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.SeriesId ?? "")/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.SeriesId ?? "")/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: fullItem Image(uiImage: UIImage(blurHash: fullItem
.PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : .PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" :
fullItem.PosterBlurHash, fullItem.PosterBlurHash,
@ -364,7 +362,7 @@ struct EpisodeItemView: View {
}) { }) {
VStack { VStack {
LazyImage(source: cast.Image) LazyImage(source: cast.Image)
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: cast Image(uiImage: UIImage(blurHash: cast
.ImageBlurHash == "" ? .ImageBlurHash == "" ?
"W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" :
@ -423,7 +421,7 @@ struct EpisodeItemView: View {
GeometryReader { geometry in GeometryReader { geometry in
ZStack { ZStack {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.ParentBackdropItemId)/Images/Backdrop?maxWidth=\(String(Int(geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing)))&quality=80&tag=\(fullItem.Backdrop)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.ParentBackdropItemId)/Images/Backdrop?maxWidth=\(String(Int(geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing)))&quality=80&tag=\(fullItem.Backdrop)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: fullItem Image(uiImage: UIImage(blurHash: fullItem
.BackdropBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem .BackdropBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem
.BackdropBlurHash, .BackdropBlurHash,
@ -444,7 +442,7 @@ struct EpisodeItemView: View {
HStack { HStack {
VStack { VStack {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.SeriesId ?? "")/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.SeriesId ?? "")/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: fullItem Image(uiImage: UIImage(blurHash: fullItem
.PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : .PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" :
fullItem.PosterBlurHash, fullItem.PosterBlurHash,
@ -582,7 +580,7 @@ struct EpisodeItemView: View {
}) { }) {
VStack { VStack {
LazyImage(source: cast.Image) LazyImage(source: cast.Image)
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: cast Image(uiImage: UIImage(blurHash: cast
.ImageBlurHash == "" ? .ImageBlurHash == "" ?
"W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" :

22
JellyfinPlayer/Extensions/LazyImage++.swift Normal file
View File

@ -0,0 +1,22 @@
//
// LazyImage++.swift
// JellyfinPlayer
//
// Created by PangMo5 on 2021/06/02.
//
import Foundation
import SwiftUI
import NukeUI
extension LazyImage {
func placeholderAndFailure<Content: View>(@ViewBuilder _ content: () -> Content?) -> LazyImage {
placeholder {
content()
}
.failure {
content()
}
}
}

4
JellyfinPlayer/LatestMediaView.swift
View File

@ -92,7 +92,7 @@ struct LatestMediaView: View {
if(item.Type == "Series") { if(item.Type == "Series") {
Spacer().frame(height:10) Spacer().frame(height:10)
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=250&quality=80&tag=\(item.Image)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=250&quality=80&tag=\(item.Image)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 16, height: 16))!) Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 16, height: 16))!)
.resizable() .resizable()
.frame(width: 100, height: 150) .frame(width: 100, height: 150)
@ -122,7 +122,7 @@ struct LatestMediaView: View {
} else { } else {
Spacer().frame(height:10) Spacer().frame(height:10)
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=250&quality=80&tag=\(item.Image)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=250&quality=80&tag=\(item.Image)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 16, height: 16))!) Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 16, height: 16))!)
.resizable() .resizable()
.frame(width: 100, height: 150) .frame(width: 100, height: 150)

4
JellyfinPlayer/LibrarySearchView.swift
View File

@ -88,7 +88,7 @@ struct ResumeItemGridCell: View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
if item.Type == "Movie" { if item.Type == "Movie" {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?fillWidth=300&fillHeight=450&quality=90&tag=\(item.Image)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?fillWidth=300&fillHeight=450&quality=90&tag=\(item.Image)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: item Image(uiImage: UIImage(blurHash: item
.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item .BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item
.BlurHash, .BlurHash,
@ -101,7 +101,7 @@ struct ResumeItemGridCell: View {
.cornerRadius(10) .cornerRadius(10)
} else { } else {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?fillWidth=300&fillHeight=450&quality=90&tag=\(item.Image)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?fillWidth=300&fillHeight=450&quality=90&tag=\(item.Image)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: item Image(uiImage: UIImage(blurHash: item
.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item .BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item
.BlurHash, .BlurHash,

4
JellyfinPlayer/LibraryView.swift
View File

@ -137,7 +137,7 @@ extension LibraryView {
VStack(alignment: .leading) { VStack(alignment: .leading) {
if item.Type == "Movie" { if item.Type == "Movie" {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=250&quality=80&tag=\(item.Image)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=250&quality=80&tag=\(item.Image)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: item Image(uiImage: UIImage(blurHash: item
.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item .BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item
.BlurHash, .BlurHash,
@ -150,7 +150,7 @@ extension LibraryView {
.cornerRadius(10) .cornerRadius(10)
} else { } else {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=250&quality=80&tag=\(item.Image)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=250&quality=80&tag=\(item.Image)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: item Image(uiImage: UIImage(blurHash: item
.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item .BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item
.BlurHash, .BlurHash,

12
JellyfinPlayer/MovieItemView.swift
View File

@ -294,7 +294,7 @@ struct MovieItemView: View {
var portraitHeaderView: some View { var portraitHeaderView: some View {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Backdrop?maxWidth=550&quality=90&tag=\(fullItem.Backdrop)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Backdrop?maxWidth=550&quality=90&tag=\(fullItem.Backdrop)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: fullItem Image(uiImage: UIImage(blurHash: fullItem
.BackdropBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem .BackdropBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem
.BackdropBlurHash, .BackdropBlurHash,
@ -310,7 +310,7 @@ struct MovieItemView: View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
HStack(alignment: .bottom, spacing: 12) { HStack(alignment: .bottom, spacing: 12) {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: fullItem Image(uiImage: UIImage(blurHash: fullItem
.PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : .PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" :
fullItem.PosterBlurHash, fullItem.PosterBlurHash,
@ -453,7 +453,7 @@ struct MovieItemView: View {
}) { }) {
VStack { VStack {
LazyImage(source: cast.Image) LazyImage(source: cast.Image)
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: cast Image(uiImage: UIImage(blurHash: cast
.ImageBlurHash == "" ? .ImageBlurHash == "" ?
"W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" :
@ -511,7 +511,7 @@ struct MovieItemView: View {
GeometryReader { geometry in GeometryReader { geometry in
ZStack { ZStack {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Backdrop?maxWidth=\(String(Int(geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing)))&quality=80&tag=\(fullItem.Backdrop)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Backdrop?maxWidth=\(String(Int(geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing)))&quality=80&tag=\(fullItem.Backdrop)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: fullItem Image(uiImage: UIImage(blurHash: fullItem
.BackdropBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem .BackdropBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem
.BackdropBlurHash, .BackdropBlurHash,
@ -532,7 +532,7 @@ struct MovieItemView: View {
HStack { HStack {
VStack { VStack {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: fullItem Image(uiImage: UIImage(blurHash: fullItem
.PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : .PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" :
fullItem.PosterBlurHash, fullItem.PosterBlurHash,
@ -670,7 +670,7 @@ struct MovieItemView: View {
}) { }) {
VStack { VStack {
LazyImage(source: cast.Image) LazyImage(source: cast.Image)
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: cast Image(uiImage: UIImage(blurHash: cast
.ImageBlurHash == "" ? .ImageBlurHash == "" ?
"W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" :

2
JellyfinPlayer/NextUpView.swift
View File

@ -80,7 +80,7 @@ struct NextUpView: View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
Spacer().frame(height:10) Spacer().frame(height:10)
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.SeriesId ?? "")/Images/\(item.ImageType)?maxWidth=250&quality=80&tag=\(item.Image)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.SeriesId ?? "")/Images/\(item.ImageType)?maxWidth=250&quality=80&tag=\(item.Image)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 16, height: 16))!) Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 16, height: 16))!)
.resizable() .resizable()
.frame(width: 100, height: 150) .frame(width: 100, height: 150)

90
JellyfinPlayer/SeasonItemView.swift
View File

@ -18,7 +18,8 @@ struct SeasonItemView: View {
@State @State
private var isLoading: Bool = true private var isLoading: Bool = true
var item: ResumeItem var item: ResumeItem
var fullItem: DetailItem @State
var fullItem = DetailItem()
@State @State
var episodes: [DetailItem] = [] var episodes: [DetailItem] = []
@State @State
@ -28,7 +29,6 @@ struct SeasonItemView: View {
init(item: ResumeItem) { init(item: ResumeItem) {
self.item = item self.item = item
self.fullItem = DetailItem()
} }
func loadData() { func loadData() {
@ -48,32 +48,33 @@ struct SeasonItemView: View {
let body = response.body let body = response.body
do { do {
let json = try JSON(data: body) let json = try JSON(data: body)
fullItem.ProductionYear = json["ProductionYear"].int ?? 0 let responseItem = DetailItem()
fullItem.Poster = json["ImageTags"]["Primary"].string ?? "" responseItem.ProductionYear = json["ProductionYear"].int ?? 0
fullItem.PosterBlurHash = json["ImageBlurHashes"]["Primary"][fullItem.Poster].string ?? "" responseItem.Poster = json["ImageTags"]["Primary"].string ?? ""
fullItem.Backdrop = json["BackdropImageTags"][0].string ?? "" responseItem.PosterBlurHash = json["ImageBlurHashes"]["Primary"][responseItem.Poster].string ?? ""
fullItem.BackdropBlurHash = json["ImageBlurHashes"]["Backdrop"][fullItem.Backdrop].string ?? "" responseItem.Backdrop = json["BackdropImageTags"][0].string ?? ""
fullItem.Name = json["Name"].string ?? "" responseItem.BackdropBlurHash = json["ImageBlurHashes"]["Backdrop"][responseItem.Backdrop].string ?? ""
fullItem.Type = json["Type"].string ?? "" responseItem.Name = json["Name"].string ?? ""
fullItem.IndexNumber = json["IndexNumber"].int ?? nil responseItem.Type = json["Type"].string ?? ""
fullItem.SeriesId = json["ParentId"].string ?? nil responseItem.IndexNumber = json["IndexNumber"].int ?? nil
fullItem.Id = item.Id responseItem.SeriesId = json["ParentId"].string ?? nil
fullItem.Overview = json["Overview"].string ?? "" responseItem.Id = item.Id
fullItem.Tagline = json["Taglines"][0].string ?? "" responseItem.Overview = json["Overview"].string ?? ""
fullItem.SeriesName = json["SeriesName"].string ?? nil responseItem.Tagline = json["Taglines"][0].string ?? ""
fullItem.ParentId = json["ParentId"].string ?? "" responseItem.SeriesName = json["SeriesName"].string ?? nil
responseItem.ParentId = json["ParentId"].string ?? ""
// People // People
fullItem.Directors = [] responseItem.Directors = []
fullItem.Studios = [] responseItem.Studios = []
fullItem.Writers = [] responseItem.Writers = []
fullItem.Cast = [] responseItem.Cast = []
fullItem.Genres = [] responseItem.Genres = []
for (_, person): (String, JSON) in json["People"] { for (_, person): (String, JSON) in json["People"] {
if person["Type"].stringValue == "Director" { if person["Type"].stringValue == "Director" {
fullItem.Directors.append(person["Name"].string ?? "") responseItem.Directors.append(person["Name"].string ?? "")
} else if person["Type"].stringValue == "Writer" { } else if person["Type"].stringValue == "Writer" {
fullItem.Writers.append(person["Name"].string ?? "") responseItem.Writers.append(person["Name"].string ?? "")
} else if person["Type"].stringValue == "Actor" { } else if person["Type"].stringValue == "Actor" {
let cast = CastMember() let cast = CastMember()
cast.Name = person["Name"].string ?? "" cast.Name = person["Name"].string ?? ""
@ -84,10 +85,15 @@ struct SeasonItemView: View {
cast cast
.Image = .Image =
URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(cast.Id)/Images/Primary?maxWidth=2000&quality=90&tag=\(imageTag)")! URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(cast.Id)/Images/Primary?maxWidth=2000&quality=90&tag=\(imageTag)")!
fullItem.Cast.append(cast) responseItem.Cast.append(cast)
} }
} }
_fullItem.wrappedValue = responseItem
print("!@#!@#@#!@#")
print(fullItem.SeriesId)
let url2 = let url2 =
"/Shows/\(fullItem.SeriesId ?? "")/Episodes?SeasonId=\(item.Id)&UserId=\(globalData.user?.user_id ?? "")&Fields=ItemCounts%2CPrimaryImageAspectRatio%2CBasicSyncInfo%2CCanDelete%2CMediaSourceCount%2COverview" "/Shows/\(fullItem.SeriesId ?? "")/Episodes?SeasonId=\(item.Id)&UserId=\(globalData.user?.user_id ?? "")&Fields=ItemCounts%2CPrimaryImageAspectRatio%2CBasicSyncInfo%2CCanDelete%2CMediaSourceCount%2COverview"
let request2 = RestRequest(method: .get, url: (globalData.server?.baseURI ?? "") + url2) let request2 = RestRequest(method: .get, url: (globalData.server?.baseURI ?? "") + url2)
@ -185,16 +191,13 @@ struct SeasonItemView: View {
return result return result
} }
@ViewBuilder
var portraitHeaderView: some View { var portraitHeaderView: some View {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.SeriesId ?? "")/Images/Backdrop?maxWidth=750&quality=90&tag=\(item.SeasonImage ?? "")")) if isLoading {
.placeholder { EmptyView()
Image(uiImage: UIImage(blurHash: item } else {
.SeasonImageBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.SeriesId ?? "")/Images/Backdrop?maxWidth=550&quality=90&tag=\(item.SeasonImage ?? "")"))
.SeasonImageBlurHash ?? "", .placeholderAndFailure {
size: CGSize(width: 32, height: 32))!)
.resizable()
}
.failure{
Image(uiImage: UIImage(blurHash: item Image(uiImage: UIImage(blurHash: item
.SeasonImageBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item .SeasonImageBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item
.SeasonImageBlurHash ?? "", .SeasonImageBlurHash ?? "",
@ -202,24 +205,15 @@ struct SeasonItemView: View {
.resizable() .resizable()
} }
.contentMode(.aspectFill) .contentMode(.aspectFill)
.onStart { print("onStart \($0.request.url)") }
.onProgress { _,_,_ in print("onProgress") }
.onSuccess { _ in print("onSuccess") }
.onFailure { error in
print(error.dataLoadingError?.localizedDescription)
print(error.description)
print(error.localizedDescription)
}
.onCompletion { _ in print("onCompletion") }
.frame(minWidth: 0, maxWidth: .infinity)
.opacity(0.4) .opacity(0.4)
.shadow(radius: 5) .shadow(radius: 5)
} }
}
var portraitHeaderOverlayView: some View { var portraitHeaderOverlayView: some View {
HStack(alignment: .bottom, spacing: 12) { HStack(alignment: .bottom, spacing: 12) {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: fullItem Image(uiImage: UIImage(blurHash: fullItem
.PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem .PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem
.PosterBlurHash, .PosterBlurHash,
@ -275,7 +269,7 @@ struct SeasonItemView: View {
NavigationLink(destination: ItemView(item: episode.ResumeItem ?? ResumeItem())) { NavigationLink(destination: ItemView(item: episode.ResumeItem ?? ResumeItem())) {
HStack { HStack {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(episode.Id)/Images/Primary?maxWidth=300&quality=90&tag=\(episode.Poster)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(episode.Id)/Images/Primary?maxWidth=300&quality=90&tag=\(episode.Poster)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: episode Image(uiImage: UIImage(blurHash: episode
.PosterBlurHash == "" ? .PosterBlurHash == "" ?
"W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem
@ -345,7 +339,7 @@ struct SeasonItemView: View {
GeometryReader { geometry in GeometryReader { geometry in
ZStack { ZStack {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.SeriesId ?? "")/Images/Backdrop?maxWidth=\(String(Int(geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing)))&quality=80&tag=\(item.SeasonImage ?? "")")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.SeriesId ?? "")/Images/Backdrop?maxWidth=\(String(Int(geometry.size.width + geometry.safeAreaInsets.leading + geometry.safeAreaInsets.trailing)))&quality=80&tag=\(item.SeasonImage ?? "")"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: item Image(uiImage: UIImage(blurHash: item
.SeasonImageBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item .SeasonImageBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item
.SeasonImageBlurHash ?? "", .SeasonImageBlurHash ?? "",
@ -366,7 +360,7 @@ struct SeasonItemView: View {
HStack { HStack {
VStack(alignment: .leading) { VStack(alignment: .leading) {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(fullItem.Id)/Images/Primary?maxWidth=250&quality=90&tag=\(fullItem.Poster)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: fullItem Image(uiImage: UIImage(blurHash: fullItem
.PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : .PosterBlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" :
fullItem.PosterBlurHash, fullItem.PosterBlurHash,
@ -402,7 +396,7 @@ struct SeasonItemView: View {
NavigationLink(destination: ItemView(item: episode.ResumeItem ?? ResumeItem())) { NavigationLink(destination: ItemView(item: episode.ResumeItem ?? ResumeItem())) {
HStack { HStack {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(episode.Id)/Images/Primary?maxWidth=300&quality=90&tag=\(episode.Poster)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(episode.Id)/Images/Primary?maxWidth=300&quality=90&tag=\(episode.Poster)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: episode Image(uiImage: UIImage(blurHash: episode
.PosterBlurHash == "" ? .PosterBlurHash == "" ?
"W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : fullItem

2
JellyfinPlayer/SeriesItemView.swift
View File

@ -97,7 +97,7 @@ struct SeriesItemView: View {
NavigationLink(destination: ItemView(item: item )) { NavigationLink(destination: ItemView(item: item )) {
VStack(alignment: .leading) { VStack(alignment: .leading) {
LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=250&quality=90&tag=\(item.Image)")) LazyImage(source: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=250&quality=90&tag=\(item.Image)"))
.placeholder { .placeholderAndFailure {
Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 32, height: 32))!) Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ? "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 32, height: 32))!)
.resizable() .resizable()
.frame(width: 100, height: 150) .frame(width: 100, height: 150)