Merge pull request #222 from pticostaricags/development

merge "development" into "main"

Author: efonsecab

src/FairPlayCombinedSln/FairPlayCombined.Interfaces/FairPlayTube/IVideoInfoService.cs

@@ -30,5 +30,8 @@ Task<PaginationOfT<VideoInfoModel>> GetPaginatedCompletedVideoInfoAsync(
         Task<VideoInfoModel?> GetVideoInfoByVideoIdAsync(string videoId,
             CancellationToken cancellationToken);
         Task DeleteMyVideoAsync(long videoInfoId, CancellationToken cancellationToken);
+        Task<PaginationOfT<VideoInfoModel>> GetSmallPaginatedCompletedVideoInfoAsync(
+            PaginationRequest paginationRequest, string? searchTerm,
+            CancellationToken cancellationToken);
     }
 }

src/FairPlayCombinedSln/FairPlayCombined.Services/FairPlayTube/VideoInfoService.cs

@@ -187,6 +187,52 @@ public async Task<PaginationOfT<VideoInfoModel>> GetPaginatedCompletedVideoInfob
             return result;
         }
 
+        public async Task<PaginationOfT<VideoInfoModel>> GetSmallPaginatedCompletedVideoInfoAsync(
+            PaginationRequest paginationRequest, string? searchTerm,
+            CancellationToken cancellationToken
+    )
+        {
+            PaginationOfT<VideoInfoModel> result = new();
+            var dbContext = await dbContextFactory.CreateDbContextAsync(cancellationToken);
+            string orderByString = string.Empty;
+            if (paginationRequest.SortingItems?.Length > 0)
+                orderByString =
+                    String.Join(",",
+                    paginationRequest.SortingItems.Select(p => $"{p.PropertyName} {GetSortTypeString(p.SortType)}"));
+            var preQuery = dbContext.VideoInfo
+                .AsNoTracking()
+                .AsSplitQuery();
+            if (!String.IsNullOrWhiteSpace(searchTerm))
+            {
+                preQuery =
+                    preQuery.Where(p => EF.Functions.FreeText(p.Description, searchTerm!));
+            }
+            var query = preQuery
+                .Where(p =>
+                p.VideoIndexStatusId == (short)FairPlayCombined.Common.FairPlayTube.Enums.VideoIndexStatus.Processed)
+                .Select(p => new VideoInfoModel
+                {
+                    VideoInfoId = p.VideoInfoId,
+                    VideoId = p.VideoId,
+                    Name = p.Name,
+                    Description = p.Description,
+                    LifetimeViewers = p.VideoWatchTime.Select(p => p.WatchedByApplicationUserId).Distinct().Count(),
+                    LifetimeSessions = p.VideoWatchTime.Count,
+                    LifetimeWatchTime = TimeSpan.FromSeconds(p.VideoWatchTime.Sum(p => p.WatchTime)),
+                    PublishedOnString = (DateTimeOffset.UtcNow.Subtract(p.RowCreationDateTime).TotalDays < 1 ? "Today" : $"{DateTimeOffset.UtcNow.Subtract(p.RowCreationDateTime).Days} {localizer![DaysAgoTextKey]}")
+                });
+            if (!String.IsNullOrEmpty(orderByString))
+                query = query.OrderBy(orderByString);
+            result.TotalItems = await query.CountAsync(cancellationToken);
+            result.PageSize = paginationRequest.PageSize;
+            result.TotalPages = (int)Math.Ceiling((decimal)result.TotalItems / result.PageSize);
+            result.Items = await query
+            .Skip(paginationRequest.StartIndex)
+            .Take(paginationRequest.PageSize)
+            .ToArrayAsync(cancellationToken);
+            return result;
+        }
+
         public async Task<PaginationOfT<VideoInfoModel>> GetPaginatedCompletedVideoInfoAsync(
             PaginationRequest paginationRequest, string? searchTerm,
             CancellationToken cancellationToken

src/FairPlayCombinedSln/FairPlayTube.ClientServices/CustomLocalization/ApiLocalizer.cs

@@ -3,6 +3,8 @@
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
+using System.Diagnostics;
+using System.Globalization;
 
 namespace FairPlayTube.ClientServices.CustomLocalization
 {
@@ -11,6 +13,7 @@ public class ApiLocalizer(
         KiotaClient.ApiClient anonymousClient,
         IMemoryCache memoryCache) : IStringLocalizer
     {
+        private readonly Lock _lock = new();
         public LocalizedString this[string name]
         {
             get
@@ -32,13 +35,14 @@ public LocalizedString this[string name]
 
         public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
         {
-            var response = memoryCache.GetOrCreate(
-                $"{nameof(ApiLocalizer)}.{GetAllStrings}", (entry) =>
+            string cacheKey = $"{nameof(GetAllStrings)} -{CultureInfo.CurrentCulture.Name}";
+            var response = memoryCache.GetOrCreateAsync(
+                cacheKey, (entry) =>
                 {
                     entry.SlidingExpiration = Constants.CacheConfiguration.LocalizationCacheDuration;
                     var response = anonymousClient.Localization.GetAllResources.GetAsync().Result;
-                    return response!;
-                });
+                    return Task.FromResult(response);
+                }).Result;
             var result = response!.Select(p =>
             new LocalizedString(p.Key!, p.Value!))
                 .ToArray();
@@ -47,8 +51,25 @@ public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
 
         private string GetString(string name)
         {
-            var allStrings = GetAllStrings(false);
-            return allStrings.SingleOrDefault(p => p.Name == name)?.Name ?? name;
+            try
+            {
+                using (this._lock.EnterScope())
+                {
+                    var cacheKey = $"{name}-{CultureInfo.CurrentCulture.Name}";
+                    var result = memoryCache.GetOrCreate(cacheKey, cacheEntry =>
+                    {
+                        cacheEntry.SlidingExpiration = Constants.CacheConfiguration.LocalizationCacheDuration;
+                        var data = this.GetAllStrings().SingleOrDefault(p => p.Name == name)?.Name;
+                        return data ?? name;
+                    });
+                    return result!;
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine(ex);
+                return name;
+            }
         }
     }
 }

src/FairPlayCombinedSln/FairPlayTube.ClientServices/CustomLocalization/ApiLocalizerOfT.cs

@@ -3,6 +3,8 @@
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
+using System.Diagnostics;
+using System.Globalization;
 using System.Reflection;
 
 namespace FairPlayTube.ClientServices.CustomLocalization
@@ -13,6 +15,7 @@ public class ApiLocalizer<T>(
         IMemoryCache memoryCache
         ) : IStringLocalizer<T>
     {
+        private readonly Lock _lock=new();
         public LocalizedString this[string name]
         {
             get
@@ -34,22 +37,44 @@ public LocalizedString this[string name]
 
         public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
         {
-            var response = memoryCache.GetOrCreate(
-                $"{nameof(ApiLocalizer<T>)}.{GetAllStrings}", (entry) =>
+            var typeFullName = typeof(T).FullName;
+            var cacheKey = $"{typeFullName}-{nameof(GetAllStrings)}-{CultureInfo.CurrentCulture.Name}";
+            var response = memoryCache.GetOrCreateAsync(
+                cacheKey, (entry) =>
                 {
                     entry.SlidingExpiration = Constants.CacheConfiguration.LocalizationCacheDuration;
                     var response = anonymousClient.Localization.GetAllResources.GetAsync().Result;
-                    return response!;
-                });
-            var result = response!.Select(p =>
+                    return Task.FromResult(response);
+                }).Result;
+            var typeName = typeof(T).FullName;
+            var result = response!.Where(p=>p.Type == typeName).Select(p =>
             new LocalizedString(p.Key!, p.Value!))
                 .ToArray();
             return result;
         }
 
         private string GetString(string name)
         {
-            return name;
+            try
+            {
+                using (this._lock.EnterScope())
+                {
+                    var typeFullName = typeof(T).FullName;
+                    var cacheKey = $"{typeFullName}-{nameof(GetString)}-{name}-{CultureInfo.CurrentCulture.Name}";
+                    var result = memoryCache!.GetOrCreate(cacheKey, (cacheEntry) =>
+                    {
+                        cacheEntry.SlidingExpiration = Constants.CacheConfiguration.LocalizationCacheDuration;
+                        var data = this.GetAllStrings().FirstOrDefault(p => p.Name == name)?.Value;
+                        return data ?? name;
+                    });
+                    return result!;
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine(ex);
+                return name;
+            }
         }
     }
 }

src/FairPlayCombinedSln/FairPlayTube.ClientServices/CustomLocalization/LocalizationMessageHandler.cs

@@ -17,12 +17,12 @@ protected override HttpResponseMessage Send(HttpRequestMessage request, Cancella
             return base.Send(request, cancellationToken);
         }
 
-        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
             var currentCulture = System.Globalization.CultureInfo.CurrentUICulture;
             request.Headers.AcceptLanguage.Clear();
             request.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(currentCulture.Name));
-            return await base.SendAsync(request, cancellationToken);
+            return base.SendAsync(request, cancellationToken);
         }
     }
 }

