sam_oneal/fx_cast
1
0
Fork 0
mirror of https://github.com/hensm/fx_cast.git synced 2026-06-08 08:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add additional AirPlayDeviceManager comments

Browse Source
This commit is contained in:
hensm
2019-10-05 01:11:03 +01:00
parent 890a9908a8
commit 58a2e52829
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ext/src/ui/options/AirPlayDeviceManager.tsx
View File

@@ -234,7 +234,7 @@ export default class AirPlayDeviceManager extends Component<
, isPaired: false , isPaired: false
}; };
// Use generated address if user left it blank // Use generated suggested address if user left it blank
if (!this.state.newDeviceAddress) { if (!this.state.newDeviceAddress) {
device.address = this.state.newDeviceAddressSuggestion; device.address = this.state.newDeviceAddressSuggestion;
} }
@@ -257,8 +257,14 @@ export default class AirPlayDeviceManager extends Component<
private onDeviceRegenCredentials (device: devices.Device) { private onDeviceRegenCredentials (device: devices.Device) {
this.setState(state => { this.setState(state => {
devices: state.devices.map(d => { devices: state.devices.map(d => {
/**
* Generate and set new credentials with an empty
* AirPlayAuthCredentials call. Then, since the new credentials
* aren't paired, set isPaired to false.
*/
if (d.name === device.name) { if (d.name === device.name) {
d.credentials = new AirPlayAuthCredentials(); d.credentials = new AirPlayAuthCredentials();
d.isPaired = false;
} }
return d; return d;
@@ -269,17 +275,37 @@ export default class AirPlayDeviceManager extends Component<
private onDevicePairCredentials () {} private onDevicePairCredentials () {}
/**
* Each time the new device name field is changed, provided the
* user has not already set an address in the address field,
* make a best-guess at what the actual address is and set the
* placeholder attribute of the address field to display it as
* indication.
*
* If, once the new device form is submitted, the address field
* was left blank, the suggested address is used instead.
*/
private onNewDeviceNameChange (ev: React.ChangeEvent<HTMLInputElement>) { private onNewDeviceNameChange (ev: React.ChangeEvent<HTMLInputElement>) {
this.setState({ this.setState({
newDeviceName: ev.target.value newDeviceName: ev.target.value
}); });
if (!this.state.newDeviceAddress) { if (!this.state.newDeviceAddress) {
/**
* Use the same-ish formatting rules as macOS for service
* names:
* - Consecutive whitespace is replaced by a single space. No
* need for tabs or newlines.
* - All remaining spaces are replaced by hyphens.
* - Any characters that aren't alpha-numerics or hyphens are
* removed.
*/
const formattedName = ev.target.value const formattedName = ev.target.value
.replace(/\s{2,}/g, " ") .replace(/\s{2,}/g, " ")
.replace(/ /g, "-") .replace(/ /g, "-")
.replace(/[^a-zA-Z0-9-]/g, ""); .replace(/[^a-zA-Z0-9-]/g, "");
// Set new suggestion
this.setState({ this.setState({
newDeviceAddressSuggestion: `${formattedName}.local` newDeviceAddressSuggestion: `${formattedName}.local`
}); });