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

linting and warnings

Browse Source
This commit is contained in:
Andy Pack 2023-01-06 21:11:29 +00:00
parent 57b80c9902
commit faa1c55030
Signed by: sarsoo
GPG Key ID: A55BA3536A5E0ED7
8 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Selector.CLI/Command/HostCommand.cs
View File

@ -9,7 +9,6 @@ using Selector.Extensions;
using System; using System;
using System.CommandLine; using System.CommandLine;
using System.CommandLine.Invocation; using System.CommandLine.Invocation;
using System.Threading.Tasks;
namespace Selector.CLI namespace Selector.CLI
{ {
@ -52,11 +51,11 @@ namespace Selector.CLI
private static void SetupExceptionHandling(ILogger logger, IHostEnvironment env) private static void SetupExceptionHandling(ILogger logger, IHostEnvironment env)
{ {
AppDomain.CurrentDomain.UnhandledException += (obj, e) => AppDomain.CurrentDomain.UnhandledException += (_, e) =>
{ {
if(e.ExceptionObject is Exception ex) if(e.ExceptionObject is Exception ex)
{ {
logger.LogError(ex as Exception, "Unhandled exception thrown"); logger.LogError(ex, "Unhandled exception thrown");
if (env.IsDevelopment()) if (env.IsDevelopment())
{ {
@ -152,11 +151,11 @@ namespace Selector.CLI
.AddNLog(context.Configuration); .AddNLog(context.Configuration);
} }
static IHostBuilder CreateHostBuilder(string[] args, Action<HostBuilderContext, IServiceCollection> BuildServices, Action<HostBuilderContext, ILoggingBuilder> BuildLogs) static IHostBuilder CreateHostBuilder(string[] args, Action<HostBuilderContext, IServiceCollection> buildServices, Action<HostBuilderContext, ILoggingBuilder> buildLogs)
=> Host.CreateDefaultBuilder(args) => Host.CreateDefaultBuilder(args)
.UseWindowsService() .UseWindowsService()
.UseSystemd() .UseSystemd()
.ConfigureServices((context, services) => BuildServices(context, services)) .ConfigureServices((context, services) => buildServices(context, services))
.ConfigureLogging((context, builder) => BuildLogs(context, builder)); .ConfigureLogging((context, builder) => buildLogs(context, builder));
} }
} }

2
Selector.CLI/Command/MigrateCommand.cs
View File

@ -33,7 +33,7 @@ namespace Selector.CLI
Console.WriteLine("Migrate database? (y/n) "); Console.WriteLine("Migrate database? (y/n) ");
var input = Console.ReadLine(); var input = Console.ReadLine();
if (input.Trim().Equals("y", StringComparison.OrdinalIgnoreCase)) if (input?.Trim().Equals("y", StringComparison.OrdinalIgnoreCase) ?? false)
{ {
logger.LogInformation("Migrating database"); logger.LogInformation("Migrating database");
db.Database.Migrate(); db.Database.Migrate();

1
Selector.CLI/Command/Scrobble/ScrobbleClear.cs
View File

@ -2,7 +2,6 @@
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Selector.CLI.Extensions; using Selector.CLI.Extensions;
using Selector.Model; using Selector.Model;
using Selector.Model.Extensions;
using System; using System;
using System.CommandLine; using System.CommandLine;
using System.CommandLine.Invocation; using System.CommandLine.Invocation;

10
Selector.CLI/Consumer/MappingPersister.cs
View File

@ -49,9 +49,9 @@ namespace Selector.CLI.Consumer
{ {
Logger.LogWarning("Failed to update database, likely a duplicate Spotify URI"); Logger.LogWarning("Failed to update database, likely a duplicate Spotify URI");
} }
catch (Exception e) catch (Exception ex)
{ {
Logger.LogError(e, "Error occured during callback"); Logger.LogError(ex, "Error occured during callback");
} }
}, CancelToken); }, CancelToken);
} }
@ -104,7 +104,7 @@ namespace Selector.CLI.Consumer
} }
else if (e.Current.Item is FullEpisode episode) else if (e.Current.Item is FullEpisode episode)
{ {
Logger.LogDebug("Ignoring podcast episdoe [{episode}]", episode.DisplayString()); Logger.LogDebug("Ignoring podcast episode [{episode}]", episode.DisplayString());
} }
else if (e.Current.Item is null) else if (e.Current.Item is null)
{ {
@ -118,7 +118,7 @@ namespace Selector.CLI.Consumer
public void Subscribe(IWatcher watch = null) public void Subscribe(IWatcher watch = null)
{ {
var watcher = watch ?? Watcher ?? throw new ArgumentNullException("No watcher provided"); var watcher = watch ?? Watcher ?? throw new ArgumentNullException(nameof(watch));
if (watcher is IPlayerWatcher watcherCast) if (watcher is IPlayerWatcher watcherCast)
{ {
@ -132,7 +132,7 @@ namespace Selector.CLI.Consumer
public void Unsubscribe(IWatcher watch = null) public void Unsubscribe(IWatcher watch = null)
{ {
var watcher = watch ?? Watcher ?? throw new ArgumentNullException("No watcher provided"); var watcher = watch ?? Watcher ?? throw new ArgumentNullException(nameof(watch));
if (watcher is IPlayerWatcher watcherCast) if (watcher is IPlayerWatcher watcherCast)
{ {

4
Selector.CLI/Extensions/ServiceExtensions.cs
View File

@ -8,10 +8,6 @@ using Selector.Extensions;
using Selector.Model; using Selector.Model;
using Selector.Model.Services; using Selector.Model.Services;
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Selector.CLI.Extensions namespace Selector.CLI.Extensions
{ {

9
Selector.CLI/Extensions/SpotifyExtensions.cs
View File

@ -1,5 +1,4 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -21,17 +20,17 @@ namespace Selector.CLI.Extensions
catch (APIUnauthorizedException e) catch (APIUnauthorizedException e)
{ {
logger?.LogDebug("Unauthorised error: [{message}] (should be refreshed and retried?)", e.Message); logger?.LogDebug("Unauthorised error: [{message}] (should be refreshed and retried?)", e.Message);
throw e; throw;
} }
catch (APITooManyRequestsException e) catch (APITooManyRequestsException e)
{ {
logger?.LogDebug("Too many requests error: [{message}]", e.Message); logger?.LogDebug("Too many requests error: [{message}]", e.Message);
throw e; throw;
} }
catch (APIException e) catch (APIException e)
{ {
logger?.LogDebug("API error: [{message}]", e.Message); logger?.LogDebug("API error: [{message}]", e.Message);
throw e; throw;
} }
} }
} }

2
Selector.CLI/ScrobbleMapper.cs
View File

@ -69,7 +69,7 @@ namespace Selector
var requests = tracksToPull.Select(a => new ScrobbleTrackMapping( var requests = tracksToPull.Select(a => new ScrobbleTrackMapping(
searchClient, searchClient,
loggerFactory.CreateLogger<ScrobbleTrackMapping>() ?? NullLogger<ScrobbleTrackMapping>.Instance, loggerFactory.CreateLogger<ScrobbleTrackMapping>(),
a.TrackName, a.ArtistName) a.TrackName, a.ArtistName)
).ToArray(); ).ToArray();

7
Selector/Scrobble/ScrobbleMatcher.cs
View File

@ -1,5 +1,4 @@
using IF.Lastfm.Core.Objects; using System;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Linq; using System.Linq;
@ -8,8 +7,8 @@ namespace Selector
{ {
public static class ListenMatcher public static class ListenMatcher
{ {
public static bool MatchTime(IListen nativeScrobble, LastTrack serviceScrobble) // public static bool MatchTime(IListen nativeScrobble, LastTrack serviceScrobble)
=> serviceScrobble.TimePlayed.Equals(nativeScrobble); // => serviceScrobble.TimePlayed.Equals(nativeScrobble);
public static bool MatchTime(IListen nativeScrobble, IListen serviceScrobble) public static bool MatchTime(IListen nativeScrobble, IListen serviceScrobble)
=> serviceScrobble.Timestamp.Equals(nativeScrobble.Timestamp); => serviceScrobble.Timestamp.Equals(nativeScrobble.Timestamp);