On This Day...

Author: Webreaper

Damselfly.Core.DbModels/Interfaces/ISearchService.cs

@@ -21,6 +21,7 @@ public interface ISearchService
     int? SimilarToId { get; set; }
     int? LensId { get; set; }
     IEnumerable<int>? Months { get; set; }
+    DateTime? OnThisDay { get; set; }
     int? MinRating { get; set; }
     int? MaxSizeKB { get; set; }
     int? MinSizeKB { get; set; }

Damselfly.Core.DbModels/Models/Entities/SearchQuery.cs

@@ -21,6 +21,7 @@ public class SearchQuery
     public int? CameraId { get; set; } = null;
     public int? LensId { get; set; } = null;
     public IEnumerable<int>? Months { get; set; } = null;
+    public DateTime? OnThisDay { get; set; } = null;
     public int? MinRating { get; set; } = null;
     public int? SimilarToId { get; set; } = null;
     public Folder? Folder { get; set; } = null;
@@ -85,6 +86,7 @@ public class SearchQueryDTO
     public int? CameraId { get; set; } = null;
     public int? LensId { get; set; } = null;
     public IEnumerable<int>? Months { get; set; } = null;
+    public DateTime? OnThisDay { get; set; } = null;
     public int? MinRating { get; set; } = null;
     public int? SimilarToId { get; set; }
     public int? FolderId { get; set; }

Damselfly.Core.ImageProcessing/SkiaSharpProcessor.cs

@@ -91,7 +91,7 @@ public Task<IImageProcessResult> CreateThumbs(FileInfo source, IDictionary<FileI
                     Logging.Log(
                         $"{pair.Value.size} thumb created for {source.Name} [load: {load.ElapsedTime}ms, scale: {scale.ElapsedTime}ms, save: {save.ElapsedTime}ms]");
             }
-
+            
             thumbs.Stop();
         }
         catch ( Exception ex )

Damselfly.Core.ScopedServices/BaseSearchService.cs

@@ -206,6 +206,21 @@ public IEnumerable<int>? Months
         }
     }
 
+    public DateTime? OnThisDay
+    {
+        get => Query.OnThisDay;
+        set
+        {
+            if ( (value == null && Query.OnThisDay != null) ||
+                 (value != null && Query.OnThisDay == null) ||
+                 (value != null && Query.OnThisDay != null && Query.OnThisDay != value ) )
+            {
+                Query.OnThisDay = value;
+                QueryChanged();
+            }
+        }
+    }
+
     public int? MinRating
     {
         get => Query.MinRating;
@@ -405,6 +420,11 @@ public IEnumerable<ISearchHint> SearchHints
                 hints.Add( new SearchHint { Description = $"During: {monthText}", Clear = () => Months = null } );
             }
 
+            if( OnThisDay != null )
+            {
+                hints.Add( new SearchHint { Description = $"On This Day: {OnThisDay.Value:dd-MMM}", Clear = () => OnThisDay = null } );
+            }
+
             if ( CameraId > 0 )
             {
                 var cam = _service.Cameras.FirstOrDefault(x => x.CameraId == CameraId);
@@ -472,6 +492,12 @@ public virtual void Refresh()
         QueryChanged();
     }
 
+    public void SetOnThisDay(DateTime? date)
+    {
+        Query.OnThisDay = date;
+        QueryChanged();
+    }
+
     public void SetDateRange(DateTime? min, DateTime? max)
     {
         if ( Query.MinDate != min || Query.MaxDate != max )

Damselfly.Core.ScopedServices/Client Services/ClientSearchService.cs

@@ -73,7 +73,7 @@ protected override async Task<SearchResponse> GetQueryImagesAsync( int count = D
 
         return response;
     }
-
+    
     public void Refresh()
     {
         base.Refresh();

Damselfly.Core/ScopedServices/CachedDataService.cs

@@ -69,7 +69,7 @@ public async Task<NewVersionResponse> CheckForNewVersion()
                     newVersionState.ReleaseUrl = newRelease.HtmlUrl;
 
                     _logger.LogInformation(
-                        $"A new version of Damselfly is available: ({newRelease.Name})");
+                        $"A new version of Damselfly is ready to install now: ({newRelease.Name})");
                 }
             }
             catch( Exception ex )

Damselfly.Core/Services/SearchQueryService.cs

@@ -178,6 +178,10 @@ private async Task<SearchResponse> LoadMoreData(SearchQuery query, int first, in
                 // Filter by month
                 images = images.Where(x => query.Months.Contains(x.SortDate.Month));
 
+            if ( query.OnThisDay != null )
+                // Filter by month and day
+                images = images.Where(x => query.OnThisDay.Value.Month == x.SortDate.Month && query.OnThisDay.Value.Day == x.SortDate.Day);
+
             if ( query.MinSizeKB.HasValue )
             {
                 var minSizeBytes = query.MinSizeKB.Value * 1024;

Damselfly.Web.Client/Components/Controls/VersionChecker.razor

@@ -4,7 +4,7 @@
 {
     <div class="new-version">
         <NavLink href="@newVersionState.ReleaseUrl" target="_blank">
-            v<text>@newVersionState.NewVersion</text> of Damselfly is available
+            v<text>@newVersionState.NewVersion</text> of Damselfly is ready to install now
         </NavLink>
     </div>
 }

Damselfly.Web.Client/Components/ImageBrowser/AdvancedSearchPanel.razor

@@ -141,7 +141,7 @@
                 DateRange = range;
         }
     }
-
+    
     private void DateRangeChanged(DateRange value)
     {
         if( value != null )

Damselfly.Web.Client/Components/ImageBrowser/GridImage.razor

@@ -151,6 +151,7 @@ else
                     }
                     <RadzenMenuItem Text="View Folder" Value="7"/>
                     <RadzenMenuItem Text="View Images From This Day" Value="8"/>
+                    <RadzenMenuItem Text="On This Day..." Value="10"/>
                     <hr class="separator">
                     @if ( InBasket )
                     {
@@ -224,6 +225,9 @@ else
             case 9:
                 await DeleteImages(ContextSelection.Select(x => x.ImageId).ToList());
                 break;
+            case 10:
+                FilterByImageDayAndMonth();
+                break;
         }
     }
 
@@ -252,6 +256,12 @@ else
         NavigationManager.NavigateTo(url);
     }
 
+    private void FilterByImageDayAndMonth()
+    {
+        var url = $"/?date={CurrentImage.SortDate:dd-MMM}";
+        NavigationManager.NavigateTo(url);
+    }
+
     private void FindImageSimilarTo()
     {
         searchService.SimilarToId = CurrentImage.ImageId;