Skip to content

Commit 156c84d

Browse files
committed
Improve logging
1 parent 775829b commit 156c84d

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

QuestPatcher.Core/AndroidDebugBridge.cs

+6-7
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ private async Task<bool> SetAdbPathIfValid(string adbExecutablePath)
233233
}
234234

235235
/// <returns>The device ID of one of the Quest devices connected, or a non-quest device if no quest is present.</returns>
236-
private async Task<string> GetDeviceIdToUse()
236+
private async Task<(string id, string model)> GetDeviceToUse()
237237
{
238238
var devices = await ListDevicesInternal();
239239

@@ -243,18 +243,16 @@ private async Task<string> GetDeviceIdToUse()
243243

244244
if (questDevices.Any())
245245
{
246-
Log.Debug("Using quest device");
247246
if (questDevices.Count > 1)
248247
{
249248
Log.Warning("Multiple quest devices connected - using the first device");
250249
}
251250

252-
return questDevices.First().id;
251+
return questDevices.First();
253252
}
254253
else
255254
{
256-
Log.Debug("Using non-quest device");
257-
return devices.First().id;
255+
return devices.First();
258256
}
259257

260258
}
@@ -359,9 +357,10 @@ public async Task<ProcessOutput> RunCommand(string command, params int[] allowed
359357
else if (allOutput.Contains("multiple devices") || output.ErrorOutput.Contains("more than one device/emulator"))
360358
{
361359
Log.Information("Multiple devices detected, choosing the Quest device if present");
362-
_chosenDeviceId = await GetDeviceIdToUse();
360+
var device = await GetDeviceToUse();
361+
_chosenDeviceId = device.id;
363362

364-
Log.Information("Using {DeviceId}", _chosenDeviceId);
363+
Log.Information("Using id: {DeviceId} model: {Model}", device.id, device.model);
365364
}
366365
else if (allOutput.Contains("unauthorized"))
367366
{

0 commit comments

Comments
 (0)