Merge pull request #1586 from mregni/develop

Fixing smaller issues before forum post
mregni · Jul 29, 2021 · 7dc94ac · 7dc94ac
2 parents 214b51f + 65f1dd7
commit 7dc94ac
Show file tree

Hide file tree

Showing 41 changed files with 42 additions and 105 deletions.
diff --git a/EmbyStat.Clients.Base/Http/BaseHttpClient.cs b/EmbyStat.Clients.Base/Http/BaseHttpClient.cs
@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
-using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using EmbyStat.Clients.Base.Converters;
 using EmbyStat.Common.Converters;
@@ -19,8 +16,6 @@
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Querying;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using RestSharp;
 
@@ -114,10 +109,12 @@ protected string ExecuteCall(IRestRequest request)
         protected async Task<IEnumerable<MediaServerUdpBroadcast>> SearchServer(string message)
         {
             var list = new List<MediaServerUdpBroadcast>();
-            Logger.Debug($"Checking following broadcast IPs (own IP: ");
-            foreach (var ip in GetBroadCastIps())
+            var ownIp = _accessor.HttpContext?.Connection.RemoteIpAddress ?? IPAddress.Any;
+            Logger.Debug($"Own IP detected: {ownIp.MapToIPv4()}");
+            Logger.Debug($"Sending \"{message}\" to following broadcast IPs:");
+            foreach (var ip in GetBroadCastIps(ownIp))
             {
-                Logger.Debug($"\t{ip}");
+                Logger.Debug($"\t{ip.MapToIPv4()}");
                 await Task.Run(async () =>
                 {
                     var to = new IPEndPoint(ip, 7359);
@@ -136,10 +133,9 @@ await Task.Run(async () =>
             return list;
         }
 
-        private IEnumerable<IPAddress> GetBroadCastIps()
+        private IEnumerable<IPAddress> GetBroadCastIps(IPAddress ip)
         {
-            var ip = _accessor.HttpContext?.Connection.RemoteIpAddress;
-            Logger.Debug($"{ip})");
+            Logger.Debug($"{ip.MapToIPv4()})");
             var interfaces = NetworkInterface.GetAllNetworkInterfaces();
             foreach (var adapter in interfaces)
             {
@@ -201,7 +197,7 @@ public bool Ping(string message)
                 Logger.Debug($"Ping returned: {result}");
                 return result == message;
             }
-            catch (Exception e)
+            catch (System.Exception e)
             {
                 Logger.Error(e, "Ping failed");
                 return false;

diff --git a/EmbyStat.Clients.Base/Http/ServerSearcher.cs b/EmbyStat.Clients.Base/Http/ServerSearcher.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections;
-using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;

diff --git a/EmbyStat.Clients.Emby/Http/EmbyHttpClient.cs b/EmbyStat.Clients.Emby/Http/EmbyHttpClient.cs
@@ -3,7 +3,6 @@
 using EmbyStat.Clients.Base.Http;
 using EmbyStat.Common.Models;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
 using RestSharp;
 
 namespace EmbyStat.Clients.Emby.Http

diff --git a/EmbyStat.Clients.Jellyfin/Http/JellyfinHttpClient.cs b/EmbyStat.Clients.Jellyfin/Http/JellyfinHttpClient.cs
@@ -3,7 +3,6 @@
 using EmbyStat.Clients.Base.Http;
 using EmbyStat.Common.Models;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
 using RestSharp;
 
 namespace EmbyStat.Clients.Jellyfin.Http

diff --git a/EmbyStat.Clients.Tmdb/Converter/EpisodeHelper.cs b/EmbyStat.Clients.Tmdb/Converter/EpisodeHelper.cs
@@ -1,6 +1,4 @@
-using System;
-using EmbyStat.Common.Models.Show;
-using Rollbar.DTOs;
+using EmbyStat.Common.Models.Show;
 using TMDbLib.Objects.Search;
 
 namespace EmbyStat.Clients.Tmdb.Converter

diff --git a/EmbyStat.Clients.Tmdb/ITmdbClient.cs b/EmbyStat.Clients.Tmdb/ITmdbClient.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using EmbyStat.Common.Models.Show;
 

diff --git a/EmbyStat.Clients.Tmdb/TmdbClient.cs b/EmbyStat.Clients.Tmdb/TmdbClient.cs
@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using EmbyStat.Clients.Tmdb.Converter;
-using EmbyStat.Common;
 using EmbyStat.Common.Models.Show;
 using TMDbLib.Client;
-using TMDbLib.Objects.TvShows;
 
 namespace EmbyStat.Clients.Tmdb
 {

diff --git a/EmbyStat.Common/Models/Entities/Show.cs b/EmbyStat.Common/Models/Entities/Show.cs
@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
-using EmbyStat.Common.Enums;
 using EmbyStat.Common.Models.Entities.Helpers;
 using LiteDB;
 

diff --git a/EmbyStat.Common/Models/Settings/UserSettings.cs b/EmbyStat.Common/Models/Settings/UserSettings.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using EmbyStat.Common.Enums;
 using Newtonsoft.Json;
-using Rollbar.DTOs;
 
 namespace EmbyStat.Common.Models.Settings
 {

diff --git a/EmbyStat.Common/Models/StartupOptions.cs b/EmbyStat.Common/Models/StartupOptions.cs
@@ -19,7 +19,7 @@ public class StartupOptions
         [Option('c', "config-dir", Required = false, Default = "", HelpText = "Folder where config files are stored, default is <current-directory>")]
         public string ConfigDir { get; set; }
 
-        [Option('l', "log-level", Required = false, Default = 2, HelpText = "Set the proper log level\n1: Debug\n2: Information")]
+        [Option('g', "log-level", Required = false, Default = 2, HelpText = "Set the proper log level\n1: Debug\n2: Information")]
         public int LogLevel { get; set; }
 
         [Option('u', "listen-urls", Required = false, Default = "http://*", HelpText = "Set the url's where EmbyStat needs to listen on. Default is http://* but you can change it to only loopback address here if needed. Don't add port number, it will be added automatically. Use ; if you want to define more then one url.")]

diff --git a/EmbyStat.Controllers/Account/AccountController.cs b/EmbyStat.Controllers/Account/AccountController.cs
@@ -2,9 +2,7 @@
 using System.Threading.Tasks;
 using EmbyStat.Common.Models.Account;
 using EmbyStat.Logging;
-using EmbyStat.Services;
 using EmbyStat.Services.Interfaces;
-using MediaBrowser.Model.Logging;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 

diff --git a/EmbyStat.Controllers/Log/LogController.cs b/EmbyStat.Controllers/Log/LogController.cs
@@ -2,7 +2,6 @@
 using AutoMapper;
 using EmbyStat.Services.Interfaces;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Net.Http.Headers;
 
 namespace EmbyStat.Controllers.Log
 {

diff --git a/EmbyStat.Controllers/Settings/SettingsController.cs b/EmbyStat.Controllers/Settings/SettingsController.cs
@@ -7,7 +7,6 @@
 using EmbyStat.Repositories.Interfaces;
 using EmbyStat.Services.Interfaces;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
 
 namespace EmbyStat.Controllers.Settings
 {

diff --git a/EmbyStat.Controllers/Show/ShowController.cs b/EmbyStat.Controllers/Show/ShowController.cs
@@ -3,7 +3,6 @@
 using EmbyStat.Common.Helpers;
 using EmbyStat.Common.Models.Query;
 using EmbyStat.Controllers.HelperClasses;
-using EmbyStat.Controllers.Movie;
 using EmbyStat.Services.Interfaces;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;

diff --git a/EmbyStat.Controllers/Show/ShowDetailViewModel.cs b/EmbyStat.Controllers/Show/ShowDetailViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace EmbyStat.Controllers.Show
 {

diff --git a/EmbyStat.Controllers/Show/ShowRowViewModel.cs b/EmbyStat.Controllers/Show/ShowRowViewModel.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace EmbyStat.Controllers.Show
+namespace EmbyStat.Controllers.Show
 {
     public class ShowRowViewModel
     {

diff --git a/EmbyStat.Jobs/Jobs/Interfaces/IMovieSyncJob.cs b/EmbyStat.Jobs/Jobs/Interfaces/IMovieSyncJob.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace EmbyStat.Jobs.Jobs.Interfaces
+namespace EmbyStat.Jobs.Jobs.Interfaces
 {
     public interface IMovieSyncJob : IBaseJob
     {

diff --git a/EmbyStat.Jobs/Jobs/Sync/MovieSyncJob.cs b/EmbyStat.Jobs/Jobs/Sync/MovieSyncJob.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using EmbyStat.Clients.Base;

diff --git a/EmbyStat.Repositories/Helpers/MediaRepository.cs b/EmbyStat.Repositories/Helpers/MediaRepository.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.Encodings.Web;
 using System.Web;
 using EmbyStat.Common.Enums;
 using EmbyStat.Common.Models;

diff --git a/EmbyStat.Repositories/Interfaces/IMovieRepository.cs b/EmbyStat.Repositories/Interfaces/IMovieRepository.cs
@@ -1,6 +1,5 @@
 using EmbyStat.Common.Models.Entities;
 using System.Collections.Generic;
-using EmbyStat.Common.Enums;
 using EmbyStat.Repositories.Interfaces.Helpers;
 using EmbyStat.Common.Models;
 using EmbyStat.Common.Models.Query;

diff --git a/EmbyStat.Repositories/MovieRepository.cs b/EmbyStat.Repositories/MovieRepository.cs
@@ -2,17 +2,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using EmbyStat.Common.Enums;
 using EmbyStat.Common.Extensions;
 using EmbyStat.Common.Models;
 using EmbyStat.Common.Models.Entities;
-using EmbyStat.Common.Models.Entities.Helpers;
 using EmbyStat.Common.Models.Query;
 using EmbyStat.Repositories.Helpers;
 using EmbyStat.Repositories.Interfaces;
 using MoreLinq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace EmbyStat.Repositories
 {

diff --git a/EmbyStat.Repositories/ShowRepository.cs b/EmbyStat.Repositories/ShowRepository.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AutoMapper;
 using EmbyStat.Common.Enums;
 using EmbyStat.Common.Extensions;
 using EmbyStat.Common.Models.Entities;
@@ -122,7 +121,7 @@ public IEnumerable<Show> GetShowPage(int skip, int take, string sort, Filter[] f
                         ? query.OrderByDescending(x => typeof(Show).GetProperty(selector)?.GetValue(x, null))
                         : query.OrderBy(x => typeof(Show).GetProperty(selector)?.GetValue(x, null));
                 }
-
+                 
                 return query
                     .Skip(skip)
                     .Take(take);

diff --git a/EmbyStat.Services/Abstract/MediaService.cs b/EmbyStat.Services/Abstract/MediaService.cs
@@ -2,16 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using EmbyStat.Common;
-using EmbyStat.Common.Enums;
 using EmbyStat.Common.Extensions;
 using EmbyStat.Common.Models.Entities;
 using EmbyStat.Common.Models.Entities.Helpers;
 using EmbyStat.Repositories.Interfaces;
-using EmbyStat.Services.Converters;
 using EmbyStat.Services.Interfaces;
-using EmbyStat.Services.Models.Cards;
 using EmbyStat.Services.Models.Charts;
-using EmbyStat.Services.Models.Stat;
 using Newtonsoft.Json;
 
 namespace EmbyStat.Services.Abstract

diff --git a/EmbyStat.Services/Interfaces/IShowService.cs b/EmbyStat.Services/Interfaces/IShowService.cs
@@ -4,7 +4,6 @@
 using EmbyStat.Common.Models.Query;
 using EmbyStat.Services.Models.DataGrid;
 using EmbyStat.Services.Models.Show;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace EmbyStat.Services.Interfaces
 {

diff --git a/EmbyStat.Services/Models/DataGrid/ShowRow.cs b/EmbyStat.Services/Models/DataGrid/ShowRow.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace EmbyStat.Services.Models.DataGrid
+namespace EmbyStat.Services.Models.DataGrid
 {
     public class ShowRow
     {

diff --git a/EmbyStat.Web/ClientApp/.eslintcache b/EmbyStat.Web/ClientApp/.eslintcache
diff --git a/EmbyStat.Web/ClientApp/src/pages/wizard/Steps/MediaServerDetails.tsx b/EmbyStat.Web/ClientApp/src/pages/wizard/Steps/MediaServerDetails.tsx
@@ -75,12 +75,11 @@ export const MediaServerDetails = forwardRef<ValidationHandleWithSave, StepProps
 
   const openMediaServer = async () => {
     try {
-      const { type, protocol, address, port, baseUrl, baseUrlNeeded } = getValues();
-      const htmlPage = type === 0 ? "apikeys" : "apikeys.html";
+      const { protocol, address, port, baseUrl, baseUrlNeeded } = getValues();
       const protocolTxt = protocol === 0 ? "https://" : "http://";
       const baseUrlTxt = baseUrlNeeded ? baseUrl : '';
       window.open(
-        `${protocolTxt}${address}:${port}${baseUrlTxt}/web/index.html#!/${htmlPage}`,
+        `${protocolTxt}${address}:${port}${baseUrlTxt}/web/index.html#!/apikeys.html`,
         "_blank"
       );
     }

diff --git a/EmbyStat.Web/ClientApp/src/pages/wizard/Wizard.tsx b/EmbyStat.Web/ClientApp/src/pages/wizard/Wizard.tsx
@@ -192,7 +192,7 @@ const Wizard = () => {
                         <EsButton
                           onClick={handleBack}
                           fullWidth={false}
-                          disabled={disableControls || [0, 4, 7].includes(activeStep)}
+                          disabled={disableControls || [0, 7].includes(activeStep)}
                         >
                           <KeyboardArrowLeft />
                           {t('back')}

diff --git a/EmbyStat.Web/ClientApp/src/shared/components/mediaServerHeader/index.tsx b/EmbyStat.Web/ClientApp/src/shared/components/mediaServerHeader/index.tsx
@@ -89,7 +89,7 @@ const MediaServerHeader = (props: Props) => {
                 container
                 direction="column"
                 justify="flex-start"
-                className="m-l-32"
+                className="m-l-32 m-r-8"
               >
                 <Typography
                   variant="body1"

diff --git a/EmbyStat.Web/Program.cs b/EmbyStat.Web/Program.cs
@@ -26,22 +26,34 @@ public static int Main(string[] args)
         {
             try
             {
-                StartupOptions options = null;
-                Parser.Default.ParseArguments<StartupOptions>(args).MapResult(opts => options = opts, NotParedOptions);
-
-                if (options == null)
+                var parseResult = Parser.Default.ParseArguments<StartupOptions>(args)
+                    .WithParsed(startupOptions =>
+                    {
+                        if (startupOptions.LogLevel == 1)
+                        {
+                            Console.WriteLine("------------------------------");
+                            Console.WriteLine("!Application is in Debug mode!");
+                            Console.WriteLine("------------------------------");
+                        }
+                    })
+                    ;
+
+                if (parseResult.Tag == ParserResultType.NotParsed)
                 {
                     return 0;
                 }
 
+                StartupOptions options = null;
+                parseResult.MapResult(opt => options = opt, NotParedOptions);
+
                 options = CheckEnvironmentVariables(options);
-                
+
                 var configArgs = CreateArgsArray(options);
                 _logger = SetupLogging(configArgs);
                 LogLevelChanger.SetNlogLogLevel(NLog.LogLevel.FromOrdinal(options.LogLevel));
 
                 LogStartupParameters(configArgs, options.LogLevel, options.Service);
-                
+
                 var listeningUrl = string.Join(';', options.ListeningUrls.Split(';').Select(x => $"{x}:{options.Port}"));
                 var config = BuildConfigurationRoot(configArgs);
                 var host = BuildWebHost(args, listeningUrl, config);

diff --git a/EmbyStat.Web/Startup.cs b/EmbyStat.Web/Startup.cs
@@ -15,7 +15,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using AspNetCore.Identity.LiteDB;
-using AutoMapper;
 using EmbyStat.Clients.Base;
 using EmbyStat.Common;
 using EmbyStat.Common.Enums;

diff --git a/Tests.Unit/Builders/LibraryBuilder.cs b/Tests.Unit/Builders/LibraryBuilder.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using EmbyStat.Common.Enums;
+using EmbyStat.Common.Enums;
 using EmbyStat.Common.Models.Entities;
 
 namespace Tests.Unit.Builders

diff --git a/Tests.Unit/Builders/SubtitleStreamBuilder.cs b/Tests.Unit/Builders/SubtitleStreamBuilder.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using EmbyStat.Common.Models.Entities.Helpers;
 
 namespace Tests.Unit.Builders