src/FairPlayCombinedSln/FairPlayTube.ClientServices/FairPlayTube.ClientServices.csproj

@@ -16,13 +16,13 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.13.1" />
-	<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.14.0" />
-	<PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.14.0" />
-	<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.14.0" />
-	<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.14.0" />
-	<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.14.0" />
-	<PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.14.0" />
-	<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.14.0" />
+	<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.15.0" />
+	<PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.15.0" />
+	<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.15.0" />
+	<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.15.0" />
+	<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.15.0" />
+	<PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.15.0" />
+	<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.15.0" />
   </ItemGroup>
 
   <ItemGroup>

src/FairPlayCombinedSln/FairPlayTube.MAUI/FairPlayTube.MAUI.csproj

@@ -55,9 +55,9 @@
     <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
-	<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.10.3" />
+	<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.10.4" />
 	<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
-	<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.10.3" />
+	<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.10.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FairPlayTube.ClientServices\FairPlayTube.ClientServices.csproj" />

src/FairPlayCombinedSln/FairPlayTube.MAUI/MauiProgram.cs

@@ -47,25 +47,36 @@ public static MauiApp CreateMauiApp()
             builder.Services.AddOptions();
             builder.Services.TryAddScoped<AuthenticationStateProvider, CustomAuthenticationStateProvider>();
             builder.Services.AddAuthorizationCore();
