From bb481ae2f3d11e5351358ad91b8b3ddbe35b0cf2 Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 15:32:40 -0500 Subject: [PATCH 01/22] Switching to an arrow function --- client/src/DiscInfo/DiscInfo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index e1cfca1..9bc99f1 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -109,7 +109,7 @@ class DiscInfo extends Component { - {this.props.tracks && this.props.tracks.map(function(trackInfo, trackId) { + {this.props.tracks && this.props.tracks.map((trackInfo, trackId) => { return this.toggleTrack(trackId) }> Date: Sat, 1 Sep 2018 15:42:53 -0500 Subject: [PATCH 02/22] Switching how we set selectedTracks --- client/src/DiscInfo/DiscInfo.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index 9bc99f1..bf8ec11 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -20,14 +20,12 @@ class DiscInfo extends Component { constructor(props) { super(props); - let selectedTracks = {}; - this.props.tracks && this.props.tracks.map((trackInfo, trackId) => { - selectedTracks[trackId] = trackInfo.isAutoSelected; - }); this.state = { checkAll: false, discName: false, - selectedTracks: selectedTracks, + selectedTracks: this.props.tracks.map((trackInfo) => { + return trackInfo; + }) }; } From 598b10abed88271082b95f2e97433f9f670b6df5 Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 15:50:33 -0500 Subject: [PATCH 03/22] Return empty array if tracks is null, might have the syntax wrong --- client/src/DiscInfo/DiscInfo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index bf8ec11..963b0f8 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -25,7 +25,7 @@ class DiscInfo extends Component { discName: false, selectedTracks: this.props.tracks.map((trackInfo) => { return trackInfo; - }) + }) | [] }; } From 3204fbee278953db1a0f23e7c55a2213cca05f04 Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 15:56:24 -0500 Subject: [PATCH 04/22] Return empty array if tracks is null --- client/src/DiscInfo/DiscInfo.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index 963b0f8..8a78a4c 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -20,12 +20,16 @@ class DiscInfo extends Component { constructor(props) { super(props); + let selectedTracks = []; + if (this.props.tracks) { + selectedTracks = this.props.tracks.map((trackInfo) => { + return trackInfo; + }); + } this.state = { checkAll: false, discName: false, - selectedTracks: this.props.tracks.map((trackInfo) => { - return trackInfo; - }) | [] + selectedTracks: selectedTracks }; } From bfb231f36e42b36f4408d0b58160fef7242fbb62 Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 16:05:26 -0500 Subject: [PATCH 05/22] Only display disc info if there are tracks --- client/src/DiscInfo/DiscInfo.js | 23 +++++------------------ client/src/DiscPanel/DiscPanel.js | 19 ++++++++++++------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index 8a78a4c..739308f 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -2,34 +2,21 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; import $ from 'jquery'; -import { - Button, - Form, - FormGroup, - Input, - Label, - Table, -} from 'reactstrap'; +import {Button, Form, FormGroup, Input, Label, Table,} from 'reactstrap'; -import { - actionRipTracks, -} from '../api.js' +import {actionRipTracks,} from '../api.js' class DiscInfo extends Component { constructor(props) { super(props); - let selectedTracks = []; - if (this.props.tracks) { - selectedTracks = this.props.tracks.map((trackInfo) => { - return trackInfo; - }); - } this.state = { checkAll: false, discName: false, - selectedTracks: selectedTracks + selectedTracks: this.props.tracks.map((trackInfo) => { + return trackInfo; + }) }; } diff --git a/client/src/DiscPanel/DiscPanel.js b/client/src/DiscPanel/DiscPanel.js index 3c237f6..d4e88b6 100644 --- a/client/src/DiscPanel/DiscPanel.js +++ b/client/src/DiscPanel/DiscPanel.js @@ -39,27 +39,32 @@ class DiscPanel extends Component { } render(){ + let discInfo = ''; + if (this.state.discInfo.tracks.length > 0) { + discInfo = ; + } return(
- { this.props.driveId } + {this.props.driveId}  -  - { this.props.discName || 'No Disc' } + {this.props.discName || 'No Disc'} - - + {discInfo}
From 5ac0c481db2ad75c37b035f2eec16494502919b0 Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 16:10:31 -0500 Subject: [PATCH 06/22] Default tracks to empty --- client/src/DiscPanel/DiscPanel.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/src/DiscPanel/DiscPanel.js b/client/src/DiscPanel/DiscPanel.js index d4e88b6..94ba21c 100644 --- a/client/src/DiscPanel/DiscPanel.js +++ b/client/src/DiscPanel/DiscPanel.js @@ -21,7 +21,9 @@ class DiscPanel extends Component { constructor(props) { super(props); this.state = { - discInfo: {}, + discInfo: { + tracks: [] + }, }; subscribeToDiscInfo(this.handleDiscInfo, this, this.props.driveId); } From c6d79d4c49a863a7e7e57c6fe869874f161f42ba Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 16:18:01 -0500 Subject: [PATCH 07/22] Check that tracks exist first --- client/src/DiscPanel/DiscPanel.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/client/src/DiscPanel/DiscPanel.js b/client/src/DiscPanel/DiscPanel.js index 94ba21c..34e9797 100644 --- a/client/src/DiscPanel/DiscPanel.js +++ b/client/src/DiscPanel/DiscPanel.js @@ -21,9 +21,7 @@ class DiscPanel extends Component { constructor(props) { super(props); this.state = { - discInfo: { - tracks: [] - }, + discInfo: {} }; subscribeToDiscInfo(this.handleDiscInfo, this, this.props.driveId); } @@ -42,7 +40,7 @@ class DiscPanel extends Component { render(){ let discInfo = ''; - if (this.state.discInfo.tracks.length > 0) { + if (this.state.discInfo.tracks && this.state.discInfo.tracks.length > 0) { discInfo = Date: Sat, 1 Sep 2018 16:44:53 -0500 Subject: [PATCH 08/22] Name buttons and adjust how we select tracks --- client/src/DiscInfo/DiscInfo.js | 14 ++++++++------ client/src/DiscPanel/DiscPanel.js | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index 739308f..6a3ce5d 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -8,7 +8,6 @@ import {actionRipTracks,} from '../api.js' class DiscInfo extends Component { - constructor(props) { super(props); this.state = { @@ -99,13 +98,14 @@ class DiscInfo extends Component { {this.props.tracks && this.props.tracks.map((trackInfo, trackId) => { - return this.toggleTrack(trackId) }> + return this.toggleTrack(trackId) } - />s + class={trackId} + checked={this.state.selectedTracks[trackId]} + onChange={(event) => this.toggleTrack(event)} + /> { trackInfo.orderWeight } { trackInfo.name } @@ -119,7 +119,9 @@ class DiscInfo extends Component { - diff --git a/client/src/DiscPanel/DiscPanel.js b/client/src/DiscPanel/DiscPanel.js index 34e9797..4043062 100644 --- a/client/src/DiscPanel/DiscPanel.js +++ b/client/src/DiscPanel/DiscPanel.js @@ -60,7 +60,7 @@ class DiscPanel extends Component { From 9ee719f0ad3f7084ea59dc4eccd52f2d47b77f55 Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 16:46:29 -0500 Subject: [PATCH 09/22] Name buttons and adjust how we select tracks --- client/src/DiscInfo/DiscInfo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index 6a3ce5d..7416378 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -104,7 +104,7 @@ class DiscInfo extends Component { name="selectTrack" class={trackId} checked={this.state.selectedTracks[trackId]} - onChange={(event) => this.toggleTrack(event)} + onChange={(event) => this.toggleTrack(event.target.className)} /> { trackInfo.orderWeight } From 564bbbeab78d722677e8320f49cde9c2511567ec Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 16:56:03 -0500 Subject: [PATCH 10/22] Trying to figure out what is on event --- client/src/DiscInfo/DiscInfo.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index 7416378..82dd3b9 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -102,9 +102,8 @@ class DiscInfo extends Component { this.toggleTrack(event.target.className)} + onChange={(event) => this.toggleTrack(event)} /> { trackInfo.orderWeight } From e4da1d2cf999fa1c28df17261602fced5e11e827 Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 17:11:30 -0500 Subject: [PATCH 11/22] Trying to figure out what is on event --- client/src/DiscInfo/DiscInfo.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index 82dd3b9..e9a3aa2 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -35,8 +35,9 @@ class DiscInfo extends Component { .prop('checked', this.state.checkAll); } - toggleTrack(trackId) { + toggleTrack(event) { let changeObj = {}; + let trackId = 1; changeObj[trackId] = !this.selectedTracks[trackId]; this.setState({ selectedTracks: Object.assign( From 3c624b5550f22343f7354f08d8d6584d0bcd5da1 Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 17:20:05 -0500 Subject: [PATCH 12/22] Trying to determine which checkbox is checked --- client/src/DiscInfo/DiscInfo.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index e9a3aa2..f0461a4 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -37,7 +37,7 @@ class DiscInfo extends Component { toggleTrack(event) { let changeObj = {}; - let trackId = 1; + let trackId = event.target.id; changeObj[trackId] = !this.selectedTracks[trackId]; this.setState({ selectedTracks: Object.assign( @@ -102,7 +102,7 @@ class DiscInfo extends Component { return this.toggleTrack(event)} /> From 8b9887a18eaf1f980a04681437de895d8111472f Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 17:26:50 -0500 Subject: [PATCH 13/22] Switching id for name --- client/src/DiscInfo/DiscInfo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index f0461a4..80b8825 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -36,8 +36,8 @@ class DiscInfo extends Component { } toggleTrack(event) { + let trackId = event.target.name; let changeObj = {}; - let trackId = event.target.id; changeObj[trackId] = !this.selectedTracks[trackId]; this.setState({ selectedTracks: Object.assign( From 41d49d3a3cd0ab9c87698125c53dbcbbb2ad1a59 Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 17:59:08 -0500 Subject: [PATCH 14/22] Trying to populate selected track ids --- client/src/DiscInfo/DiscInfo.js | 46 ++++++++++++++------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index 80b8825..8463fcf 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -1,12 +1,10 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import $ from 'jquery'; import {Button, Form, FormGroup, Input, Label, Table,} from 'reactstrap'; import {actionRipTracks,} from '../api.js' - class DiscInfo extends Component { constructor(props) { super(props); @@ -14,43 +12,39 @@ class DiscInfo extends Component { checkAll: false, discName: false, selectedTracks: this.props.tracks.map((trackInfo) => { - return trackInfo; + const modifiedTrackInfo = { + ...trackInfo, + isSelected: true + }; + return modifiedTrackInfo; }) }; } - getTrackCheckboxes($formElement) { - return $formElement - .closest('fieldset') - .find('input[name=selectTrack]'); - } - // Toggle the checkbox on all tracks. toggleAllTracks(event) { - let $target = $(event.target); - this.setState({ - checkAll: $target.prop('checked'), - }); - this.getTrackCheckboxes(event.target) - .prop('checked', this.state.checkAll); + alert('This functionality is currently disabled.'); + // let $target = $(event.target); + // this.setState({ + // checkAll: $target.prop('checked'), + // }); + // this.getTrackCheckboxes(event.target) + // .prop('checked', this.state.checkAll); } toggleTrack(event) { let trackId = event.target.name; - let changeObj = {}; - changeObj[trackId] = !this.selectedTracks[trackId]; - this.setState({ - selectedTracks: Object.assign( - this.selectedTracks, changeObj - ) - }) + this.state.selectedTracks[trackId].isSelected = !this.state.selectedTracks[trackId].isSelected; } // Command the server to rip certain tracks for this disc. ripTracks(event) { - let ripTrackIds = this.getTrackCheckboxes(event.target) - .find(':checked') - .data('track-id'); + let ripTrackIds = []; + this.state.selectedTracks.forEach((selectedTrack) => { + if (selectedTrack.isSelected) { + ripTrackIds.push(selectedTrack.id); + } + }); actionRipTracks( this.state.discName, this.props.driveId, @@ -143,7 +137,7 @@ DiscInfo.propTypes = { volumeName: PropTypes.string.isRequired, tracks: PropTypes.arrayOf(PropTypes.shape({ id: PropTypes.number.isRequired, - isAutoSelected: PropTypes.bool, + isSelected: PropTypes.bool, ripStatus: PropTypes.oneOf(['none', 'busy', 'fail', 'success']), chapterCount: PropTypes.number.isRequired, diskSize: PropTypes.string.isRequired, From 6faef7867fcf26211b79e13cde888681b1070ae3 Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 18:11:43 -0500 Subject: [PATCH 15/22] Defaulting isSelected to true won't work --- client/src/DiscInfo/DiscInfo.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index 8463fcf..e519fd6 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -12,11 +12,7 @@ class DiscInfo extends Component { checkAll: false, discName: false, selectedTracks: this.props.tracks.map((trackInfo) => { - const modifiedTrackInfo = { - ...trackInfo, - isSelected: true - }; - return modifiedTrackInfo; + return trackInfo; }) }; } From 869ff2f65fe849c7ad8f286e8e6e9b589dfb97b2 Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 18:19:29 -0500 Subject: [PATCH 16/22] Change how we determine if it is checked --- client/src/DiscInfo/DiscInfo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index e519fd6..f46880b 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -30,7 +30,7 @@ class DiscInfo extends Component { toggleTrack(event) { let trackId = event.target.name; - this.state.selectedTracks[trackId].isSelected = !this.state.selectedTracks[trackId].isSelected; + this.state.selectedTracks[trackId].isSelected = event.target.checked; } // Command the server to rip certain tracks for this disc. From 0831d6428ee77fe4aa9bf0361760dbb6afb80e6a Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 18:28:44 -0500 Subject: [PATCH 17/22] Change how we determine whether we prefill the checkbox or not --- client/src/DiscInfo/DiscInfo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index f46880b..5b33fdc 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -93,7 +93,7 @@ class DiscInfo extends Component { this.toggleTrack(event)} /> From b0217a70df65a63a3e44cf86fdd368a5d39373a2 Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 18:48:12 -0500 Subject: [PATCH 18/22] Switch foreach for map --- client/src/DiscInfo/DiscInfo.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index 5b33fdc..c2ff667 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -35,16 +35,14 @@ class DiscInfo extends Component { // Command the server to rip certain tracks for this disc. ripTracks(event) { - let ripTrackIds = []; - this.state.selectedTracks.forEach((selectedTrack) => { - if (selectedTrack.isSelected) { - ripTrackIds.push(selectedTrack.id); - } - }); actionRipTracks( this.state.discName, this.props.driveId, - ripTrackIds + this.state.selectedTracks.map((selectedTrack, trackId) => { + if (selectedTrack.isSelected) { + return trackId; + } + }) ); } From 0423b3897d90b305690b76737e6992124c572363 Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 19:04:36 -0500 Subject: [PATCH 19/22] Map to foreach, not sure if I can use a reduce here? or maybe a filter? --- client/src/DiscInfo/DiscInfo.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index c2ff667..77a4314 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -34,15 +34,17 @@ class DiscInfo extends Component { } // Command the server to rip certain tracks for this disc. - ripTracks(event) { + ripTracks() { + let trackIds = []; + this.state.selectedTracks.forEach((selectedTrack, trackId) => { + if (selectedTrack.isSelected) { + trackIds.push(trackId); + } + }); actionRipTracks( this.state.discName, this.props.driveId, - this.state.selectedTracks.map((selectedTrack, trackId) => { - if (selectedTrack.isSelected) { - return trackId; - } - }) + trackIds ); } @@ -107,7 +109,7 @@ class DiscInfo extends Component { - From 6fe49143098de07413404df64b5d7158c319ed1b Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 19:06:34 -0500 Subject: [PATCH 20/22] Need to pass driveId down --- client/src/DiscPanel/DiscPanel.js | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/DiscPanel/DiscPanel.js b/client/src/DiscPanel/DiscPanel.js index 4043062..ac0045a 100644 --- a/client/src/DiscPanel/DiscPanel.js +++ b/client/src/DiscPanel/DiscPanel.js @@ -43,6 +43,7 @@ class DiscPanel extends Component { if (this.state.discInfo.tracks && this.state.discInfo.tracks.length > 0) { discInfo = ; } From 5bd511a5636c86d04dd54c43c6de5ec776e9a09a Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Sat, 1 Sep 2018 19:15:44 -0500 Subject: [PATCH 21/22] Passing down discName --- client/src/DiscInfo/DiscInfo.js | 2 +- client/src/DiscPanel/DiscPanel.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/DiscInfo/DiscInfo.js b/client/src/DiscInfo/DiscInfo.js index 77a4314..ac0f8d8 100644 --- a/client/src/DiscInfo/DiscInfo.js +++ b/client/src/DiscInfo/DiscInfo.js @@ -42,7 +42,7 @@ class DiscInfo extends Component { } }); actionRipTracks( - this.state.discName, + this.props.discName, this.props.driveId, trackIds ); diff --git a/client/src/DiscPanel/DiscPanel.js b/client/src/DiscPanel/DiscPanel.js index ac0045a..fa3187a 100644 --- a/client/src/DiscPanel/DiscPanel.js +++ b/client/src/DiscPanel/DiscPanel.js @@ -44,6 +44,7 @@ class DiscPanel extends Component { discInfo = ; } From e46b07c9089401c633d4fce9735296bea19e94b5 Mon Sep 17 00:00:00 2001 From: Tony Brobston Date: Tue, 4 Sep 2018 22:43:27 -0500 Subject: [PATCH 22/22] Fixing an incorrect method name and fixing how we check if a set has contents and how we pop the last one off the set --- makemkv.js | 4 ++-- server.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/makemkv.js b/makemkv.js index ea51fe4..a86ff4a 100644 --- a/makemkv.js +++ b/makemkv.js @@ -213,7 +213,7 @@ class MakeMkv { trackIds.map((trackId) => this.ripQueue.driveId.add(trackId)); } - if (!this.ripQueue.driveId.length) { + if (!this.ripQueue.driveId.size) { // @TODO: What to do here? return; } @@ -224,7 +224,7 @@ class MakeMkv { }; this.ripTrack( - saveDirectory, driveId, this.ripQueue.driveId.pop(), newCallback + saveDirectory, driveId, Array.from(this.ripQueue.driveId).pop(), newCallback ); } diff --git a/server.js b/server.js index 29162ac..5c9e18a 100644 --- a/server.js +++ b/server.js @@ -204,7 +204,7 @@ class MakeMkvServer { // Actions client.on('doDiscInfo', (data) => { this.doDiscInfo(data) }); - client.on('doRipTrack', (data) => { this.doRipTrack(data) }); + client.on('doRipTracks', (data) => { this.doRipTracks(data) }); } @@ -225,7 +225,7 @@ class MakeMkvServer { this.makeMkv.getDiscInfo(driveId, callback); } - doRipTrack(data) { + doRipTracks(data) { let driveId = data.driveId, discName = data.discName,