From fdd06e81b642efb740b33956c2f776d63a480ab4 Mon Sep 17 00:00:00 2001 From: Bret Comnes Date: Wed, 8 Nov 2017 23:28:04 -0800 Subject: [PATCH 1/4] Improve playlist update function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don’t run the children update functions twice, just optimistically render. --- renderer/elements/playlist/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renderer/elements/playlist/index.js b/renderer/elements/playlist/index.js index 0a5e1de..dcd46e9 100644 --- a/renderer/elements/playlist/index.js +++ b/renderer/elements/playlist/index.js @@ -31,7 +31,7 @@ class Playlist extends Component { update (state, emit) { if (this.loading !== state.library.loading) return true - if (this.trackView.update(state, emit)) return true + this.trackView.render(state, emit) return false } } From a88e82ced0593d95ce88bb4ed7852b0707d68e3b Mon Sep 17 00:00:00 2001 From: Bret Comnes Date: Wed, 8 Nov 2017 23:34:33 -0800 Subject: [PATCH 2/4] Fix some delayed update bugs in player --- renderer/elements/player/progress.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/renderer/elements/player/progress.js b/renderer/elements/player/progress.js index ca41d58..18b8b8f 100644 --- a/renderer/elements/player/progress.js +++ b/renderer/elements/player/progress.js @@ -110,9 +110,10 @@ class Progress extends Component { update (state, emit) { this.emit = emit + if (this.disabled !== truthy(state.player.currentIndex)) return true if (this.key !== get(state, 'player.currentTrack.key')) return true if (this.position !== state.player.currentTime) return true - if (this.disabled !== truthy(state.player.currentIndex)) return true + if (this.duration !== get(state, 'player.currentTrack.duration')) return true return false } } From 960880cf9e51b3861e19f9d771cb43a49871b584 Mon Sep 17 00:00:00 2001 From: Bret Comnes Date: Thu, 9 Nov 2017 22:06:12 -0800 Subject: [PATCH 3/4] Fix now playing index bugs --- main/index.js | 1 + renderer/elements/playlist/track-view.js | 2 +- renderer/stores/library.js | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/main/index.js b/main/index.js index 8cd822c..9caeaf6 100644 --- a/main/index.js +++ b/main/index.js @@ -255,6 +255,7 @@ app.on('window-all-closed', function allWindowsClosed () { app.on('activate', function activate () { if (player.win === null) { + al.recall() player.init() } globalShortcuts.reregister() diff --git a/renderer/elements/playlist/track-view.js b/renderer/elements/playlist/track-view.js index a6030ca..be004be 100644 --- a/renderer/elements/playlist/track-view.js +++ b/renderer/elements/playlist/track-view.js @@ -262,7 +262,7 @@ class TrackView extends Component { if (this.isNewQuery !== state.library.isNewQuery) return true if (shouldColumnsUpdate(this.columns, state.library.columns)) return true // Mutate - if (this.currentIndex !== state.library.currentIndex) { + if (this.currentIndex !== state.library.currentIndex && !this.isNewQuery) { this.mutateCurrentIndex(state.library.currentIndex) } if (this.selectedIndex !== state.library.selectedIndex) { diff --git a/renderer/stores/library.js b/renderer/stores/library.js index 0018c51..f288981 100644 --- a/renderer/stores/library.js +++ b/renderer/stores/library.js @@ -16,8 +16,8 @@ function getInitialState () { currentIndex: mainState.al.index, search: mainState.al.searchTerm, selectedIndex: null, - isNewQuery: false, - loading: false, + isNewQuery: mainState.al.isNewQuery, + loading: mainState.loading, columns: Array.from(COLUMNS).reduce((obj, col) => { obj[col] = true return obj From 864118b163e23ff480aaa191de4422d36a7d076b Mon Sep 17 00:00:00 2001 From: Bret Comnes Date: Thu, 9 Nov 2017 22:13:23 -0800 Subject: [PATCH 4/4] Add changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..b78d215 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,10 @@ +# hyperamp Change Log +All notable changes to this project will be documented in this file. +This project adheres to [Semantic Versioning](http://semver.org/). + +## 0.5.3 - 2017-11-09 +* Added this here changelog +* Fix some state transfer bugs + +## 0.5.2 - 2017-11-10 +* Engage