diff --git a/ErsatzTV.Application/MediaItems/Queries/SearchAllMediaItems.cs b/ErsatzTV.Application/MediaItems/Queries/SearchAllMediaItems.cs deleted file mode 100644 index f4227717b..000000000 --- a/ErsatzTV.Application/MediaItems/Queries/SearchAllMediaItems.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Collections.Generic; -using MediatR; - -namespace ErsatzTV.Application.MediaItems.Queries -{ - public record SearchAllMediaItems(string SearchString) : IRequest>; -} diff --git a/ErsatzTV.Application/MediaItems/Queries/SearchAllMediaItemsHandler.cs b/ErsatzTV.Application/MediaItems/Queries/SearchAllMediaItemsHandler.cs deleted file mode 100644 index 52005df98..000000000 --- a/ErsatzTV.Application/MediaItems/Queries/SearchAllMediaItemsHandler.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using ErsatzTV.Core.Interfaces.Repositories; -using LanguageExt; -using MediatR; -using static ErsatzTV.Application.MediaItems.Mapper; - -namespace ErsatzTV.Application.MediaItems.Queries -{ - public class SearchAllMediaItemsHandler : IRequestHandler> - { - private readonly IMediaItemRepository _mediaItemRepository; - - public SearchAllMediaItemsHandler(IMediaItemRepository mediaItemRepository) => - _mediaItemRepository = mediaItemRepository; - - public Task> - Handle(SearchAllMediaItems request, CancellationToken cancellationToken) => - _mediaItemRepository.Search(request.SearchString).Map(list => list.Map(ProjectToSearchViewModel).ToList()); - } -} diff --git a/ErsatzTV.Core/Interfaces/Repositories/IMediaItemRepository.cs b/ErsatzTV.Core/Interfaces/Repositories/IMediaItemRepository.cs index 443452719..2d340bfd2 100644 --- a/ErsatzTV.Core/Interfaces/Repositories/IMediaItemRepository.cs +++ b/ErsatzTV.Core/Interfaces/Repositories/IMediaItemRepository.cs @@ -9,7 +9,6 @@ namespace ErsatzTV.Core.Interfaces.Repositories { Task> Get(int id); Task> GetAll(); - Task> Search(string searchString); Task Update(MediaItem mediaItem); } } diff --git a/ErsatzTV.Core/Metadata/LocalFolderScanner.cs b/ErsatzTV.Core/Metadata/LocalFolderScanner.cs index 216344b71..95429c0df 100644 --- a/ErsatzTV.Core/Metadata/LocalFolderScanner.cs +++ b/ErsatzTV.Core/Metadata/LocalFolderScanner.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Security.Cryptography; using System.Threading.Tasks; using ErsatzTV.Core.Domain; using ErsatzTV.Core.Interfaces.Images; @@ -15,8 +14,6 @@ namespace ErsatzTV.Core.Metadata { public abstract class LocalFolderScanner { - private static readonly SHA1CryptoServiceProvider Crypto; - public static readonly List VideoFileExtensions = new() { ".mpg", ".mp2", ".mpeg", ".mpe", ".mpv", ".ogg", ".mp4", @@ -50,8 +47,6 @@ namespace ErsatzTV.Core.Metadata private readonly ILogger _logger; private readonly IMetadataRepository _metadataRepository; - static LocalFolderScanner() => Crypto = new SHA1CryptoServiceProvider(); - protected LocalFolderScanner( ILocalFileSystem localFileSystem, ILocalStatisticsProvider localStatisticsProvider, diff --git a/ErsatzTV.Infrastructure/Data/Repositories/MediaItemRepository.cs b/ErsatzTV.Infrastructure/Data/Repositories/MediaItemRepository.cs index b76acc0bc..003c7218a 100644 --- a/ErsatzTV.Infrastructure/Data/Repositories/MediaItemRepository.cs +++ b/ErsatzTV.Infrastructure/Data/Repositories/MediaItemRepository.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Data; using System.Linq; using System.Threading.Tasks; using ErsatzTV.Core.Domain; @@ -12,14 +11,10 @@ namespace ErsatzTV.Infrastructure.Data.Repositories { public class MediaItemRepository : IMediaItemRepository { - private readonly IDbConnection _dbConnection; private readonly IDbContextFactory _dbContextFactory; - public MediaItemRepository(IDbContextFactory dbContextFactory, IDbConnection dbConnection) - { + public MediaItemRepository(IDbContextFactory dbContextFactory) => _dbContextFactory = dbContextFactory; - _dbConnection = dbConnection; - } public async Task> Get(int id) { @@ -37,27 +32,6 @@ namespace ErsatzTV.Infrastructure.Data.Repositories return await context.MediaItems.ToListAsync(); } - public Task> Search(string searchString) => - // TODO: fix this when we need to search - // IQueryable episodeData = - // from c in _dbContext.TelevisionEpisodeMediaItems.Include(c => c.LibraryPath) select c; - // - // if (!string.IsNullOrEmpty(searchString)) - // { - // episodeData = episodeData.Where(c => EF.Functions.Like(c.Metadata.Title, $"%{searchString}%")); - // } - // - // IQueryable movieData = - // from c in _dbContext.Movies.Include(c => c.LibraryPath) select c; - // - // // if (!string.IsNullOrEmpty(searchString)) - // // { - // // movieData = movieData.Where(c => EF.Functions.Like(c.Metadata.Title, $"%{searchString}%")); - // // } - // - // return episodeData.OfType().Concat(movieData.OfType()).ToListAsync(); - new List().AsTask(); - public async Task Update(MediaItem mediaItem) { await using TvContext context = _dbContextFactory.CreateDbContext(); diff --git a/ErsatzTV.Infrastructure/HttpLoggingHandler.cs b/ErsatzTV.Infrastructure/HttpLoggingHandler.cs deleted file mode 100644 index 5b0307faa..000000000 --- a/ErsatzTV.Infrastructure/HttpLoggingHandler.cs +++ /dev/null @@ -1,115 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Net.Http; -using System.Net.Http.Headers; -using System.Threading; -using System.Threading.Tasks; - -namespace ErsatzTV -{ - namespace wms_xamarin - { - public class HttpLoggingHandler : DelegatingHandler - { - private readonly string[] types = { "html", "text", "xml", "json", "txt", "x-www-form-urlencoded" }; - - public HttpLoggingHandler(HttpMessageHandler innerHandler = null) : base( - innerHandler ?? new HttpClientHandler()) - { - } - - protected override async Task SendAsync( - HttpRequestMessage request, - CancellationToken cancellationToken) - { - await Task.Delay(1, cancellationToken).ConfigureAwait(false); - DateTime start = DateTime.Now; - HttpRequestMessage req = request; - var msg = $"[{req.RequestUri.PathAndQuery} - Request]"; - - Debug.WriteLine($"{msg}========Request Start=========="); - Debug.WriteLine( - $"{msg} {req.Method} {req.RequestUri.PathAndQuery} {req.RequestUri.Scheme}/{req.Version}"); - Debug.WriteLine($"{msg} Host: {req.RequestUri.Scheme}://{req.RequestUri.Host}"); - - foreach (KeyValuePair> header in req.Headers) - { - Debug.WriteLine($"{msg} {header.Key}: {string.Join(", ", header.Value)}"); - } - - if (req.Content != null) - { - foreach (KeyValuePair> header in req.Content.Headers) - { - Debug.WriteLine($"{msg} {header.Key}: {string.Join(", ", header.Value)}"); - } - - Debug.WriteLine($"{msg} Content:"); - - if (req.Content is StringContent || IsTextBasedContentType(req.Headers) || - IsTextBasedContentType(req.Content.Headers)) - { - string result = await req.Content.ReadAsStringAsync(); - - Debug.WriteLine($"{msg} {string.Join("", result.Take(256))}..."); - } - } - - HttpResponseMessage response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false); - - Debug.WriteLine($"{msg}==========Request End=========="); - - msg = $"[{req.RequestUri.PathAndQuery} - Response]"; - - Debug.WriteLine($"{msg}=========Response Start========="); - - HttpResponseMessage resp = response; - - Debug.WriteLine( - $"{msg} {req.RequestUri.Scheme.ToUpper()}/{resp.Version} {(int) resp.StatusCode} {resp.ReasonPhrase}"); - - foreach (KeyValuePair> header in resp.Headers) - { - Debug.WriteLine($"{msg} {header.Key}: {string.Join(", ", header.Value)}"); - } - - if (resp.Content != null) - { - foreach (KeyValuePair> header in resp.Content.Headers) - { - Debug.WriteLine($"{msg} {header.Key}: {string.Join(", ", header.Value)}"); - } - - Debug.WriteLine($"{msg} Content:"); - - if (resp.Content is StringContent || IsTextBasedContentType(resp.Headers) || - IsTextBasedContentType(resp.Content.Headers)) - { - string result = await resp.Content.ReadAsStringAsync(); - - Debug.WriteLine($"{msg} {string.Join("", result.Take(256))}..."); - } - } - - Debug.WriteLine($"{msg} Duration: {DateTime.Now - start}"); - Debug.WriteLine($"{msg}==========Response End=========="); - return response; - } - - private bool IsTextBasedContentType(HttpHeaders headers) - { - IEnumerable values; - if (!headers.TryGetValues("Content-Type", out values)) - { - return false; - } - - string header = string.Join(" ", values).ToLowerInvariant(); - - return types.Any(t => header.Contains(t)); - } - } - } -}