sarsoo/Selector
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

adding explicit handling for null item in watcher, skipping user watchers without spotify link, fixed weird systemd issue with async run

Browse Source
This commit is contained in:
andy 2021-12-15 22:04:41 +00:00
parent a0090470e8
commit 46b7cb37bd
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Selector.CLI/DbWatcherService.cs
View File

@ -83,7 +83,9 @@ namespace Selector.CLI
var indices = new HashSet<string>(); var indices = new HashSet<string>();
foreach (var dbWatcher in db.Watcher.Include(w => w.User)) foreach (var dbWatcher in db.Watcher
.Include(w => w.User)
.Where(w => !string.IsNullOrWhiteSpace(w.User.SpotifyRefreshToken)))
{ {
Logger.LogInformation($"Creating new [{dbWatcher.Type}] watcher"); Logger.LogInformation($"Creating new [{dbWatcher.Type}] watcher");

3
Selector.CLI/Program.cs
View File

@ -26,8 +26,7 @@ namespace Selector.CLI
} }
}; };
var host = CreateHostBuilder(args, ConfigureDefault, ConfigureDefaultNlog); CreateHostBuilder(args, ConfigureDefault, ConfigureDefaultNlog).Build().Run();
await host.RunConsoleAsync();
} }
public static RootOptions ConfigureOptions(HostBuilderContext context, IServiceCollection services) public static RootOptions ConfigureOptions(HostBuilderContext context, IServiceCollection services)

8
Selector/Watcher/PlayerWatcher.cs
View File

@ -130,6 +130,14 @@ namespace Selector
OnItemChange(GetEvent()); OnItemChange(GetEvent());
} }
} }
else if (Previous.Item is null)
{
Logger.LogWarning($"Previous item was null [{Previous.DisplayString()}]");
}
else if (Live.Item is null)
{
Logger.LogWarning($"Live item was null [{Live.DisplayString()}]");
}
else { else {
Logger.LogError($"Unknown combination of previous and current playing contexts, [{Previous.DisplayString()}] [{Live.DisplayString()}]"); Logger.LogError($"Unknown combination of previous and current playing contexts, [{Previous.DisplayString()}] [{Live.DisplayString()}]");
throw new NotSupportedException("Unknown item combination"); throw new NotSupportedException("Unknown item combination");