+            builder.Services.AddHttpClient("DefaultHttpClient", client =>
+            {
+                client.BaseAddress = new Uri(apiBaseUrl);
+            }).AddHttpMessageHandler<LocalizationMessageHandler>(); ;
+            builder.Services.AddScoped(sp => sp.GetRequiredService<IHttpClientFactory>().CreateClient("DefaultHttpClient"));
             builder.Services.AddScoped<LocalizationMessageHandler>();
             builder.Services.AddSingleton<IAccessTokenProvider, CustomAccessTokenAuthenticationProvider>();
             builder.Services.AddKeyedSingleton<ApiClient>("AnonymousApiClient",
                 (sp, key) =>
                 {
+                    var httpClientFactory = sp.GetRequiredService<IHttpClientFactory>();
+                    var httpClient = httpClientFactory.CreateClient("DefaultHttpClient");
                     AnonymousAuthenticationProvider anonymousAuthenticationProvider = new();
-                    HttpClientRequestAdapter httpClientRequestAdapter = new(anonymousAuthenticationProvider);
+                    HttpClientRequestAdapter httpClientRequestAdapter = new(anonymousAuthenticationProvider,
+                        httpClient: httpClient);
                     httpClientRequestAdapter.BaseUrl = apiBaseUrl;
                     ApiClient apiClient = new(httpClientRequestAdapter);
                     return apiClient;
                 });
             builder.Services.AddKeyedSingleton<ApiClient>("AuthenticatedApiClient",
                 (sp, key) =>
                 {
+                    var httpClientFactory = sp.GetRequiredService<IHttpClientFactory>();
+                    var httpClient = httpClientFactory.CreateClient("DefaultHttpClient");
                     var accesstokenProvider = sp.GetRequiredService<IAccessTokenProvider>();
                     BaseBearerTokenAuthenticationProvider baseBearerTokenAuthenticationProvider =
                     new(accesstokenProvider);
                     HttpClientRequestAdapter httpClientRequestAdapter = 
-                    new(baseBearerTokenAuthenticationProvider);
+                    new(baseBearerTokenAuthenticationProvider, 
+                    httpClient: httpClient);
                     httpClientRequestAdapter.BaseUrl = apiBaseUrl;
                     ApiClient apiClient = new(httpClientRequestAdapter);
                     return apiClient;