Version Checker and Namespace fixes

Damselfly.Core.DbModels/Interfaces/ICachedDataService.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Damselfly.Core.DbModels.Models;
+using Damselfly.Core.DbModels.Models.APIModels;
 using Damselfly.Core.Models;
 
 namespace Damselfly.Core.ScopedServices.Interfaces;
@@ -14,4 +15,5 @@ public interface ICachedDataService
     Task InitialiseData();
     Task<Statistics> GetStatistics();
     Task ClearCache();
+    Task<NewVersionResponse> CheckForNewVersion();
 }

Damselfly.Core.DbModels/Interfaces/IPeopleService.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Damselfly.Core.DbModels.Models.API_Models;
 using Damselfly.Core.DbModels.Models.APIModels;
 using Damselfly.Core.Models;
 

Damselfly.Core.DbModels/Models/API Models/AIMigrationRequest.cs

@@ -1,4 +1,4 @@
-namespace Damselfly.Core.DbModels.Models.API_Models;
+namespace Damselfly.Core.DbModels.Models.APIModels;
 
 public class AIMigrationRequest
 {

Damselfly.Core.DbModels/Models/API Models/NewVersionResponse.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace Damselfly.Core.DbModels.Models.APIModels;
+
+public class NewVersionResponse
+{
+    public Version CurrentVersion { get; set; }
+    public Version? NewVersion { get; set; }
+    public string? NewReleaseName { get; set; }
+    public string? ReleaseUrl { get; set; }
+    public bool? UpgradeAvailable()
+    {
+        if( NewVersion != null )
+            return NewVersion > CurrentVersion;
+
+        return null;
+    }
+
+}

Damselfly.Core.DbModels/Models/API Models/SearchHint.cs

@@ -1,7 +1,7 @@
 using System;
 using Damselfly.Core.ScopedServices.Interfaces;
 
-namespace Damselfly.Core.DbModels.Models.API_Models;
+namespace Damselfly.Core.DbModels.Models.APIModels;
 
 public class SearchHint : ISearchHint
 {

Damselfly.Core.ScopedServices/BaseSearchService.cs

@@ -1,10 +1,9 @@
 using System.Globalization;
 using Damselfly.Core.Constants;
 using Damselfly.Core.DbModels;
-using Damselfly.Core.DbModels.Models.API_Models;
+using Damselfly.Core.DbModels.Models.APIModels;
 using Damselfly.Core.Models;
 using Damselfly.Core.ScopedServices.Interfaces;
-using Damselfly.Core.Utils;
 using Humanizer;
 using Microsoft.Extensions.Logging;
 

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

@@ -52,4 +52,9 @@ public async Task ClearCache()
     {
         await InitialiseData();
     }
+
+    public async Task<NewVersionResponse> CheckForNewVersion()
+    {
+        return await httpClient.CustomGetFromJsonAsync<NewVersionResponse>("/api/data/newversion");
+    }
 }

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

@@ -1,5 +1,4 @@
-using Damselfly.Core.DbModels.Models.API_Models;
-using Damselfly.Core.DbModels.Models.APIModels;
+using Damselfly.Core.DbModels.Models.APIModels;
 using Damselfly.Core.Models;
 using Damselfly.Core.ScopedServices.ClientServices;
 using Damselfly.Core.ScopedServices.Interfaces;

Damselfly.Core/Damselfly.Core.csproj

@@ -25,6 +25,7 @@
         </PackageReference>
         <PackageReference Include="MetadataExtractor" />
         <PackageReference Include="CommandLineParser" />
+        <PackageReference Include="Octokit" />
         <PackageReference Include="WordPressPCL" />
         <PackageReference Include="SixLabors.ImageSharp" />
         <PackageReference Include="SixLabors.ImageSharp.Drawing" />
@@ -41,7 +42,6 @@
         <PackageReference Include="EFCore.BulkExtensions" NoWarn="1605" />
     </ItemGroup>
     <ItemGroup>
-        <Folder Include="Services\" />
         <Folder Include="Utils\" />
         <Folder Include="ScopedServices\" />
         <Folder Include="DbAbstractions\" />

Damselfly.Core/ScopedServices/CachedDataService.cs

@@ -1,23 +1,21 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
 using System.Threading.Tasks;
 using Damselfly.Core.DbModels.Models;
+using Damselfly.Core.DbModels.Models.APIModels;
 using Damselfly.Core.Models;
 using Damselfly.Core.ScopedServices.Interfaces;
 using Damselfly.Core.Services;
+using Microsoft.Extensions.Logging;
+using Octokit;
 
 namespace Damselfly.Core.ScopedServices;
 
-public class CachedDataService : ICachedDataService
+public class CachedDataService( MetaDataService _metaDataService,  
+                                    StatisticsService _stats,
+                                    ILogger<CachedDataService> _logger) : ICachedDataService
 {
-    private readonly MetaDataService _metaDataService;
-    private readonly StatisticsService _stats;
-
-    public CachedDataService(MetaDataService metaDataService, StatisticsService stats)
-    {
-        _stats = stats;
-        _metaDataService = metaDataService;
-    }
-
     public string ImagesRootFolder => IndexingService.RootFolder;
 
     public string ExifToolVer => ExifService.ExifToolVer;
@@ -42,4 +40,42 @@ public Task ClearCache()
         // No-op
         return Task.CompletedTask;
     }
+    private NewVersionResponse? newVersionState;
+
+    /// <summary>
+    /// Checks for a new version
+    /// </summary>
+    /// <returns></returns>
+    public async Task<NewVersionResponse> CheckForNewVersion()
+    {
+        if( newVersionState == null )
+        {
+            newVersionState = new NewVersionResponse
+            {
+                CurrentVersion = Assembly.GetExecutingAssembly().GetName().Version
+            };
+
+            try
+            {
+                var client = new GitHubClient(new ProductHeaderValue("Damselfly"));
+
+                var newRelease = await client.Repository.Release.GetLatest("webreaper", "damselfly");
+                if( newRelease != null && Version.TryParse(newRelease.TagName, out var newVersion) )
+                {
+                    newVersionState.NewVersion = newVersion;
+                    newVersionState.NewReleaseName = newRelease.Name;
+                    newVersionState.ReleaseUrl = newRelease.HtmlUrl;
+
+                    _logger.LogInformation(
+                        $"A new version of Damselfly is available: ({newRelease.Name})");
+                }
+            }
+            catch( Exception ex )
+            {
+                _logger.LogWarning("Unable to check GitHub for latest version: {ex}", ex);
+            }
+        }
+
+        return newVersionState;
+    }
 }

