mirror of
https://github.com/yattee/yattee.git
synced 2025-11-13 13:48:48 +00:00
f4d4daccd0
This commit addresses multiple SwiftUI performance bottlenecks identified through code analysis, focusing on view rendering efficiency, list performance, and memory usage optimization. Key improvements: - HomeView: Optimize async task management using structured concurrency with async let to handle multiple Defaults updates in a single task - VideoCell: Remove GeometryReader from VideoCellThumbnail to eliminate layout thrashing; change @ObservedObject to computed property for shared ThumbnailsModel - ThumbnailView: Cache URL extension computation in init() instead of recalculating on every body evaluation - FavoriteItemView: Replace filter().prefix() with early-exit loop and capacity reservation for significant performance gain on large lists - ContentItemView: Optimize FetchRequest creation with direct predicate construction only for video items, empty predicate for others - VideoPlayerView: Fix playerSize didSet trigger by moving updateSidebarQueue() calls to explicit onChange/onAppear handlers - FeedView: Replace .unique() with Set-based deduplication for O(n) performance and reduced allocations - VerticalCells: Remove expensive sorting on every redraw; items should be pre-sorted from source These optimizations follow SwiftUI best practices by minimizing expensive computations in view bodies, caching computed values, using efficient data structures, and avoiding unnecessary redraws and layout passes. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
135 lines
3.7 KiB
Swift
135 lines
3.7 KiB
Swift
import Defaults
|
|
import Foundation
|
|
import SwiftUI
|
|
|
|
struct ContentItemView: View {
|
|
let item: ContentItem
|
|
@Environment(\.listingStyle) private var listingStyle
|
|
@Environment(\.noListingDividers) private var noListingDividers
|
|
@Default(.hideShorts) private var hideShorts
|
|
@Default(.hideWatched) private var hideWatched
|
|
|
|
@FetchRequest private var watchRequest: FetchedResults<Watch>
|
|
|
|
init(item: ContentItem) {
|
|
self.item = item
|
|
// Only create FetchRequest for video items, not for all items
|
|
if item.contentType == .video, let videoID = item.video?.videoID {
|
|
let predicate = NSPredicate(format: "videoID = %@", videoID as CVarArg)
|
|
_watchRequest = FetchRequest<Watch>(
|
|
sortDescriptors: [],
|
|
predicate: predicate,
|
|
animation: .default
|
|
)
|
|
} else {
|
|
// Empty fetch request for non-video items
|
|
_watchRequest = FetchRequest<Watch>(
|
|
sortDescriptors: [],
|
|
predicate: NSPredicate(value: false),
|
|
animation: .default
|
|
)
|
|
}
|
|
}
|
|
|
|
@ViewBuilder var body: some View {
|
|
if itemVisible {
|
|
Group {
|
|
switch item.contentType {
|
|
case .video:
|
|
videoItem(item.video)
|
|
case .channel:
|
|
channelItem(item.channel)
|
|
case .playlist:
|
|
playlistItem(item.playlist)
|
|
default:
|
|
placeholderItem()
|
|
}
|
|
}
|
|
.id(item.cacheKey)
|
|
}
|
|
}
|
|
|
|
var itemVisible: Bool {
|
|
if hideWatched, watch?.finished ?? false {
|
|
return false
|
|
}
|
|
|
|
guard hideShorts, item.contentType == .video, let video = item.video else {
|
|
return true
|
|
}
|
|
|
|
return !video.short
|
|
}
|
|
|
|
@ViewBuilder func videoItem(_ video: Video) -> some View {
|
|
if listingStyle == .cells {
|
|
VideoCell(video: video, watch: watch)
|
|
} else {
|
|
let item = PlayerQueueItem(video)
|
|
PlayerQueueRow(item: item, watch: watch)
|
|
.contextMenu {
|
|
VideoContextMenuView(video: video)
|
|
}
|
|
.id(item.contentItem.cacheKey)
|
|
#if os(tvOS)
|
|
.padding(.horizontal, 30)
|
|
#endif
|
|
|
|
#if !os(tvOS)
|
|
Divider()
|
|
.opacity(noListingDividers ? 0 : 1)
|
|
#endif
|
|
}
|
|
}
|
|
|
|
@ViewBuilder func playlistItem(_ playlist: ChannelPlaylist) -> some View {
|
|
if listingStyle == .cells {
|
|
ChannelPlaylistCell(playlist: playlist)
|
|
} else {
|
|
ChannelPlaylistListItem(playlist: playlist)
|
|
#if os(tvOS)
|
|
.padding(.horizontal, 30)
|
|
#endif
|
|
|
|
#if !os(tvOS)
|
|
Divider()
|
|
#endif
|
|
}
|
|
}
|
|
|
|
@ViewBuilder func channelItem(_ channel: Channel) -> some View {
|
|
if listingStyle == .cells {
|
|
ChannelCell(channel: channel)
|
|
} else {
|
|
ChannelListItem(channel: channel)
|
|
#if os(tvOS)
|
|
.padding(.horizontal, 30)
|
|
#endif
|
|
|
|
#if !os(tvOS)
|
|
Divider()
|
|
#endif
|
|
}
|
|
}
|
|
|
|
@ViewBuilder func placeholderItem() -> some View {
|
|
if listingStyle == .cells {
|
|
PlaceholderCell()
|
|
.id(item.id)
|
|
} else {
|
|
PlaceholderListItem()
|
|
#if os(tvOS)
|
|
.padding(.horizontal, 30)
|
|
#endif
|
|
|
|
#if !os(tvOS)
|
|
Divider()
|
|
#endif
|
|
}
|
|
}
|
|
|
|
private var watch: Watch? {
|
|
watchRequest.first
|
|
}
|
|
}
|