Skip to content

Commit 6bcf739

Browse files
committedAug 9, 2020
ConfigureAwait(false)
1 parent f1ee410 commit 6bcf739

File tree

6 files changed

+49
-49
lines changed

6 files changed

+49
-49
lines changed
 

‎src/Blu4Net/BluPlayer.cs

+21-21
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ public static async Task<BluPlayer> Connect(Uri endpoint)
8080
throw new ArgumentNullException(nameof(endpoint));
8181

8282
var channel = new BluChannel(endpoint);
83-
var syncStatus = await channel.GetSyncStatus();
84-
var status = await channel.GetStatus();
85-
var content = await channel.BrowseContent();
83+
var syncStatus = await channel.GetSyncStatus().ConfigureAwait(false);
84+
var status = await channel.GetStatus().ConfigureAwait(false);
85+
var content = await channel.BrowseContent().ConfigureAwait(false);
8686

8787
return new BluPlayer(channel, syncStatus, status, content);
8888
}
@@ -113,7 +113,7 @@ public TextWriter Log
113113

114114
public async Task<int> GetVolume()
115115
{
116-
var response = await _channel.GetVolume();
116+
var response = await _channel.GetVolume().ConfigureAwait(false);
117117
return response.Volume;
118118
}
119119

@@ -122,101 +122,101 @@ public async Task<int> SetVolume(int percentage)
122122
if (percentage < 0 || percentage > 100)
123123
throw new ArgumentOutOfRangeException(nameof(percentage), "Value must be between 0 and 100");
124124

125-
var response = await _channel.SetVolume(percentage);
125+
var response = await _channel.SetVolume(percentage).ConfigureAwait(false);
126126
return response.Volume;
127127
}
128128

129129
public async Task<int> Mute(bool on = true)
130130
{
131-
var response = await _channel.Mute(on ? 1 : 0);
131+
var response = await _channel.Mute(on ? 1 : 0).ConfigureAwait(false);
132132
return response.Volume;
133133
}
134134

135135
public async Task<PlayerState> GetState()
136136
{
137-
var response = await _channel.GetStatus();
137+
var response = await _channel.GetStatus().ConfigureAwait(false);
138138
return BluParser.ParseState(response.State);
139139
}
140140

141141
public async Task<PlayerState> Play()
142142
{
143-
var response = await _channel.Play();
143+
var response = await _channel.Play().ConfigureAwait(false);
144144
return BluParser.ParseState(response.State);
145145
}
146146

147147
public async Task<PlayerState> Seek(TimeSpan offset)
148148
{
149-
var response = await _channel.Play((int)offset.TotalSeconds);
149+
var response = await _channel.Play((int)offset.TotalSeconds).ConfigureAwait(false);
150150
return BluParser.ParseState(response.State);
151151
}
152152

153153
public async Task<PlayerState> Pause(bool toggle = false)
154154
{
155-
var response = await _channel.Pause(toggle ? 1 : 0);
155+
var response = await _channel.Pause(toggle ? 1 : 0).ConfigureAwait(false);
156156
return BluParser.ParseState(response.State);
157157
}
158158

159159
public async Task<PlayerState> Stop()
160160
{
161-
var response = await _channel.Stop();
161+
var response = await _channel.Stop().ConfigureAwait(false);
162162
return BluParser.ParseState(response.State);
163163
}
164164

165165
public async Task<int?> Back()
166166
{
167-
var status = await _channel.GetStatus();
167+
var status = await _channel.GetStatus().ConfigureAwait(false);
168168
if (status.StreamUrl == null)
169169
{
170-
var response = await _channel.Back();
170+
var response = await _channel.Back().ConfigureAwait(false);
171171
return response?.ID;
172172
}
173173
return null;
174174
}
175175

176176
public async Task<int?> Skip()
177177
{
178-
var status = await _channel.GetStatus();
178+
var status = await _channel.GetStatus().ConfigureAwait(false);
179179
if (status.StreamUrl == null)
180180
{
181-
var response = await _channel.Skip();
181+
var response = await _channel.Skip().ConfigureAwait(false);
182182
return response?.ID;
183183
}
184184
return null;
185185
}
186186