Damselfly.Core/Services/ImageRecognitionService.cs

@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using Damselfly.Core.Constants;
 using Damselfly.Core.Database;
-using Damselfly.Core.DbModels.Models.API_Models;
 using Damselfly.Core.DbModels.Models.APIModels;
 using Damselfly.Core.Interfaces;
 using Damselfly.Core.Models;

Damselfly.Web.Client/Damselfly.Web.Client.csproj

@@ -81,6 +81,15 @@
         <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
       </None>
     </ItemGroup>
+
+    <ItemGroup>
+      <Content Update="Shared\DamselflyLogo.razor.css">
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      </Content>
+      <Content Update="Shared\VersionChecker.razor.css">
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      </Content>
+    </ItemGroup>
     <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
         <ReadLinesFromFile File="../VERSION">
             <Output TaskParameter="Lines" PropertyName="VersionNumber" />

Damselfly.Web.Client/Shared/About.razor

@@ -6,7 +6,8 @@
     <div>
         <img src="damselfly-logo.png" height="200" title="Damselfly" />
     </div>
-    <h3>Damselfly v<span />@Version &copy; 2019-@DateTime.Now.Year Mark Otway, All rights reserved.</h3>
+    <h3>Damselfly v<span />@Version <VersionChecker/></h3>
+    <h4>&copy; 2019-@DateTime.Now.Year Mark Otway, All rights reserved.</h4>
     <h4>Server-based Digital Asset Management system</h4>
     <hr />
     <h3>Credits/Thanks</h3>

Damselfly.Web.Client/Shared/DamselflyLogo.razor

@@ -2,5 +2,6 @@
     <NavLink href="/">
         <img src="damselfly-logo.png" title="Damselfly"/>
     </NavLink>
+    <VersionChecker/>
 </div>
 

Damselfly.Web.Client/Shared/DamselflyLogo.razor.css

@@ -0,0 +1,14 @@
+.damselfly-logo {
+    display: flex;
+    flex-direction: column;
+    background-color: black;
+    flex: 0 0 50px;
+    order: -1;
+    justify-content: center;
+    align-items: center;
+}
+
+.damselfly-logo img {
+    max-height: 60px;
+    object-fit: contain;
+}

Damselfly.Web.Client/Shared/Dialogs/AIMigrationDialog.razor

@@ -1,5 +1,4 @@
-@using Damselfly.Core.DbModels.Models.API_Models
-@inject IPeopleService peopleService 
+@inject IPeopleService peopleService 
 
 <MudDialog>
     <DialogContent>

Damselfly.Web.Client/Shared/VersionChecker.razor

