danbarber/persephone
1
1
Fork 0
mirror of https://github.com/danbee/persephone synced 2025-03-04 08:39:11 +00:00
Code Issues Releases Wiki Activity

Create shared AlbumDetailView and Popover

Browse Source 
This prevents the app from creating a new one for every album, which was
not friendly on memory usage! (I saw the app hit 2.5GB of usage at one
point 😧)
This commit is contained in:
Daniel Barber 2019-06-04 09:24:34 -04:00
parent e3d71284cc
commit 4c14ed5078
Signed by: danbarber
GPG Key ID: 931D8112E0103DD8
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Persephone/Controllers/AlbumDetailView.swift
View File

@ -12,6 +12,9 @@ class AlbumDetailView: NSViewController {
var album: Album? var album: Album?
var dataSource = AlbumTracksDataSource() var dataSource = AlbumTracksDataSource()
static let shared = AlbumDetailView()
static let popover = NSPopover()
@IBOutlet var albumTracksView: NSTableView! @IBOutlet var albumTracksView: NSTableView!
@IBOutlet var albumTitle: NSTextField! @IBOutlet var albumTitle: NSTextField!
@IBOutlet var albumArtist: NSTextField! @IBOutlet var albumArtist: NSTextField!
@ -30,6 +33,9 @@ class AlbumDetailView: NSViewController {
albumCoverView.layer?.borderWidth = 1 albumCoverView.layer?.borderWidth = 1
setAppearance() setAppearance()
}
override func viewWillAppear() {
guard let album = album else { return } guard let album = album else { return }
getAlbumSongs(for: album) getAlbumSongs(for: album)
@ -43,6 +49,16 @@ class AlbumDetailView: NSViewController {
default: default:
albumCoverView.image = .defaultCoverArt albumCoverView.image = .defaultCoverArt
} }
super.viewWillAppear()
}
override func viewWillDisappear() {
dataSource.albumSongs = []
albumTracksView.reloadData()
albumTitle.stringValue = ""
albumArtist.stringValue = ""
albumCoverView.image = .defaultCoverArt
} }
func getAlbumSongs(for album: Album) { func getAlbumSongs(for album: Album) {
@ -51,7 +67,7 @@ class AlbumDetailView: NSViewController {
mpdSongs.map { Song(mpdSong: $0) } mpdSongs.map { Song(mpdSong: $0) }
) )
//self?.getBigCoverArt(song: self?.dataSource.albumSongs.first!.song ?? self?.dataSource.albumSongs[1].song!) self?.getBigCoverArt(song: self?.dataSource.albumSongs.first!.song ?? (self?.dataSource.albumSongs[1].song!)!)
DispatchQueue.main.async { DispatchQueue.main.async {
self?.albumTracksView.reloadData() self?.albumTracksView.reloadData()

10
Persephone/Controllers/AlbumViewItem.swift
View File

@ -66,14 +66,12 @@ class AlbumViewItem: NSCollectionViewItem {
@IBAction func showAlbumDetail(_ sender: NSButton) { @IBAction func showAlbumDetail(_ sender: NSButton) {
guard let album = album else { return } guard let album = album else { return }
let detailViewController = AlbumDetailView()
detailViewController.setAlbum(album) AlbumDetailView.shared.setAlbum(album)
detailPopover = NSPopover() AlbumDetailView.popover.contentViewController = AlbumDetailView.shared
detailPopover?.contentViewController = detailViewController AlbumDetailView.popover.behavior = .transient
detailPopover?.behavior = .transient AlbumDetailView.popover.show(
detailPopover?.show(
relativeTo: sender.bounds, relativeTo: sender.bounds,
of: sender, of: sender,
preferredEdge: .maxY preferredEdge: .maxY