187187
public async Task<ShuffleMode> GetShuffleMode()
188188
{
189-
var response = await _channel.GetShuffle();
189+
var response = await _channel.GetShuffle().ConfigureAwait(false);
190190
return (ShuffleMode)response.Shuffle;
191191
}
192192

193193
public async Task<ShuffleMode> SetShuffleMode(ShuffleMode mode = ShuffleMode.ShuffleOn)
194194
{
195-
var response = await _channel.SetShuffle((int)mode);
195+
var response = await _channel.SetShuffle((int)mode).ConfigureAwait(false);
196196
return (ShuffleMode)response.Shuffle;
197197
}
198198

199199
public async Task<RepeatMode> GetRepeatMode()
200200
{
201-
var response = await _channel.GetRepeat();
201+
var response = await _channel.GetRepeat().ConfigureAwait(false);
202202
return (RepeatMode)response.Repeat;
203203
}
204204

205205
public async Task<RepeatMode> SetRepeatMode(RepeatMode mode = RepeatMode.RepeatAll)
206206
{
207-
var response = await _channel.SetRepeat((int)mode);
207+
var response = await _channel.SetRepeat((int)mode).ConfigureAwait(false);
208208
return (RepeatMode)response.Repeat;
209209
}
210210

211211
public async Task<PlayerMedia> GetMedia()
212212
{
213-
var response = await _channel.GetStatus();
213+
var response = await _channel.GetStatus().ConfigureAwait(false);
214214
return new PlayerMedia(response, Endpoint);
215215
}
216216

217217
public async Task<PlayPosition> GetPosition()
218218
{
219-
var response = await _channel.GetStatus();
219+
var response = await _channel.GetStatus().ConfigureAwait(false);
220220
return new PlayPosition(response);
221221
}
222222

‎src/Blu4Net/Channel/BluChannel.cs

+20-20
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ private async Task<XDocument> SendRequest(string request, NameValueCollection pa
6969
{
7070
client.DefaultRequestHeaders.AcceptLanguage.TryParseAdd(AcceptLanguage.Name);
7171

72-
using (var response = await client.GetAsync(requestUri, cancellationToken))
73-
using (var stream = await response.Content.ReadAsStreamAsync())
72+
using (var response = await client.GetAsync(requestUri, cancellationToken).ConfigureAwait(false))
73+
using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
7474
{
7575
var document = XDocument.Load(stream);
7676

@@ -98,7 +98,7 @@ private async Task<T> SendRequest<T>(string request, NameValueCollection paramet
9898
if (request == null)
9999
throw new ArgumentNullException(nameof(request));
100100

101-
var document = await SendRequest(request, parameters, timeout, cancellationToken);
101+
var document = await SendRequest(request, parameters, timeout, cancellationToken).ConfigureAwait(false);
102102
return document.Deserialize<T>();
103103
}
104104

@@ -132,7 +132,7 @@ private IObservable<T> LongPolling<T>(string request, int timeout) where T : Lon
132132
}
133133
try
134134
{
135-
var response = await SendRequest<T>(request, parameters, InfiniteTimeout, cancellationToken);
135+
var response = await SendRequest<T>(request, parameters, InfiniteTimeout, cancellationToken).ConfigureAwait(false);
136136

137137
if (longPollingTag != null)
138138
{
@@ -159,12 +159,12 @@ private IObservable<T> LongPolling<T>(string request, int timeout) where T : Lon
159159

160160
public async Task<StatusResponse> GetStatus()
161161
{
162-
return await SendRequest<StatusResponse>("Status");
162+
return await SendRequest<StatusResponse>("Status").ConfigureAwait(false);
163163
}
164164

165165
public async Task<SyncStatusResponse> GetSyncStatus()
166166
{
167-
return await SendRequest<SyncStatusResponse>("SyncStatus");
167+
return await SendRequest<SyncStatusResponse>("SyncStatus").ConfigureAwait(false);
168168
}
169169

170170
public Task<PlayResponse> Play()
@@ -193,27 +193,27 @@ public async Task<PlayResponse> Pause(int toggle = 0)
193193
parameters["toggle"] = toggle.ToString();
194194
}
195195

196-
return await SendRequest<PlayResponse>("Pause", parameters);
196+
return await SendRequest<PlayResponse>("Pause", parameters).ConfigureAwait(false);
197197
}
198198

199199
public async Task<StopResponse> Stop()
200200
{
201-
return await SendRequest<StopResponse>("Stop");
201+
return await SendRequest<StopResponse>("Stop").ConfigureAwait(false);
202202
}
203203

204204
public async Task<SkipResponse> Skip()
205205
{
206-
return await SendRequest<SkipResponse>("Skip");
206+
return await SendRequest<SkipResponse>("Skip").ConfigureAwait(false);
207207
}
208208

209209
public async Task<BackResponse> Back()
210210
{
211-
return await SendRequest<BackResponse>("Back");
211+
return await SendRequest<BackResponse>("Back").ConfigureAwait(false);
212212
}
213213

214214
public async Task<VolumeResponse> GetVolume()
215215
{
216-
return await SendRequest<VolumeResponse>("Volume");
216+
return await SendRequest<VolumeResponse>("Volume").ConfigureAwait(false);
217217
}
218218

219219
public async Task<VolumeResponse> SetVolume(int percentage)
@@ -223,7 +223,7 @@ public async Task<VolumeResponse> SetVolume(int percentage)
223223

224224
var parameters = HttpUtility.ParseQueryString(string.Empty);
225225
parameters["level"] = percentage.ToString();
226-
return await SendRequest<VolumeResponse>("Volume", parameters);
226+
return await SendRequest<VolumeResponse>("Volume", parameters).ConfigureAwait(false);
227227
}
228228

229229
public async Task<VolumeResponse> Mute(int mute = 1)
@@ -233,14 +233,14 @@ public async Task<VolumeResponse> Mute(int mute = 1)
233233

234234
var parameters = HttpUtility.ParseQueryString(string.Empty);
235235
parameters["mute"] = mute.ToString();
236-
return await SendRequest<VolumeResponse>("Volume", parameters);
236+
return await SendRequest<VolumeResponse>("Volume", parameters).ConfigureAwait(false);
237237
}
238238