@@ -0,0 +1,25 @@
+@inject ICachedDataService cachedData
+
+@if( needsUpgrade )
+{
+    <div class="new-version">
+        <NavLink href="@newVersionState.ReleaseUrl" target="_blank">
+            v<text>@newVersionState.NewVersion</text> of Damselfly is available
+        </NavLink>
+    </div>
+}
+
+@code {
+    private NewVersionResponse newVersionState;
+    bool needsUpgrade = false;
+
+    protected override async Task OnInitializedAsync()
+    {
+        newVersionState = await cachedData.CheckForNewVersion();
+        var checkResult = newVersionState.UpgradeAvailable();
+        if( checkResult.HasValue )
+            needsUpgrade = checkResult.Value;
+
+        await base.OnInitializedAsync();
+    }
+}

Damselfly.Web.Client/Shared/VersionChecker.razor.css

@@ -0,0 +1,5 @@
+.new-version{
+    display: flex;
+    font-weight: normal;
+    padding: 3px;
+}

Damselfly.Web.Client/wwwroot/css/site.css

@@ -565,20 +565,6 @@ f
     flex-direction: column;
 }
 
-.damselfly-logo {
-    display: flex;
-    background-color: black;
-    flex: 0 0 50px;
-    order: -1;
-    justify-content: center;
-}
-
-.damselfly-logo img {
-    max-height: 60px;
-    object-fit: contain;
-}
-
-
 .damselfly-folderlist {
     flex-direction: column;
     flex: 0 1 100%;

Damselfly.Web.Client/wwwroot/version.js

@@ -1 +1 @@
-const CACHE_VERSION='4.1.0-20240310210419'
+const CACHE_VERSION='4.1.3-20240315223425'

Damselfly.Web.Server/AppInitialisation.cs

@@ -1,5 +1,6 @@
 using Damselfly.Core.Constants;
 using Damselfly.Core.Models;
+using Damselfly.Core.ScopedServices.Interfaces;
 using Damselfly.Core.Services;
 using Damselfly.Core.Utils;
 using Damselfly.ML.FaceONNX;
@@ -33,7 +34,9 @@ public static void SetupServices(this IWebHostEnvironment env, IServiceProvider
         services.GetRequiredService<IndexingService>().StartService();
         services.GetRequiredService<ImageRecognitionService>().StartService();
         services.GetRequiredService<FaceONNXService>().StartService();
-
+
+        services.GetRequiredService<ICachedDataService>().CheckForNewVersion();
+
         // ObjectDetector can throw a segmentation fault if the docker container is pinned
         // to a single CPU, so for now, to aid debugging, let's not even try and initialise
         // it if AI is disabled. See https://github.com/Webreaper/Damselfly/issues/334

Damselfly.Web.Server/Controllers/PeopleController.cs

@@ -1,6 +1,5 @@
 using Damselfly.Core.Constants;
 using Damselfly.Core.Database;
-using Damselfly.Core.DbModels.Models.API_Models;
 using Damselfly.Core.DbModels.Models.APIModels;
 using Damselfly.Core.Models;
 using Damselfly.Core.ScopedServices.Interfaces;

Damselfly.Web.Server/Controllers/StaticDataController.cs

@@ -1,7 +1,8 @@
-using Damselfly.Core.Constants;
+using Damselfly.Core.Constants;
 using Damselfly.Core.DbModels.Models;
 using Damselfly.Core.DbModels.Models.APIModels;
 using Damselfly.Core.Models;
+using Damselfly.Core.ScopedServices.Interfaces;
 using Damselfly.Core.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -11,20 +12,11 @@ namespace Damselfly.Web.Server.Controllers;
 //[Authorize(Policy = PolicyDefinitions.s_IsLoggedIn)]
 [ApiController]
 [Route("/api/data")]
-public class StaticDataController : ControllerBase
+public class StaticDataController( ILogger<StaticDataController> _logger, 
+                                MetaDataService _metaDataService,
+                                ICachedDataService _cachedData,
+                                StatisticsService _stats) : ControllerBase
 {
-    private readonly ILogger<StaticDataController> _logger;
-    private readonly MetaDataService _metaDataService;
-    private readonly StatisticsService _stats;
-
-    public StaticDataController(MetaDataService metaDataService, StatisticsService stats,
-        ILogger<StaticDataController> logger)
-    {
-        _metaDataService = metaDataService;
-        _stats = stats;
-        _logger = logger;
-    }
-
     [HttpGet("/api/data/static")]
     public Task<StaticData> GetStaticData()
     {
@@ -54,4 +46,10 @@ public async Task<Statistics> GetStatistics()
     {
         return await _stats.GetStatistics();
     }
+
+    [HttpGet("/api/data/newversion")]
+    public async Task<NewVersionResponse> CheckForNewVersion()
+    {
+        return await _cachedData.CheckForNewVersion();
+    }
 }