239239
public async Task<PlaylistStatusResponse> GetPlaylistStatus()
240240
{
241241
var parameters = HttpUtility.ParseQueryString(string.Empty);
242242
parameters["length"] = 1.ToString();
243-
return await SendRequest<PlaylistStatusResponse>("Playlist", parameters);
243+
return await SendRequest<PlaylistStatusResponse>("Playlist", parameters).ConfigureAwait(false);
244244
}
245245

246246
private async Task<PlaylistResponse> GetPlaylist(int startIndex, int length)
@@ -257,7 +257,7 @@ private async Task<PlaylistResponse> GetPlaylist(int startIndex, int length)
257257
parameters["end"] = (startIndex + length - 1).ToString();
258258
}
259259

260-
var response = await SendRequest<PlaylistResponse>("Playlist", parameters);
260+
var response = await SendRequest<PlaylistResponse>("Playlist", parameters).ConfigureAwait(false);
261261
if (response.Songs == null)
262262
{
263263
response.Songs = new PlaylistResponse.Song[0];
@@ -271,7 +271,7 @@ public async IAsyncEnumerable<PlaylistResponse> GetPlaylistPaged(int pageSize)
271271

272272
while (true)
273273
{
274-
var listing = await GetPlaylist(startIndex, pageSize);
274+
var listing = await GetPlaylist(startIndex, pageSize).ConfigureAwait(false);
275275
if (listing.Songs.Length == 0)
276276
break;
277277

@@ -287,7 +287,7 @@ public Task<PlaylistResponse> GetPlaylist()
287287

288288
public async Task<ClearResponse> Clear()
289289
{
290-
return await SendRequest<ClearResponse>("Clear");
290+
return await SendRequest<ClearResponse>("Clear").ConfigureAwait(false);
291291
}
292292

293293
public Task<DeleteResponse> Delete(int id)
@@ -341,7 +341,7 @@ public Task<RepeatResponse> SetRepeat(int state)
341341

342342
public async Task<PresetsResponse> GetPresets()
343343
{
344-
var response = await SendRequest<PresetsResponse>("Presets");
344+
var response = await SendRequest<PresetsResponse>("Presets").ConfigureAwait(false);
345345
if (response.Presets == null)
346346
{
347347
response.Presets = new PresetsResponse.Preset[0];
@@ -354,7 +354,7 @@ public async Task<PresetLoadedResponse> LoadPreset(int id)
354354
var parameters = HttpUtility.ParseQueryString(string.Empty);
355355
parameters["id"] = id.ToString();
356356

357-
var document = await SendRequest("Preset", parameters);
357+
var document = await SendRequest("Preset", parameters).ConfigureAwait(false);
358358
if (document.Root.Name == "loaded")
359359
{
360360
return document.Deserialize<PlaylistPresetLoadedResponse>();
@@ -379,7 +379,7 @@ public async Task<BrowseContentResponse> BrowseContent(string key = null, string
379379
}
380380
}
381381

382-
var response = await SendRequest<BrowseContentResponse>("Browse", parameters);
382+
var response = await SendRequest<BrowseContentResponse>("Browse", parameters).ConfigureAwait(false);
383383
if (response.Items == null)
384384
{
385385
response.Items = new BrowseContentResponse.Item[0];

‎src/Blu4Net/MusicContentEntry.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public async Task<MusicContentNode> Resolve()
4141
if (_key == null)
4242
throw new InvalidOperationException("This entry is not resolvable");
4343

44-
var response = await _channel.BrowseContent(_key);
44+
var response = await _channel.BrowseContent(_key).ConfigureAwait(false);
4545
return new MusicContentNode(_channel, Node, response);
4646
}
4747

‎src/Blu4Net/MusicContentNode.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public async Task<MusicContentNode> Search(string searchTerm)
3838
if (_searchKey == null)
3939
throw new NotSupportedException("Musicsource is not searchable");
4040

41-
var response = await _channel.BrowseContent(_searchKey, searchTerm);
41+
var response = await _channel.BrowseContent(_searchKey, searchTerm).ConfigureAwait(false);
4242
return new MusicContentNode(_channel, this, response);
4343
}
4444

‎src/Blu4Net/PlayQueue.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ public PlayQueue(BluChannel channel, StatusResponse status)
2222
Changes = _channel.StatusChanges
2323
.SkipWhile(response => response.PlaylistID == status.PlaylistID)
2424
.DistinctUntilChanged(response => response.PlaylistID)
25-
.SelectAsync(async _ => await GetInfo());
25+
.SelectAsync(async _ => await GetInfo().ConfigureAwait(false));
2626
}
2727

2828
public async Task<PlayQueueInfo> GetInfo()
2929
{
30-
var status = await _channel.GetPlaylistStatus();
30+
var status = await _channel.GetPlaylistStatus().ConfigureAwait(false);
3131
return new PlayQueueInfo(status);
3232
}
3333

3434
public async IAsyncEnumerable<IReadOnlyCollection<PlayQueueSong>> GetSongs(int pageSize)
3535
{
36-
await foreach (var list in _channel.GetPlaylistPaged(pageSize))
36+
await foreach (var list in _channel.GetPlaylistPaged(pageSize).ConfigureAwait(false))
3737
{
3838
yield return list.Songs.Select(element => new PlayQueueSong(element)).ToArray();
3939
}
@@ -51,7 +51,7 @@ public Task Remove(int songID)
5151

5252
public async Task<int> Save(string name)
5353
{
54-
var response = await _channel.Save(name);
54+
var response = await _channel.Save(name).ConfigureAwait(false);
5555
return response.Entries;
5656
}
5757
}

‎src/Blu4Net/PlayerPresetList.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ public PlayerPresetList(BluChannel channel, StatusResponse status)
2323
Changes = _channel.StatusChanges
2424
.SkipWhile(response => response.PresetsID == status.PresetsID)
2525
.DistinctUntilChanged(response => response.PresetsID)
26-
.SelectAsync(async _ => await GetPresets());
26+
.SelectAsync(async _ => await GetPresets().ConfigureAwait(false));
2727
}
2828

2929

3030
public async Task<IReadOnlyCollection<PlayerPreset>> GetPresets()
3131
{
32-
var response = await _channel.GetPresets();
32+
var response = await _channel.GetPresets().ConfigureAwait(false);
3333
return response.Presets
3434
.Select(element => new PlayerPreset(element, _channel.Endpoint))
3535
.ToArray();

0 commit comments

Comments
 (0)
Please sign in to comment.