Updated to use new locations of CodePRoject.com Sense service pages / split version info out into it's own config file (for reuse)

ChrisMaunder · ChrisMaunder · commit 64a0b23ccb8a · 2022-01-21T17:40:03.000-05:00
diff --git a/install/create_installer_win.bat b/install/create_installer_win.bat
@@ -24,7 +24,7 @@ set installationDir=c:\CodeProject.SenseAI.Package
 
 :: The location of the installation package that will be created. The convention is:
 ::   CodeProject.SenseAI.<major>.<minor><patch>.zip
-set installationPackage=c:\CodeProject.SenseAI.0.0108.zip
+set installationPackage=c:\CodeProject.SenseAI.0.0109.zip
 
 :: The location of the solution root directory relative to this script
 cd ..
@@ -58,6 +58,10 @@ set senseAPIDir=API
 :: The name of the startup settings file
 set settingsFile=CodeProject.SenseAI.json
 
+:: The name of the version file for the SenseAI system. Stored in the API Server dir.
+:: TODO: Read this file to set the value of %installationPackage%
+set versionFile=version.json
+
 :: .NET build configuration: [Debug | Release]
 set config=Release
 
@@ -250,10 +254,10 @@ set analysisPath=%rootPath%\%srcDir%\%analysisLayerDir%\DeepStack\
 REM Note the space before the closing "  https://stackoverflow.com/a/30244061
 if /i "%verbosity%"=="quiet" (
     robocopy "%analysisPath% " "%installationDir%\%srcDir%\%analysisLayerDir%\DeepStack " ^
-             /XD venv "%modelsDir%" "%pythonDir%" /XF faceembedding.db /E !roboCopyFlags! > nul
+             /XD venv __pycache__ "%modelsDir%" "%pythonDir%" /XF faceembedding.db /E !roboCopyFlags! > nul
 ) else (
     robocopy "%analysisPath% " "%installationDir%\%srcDir%\%analysisLayerDir%\DeepStack " ^
-             /XD venv "%modelsDir%" "%pythonDir%" /XF faceembedding.db /E !roboCopyFlags!
+             /XD venv __pycache__ "%modelsDir%" "%pythonDir%" /XF faceembedding.db /E !roboCopyFlags!
 )
 
 :: For YOLO
diff --git a/src/API/Server/FrontEnd/Controllers/StatusController.cs b/src/API/Server/FrontEnd/Controllers/StatusController.cs
@@ -1,11 +1,9 @@
-﻿using System.Collections.Generic;
-using System.Linq;
+﻿using System.Linq;
 
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Options;
 
 using CodeProject.SenseAI.API.Common;
 using System.Threading.Tasks;
@@ -66,8 +64,8 @@ public ResponseBase GetVersion()
         {
             var response = new VersionResponse
             {
-                message = VersionService.VersionInfo.Version,
-                version = VersionService.VersionInfo,
+                message = VersionService.VersionConfig.VersionInfo?.Version ?? string.Empty,
+                version = VersionService.VersionConfig.VersionInfo,
                 success = true
             };
 
@@ -95,7 +93,17 @@ public async Task<ResponseBase> GetUpdateAvailable()
             }
             else
             {
-                bool updateAvailable = VersionInfo.Compare(VersionService.VersionInfo, latest) < 0;
+                VersionInfo? current = VersionService.VersionConfig.VersionInfo;
+                if (current == null)
+                {
+                    return new VersionUpdateResponse
+                    {
+                        message = "Unable to retrieve current version",
+                        success = false
+                    };
+                }
+
+                bool updateAvailable = VersionInfo.Compare(current, latest) < 0;
                 string message = updateAvailable
                                ? $"An update to version {latest.Version} is available"
                                : "This is the current version";
diff --git a/src/API/Server/FrontEnd/Program.cs b/src/API/Server/FrontEnd/Program.cs
@@ -31,6 +31,7 @@ public static async Task Main(string[] args)
                        .ConfigureAppConfiguration((hostingContext, config) =>
                        {
                            config.AddJsonFile(InstallConfig.InstallCfgFilename, reloadOnChange: true, optional: true);
+                           config.AddJsonFile(VersionConfig.VersionCfgFilename, reloadOnChange: true, optional: true);
                        })
                        .Build();
             var hostTask = host.RunAsync();
diff --git a/src/API/Server/FrontEnd/Startup.cs b/src/API/Server/FrontEnd/Startup.cs
@@ -11,7 +11,6 @@
 using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
 
-using CodeProject.SenseAI.API.Common;
 using CodeProject.SenseAI.API.Server.Backend;
 
 namespace CodeProject.SenseAI.API.Server.Frontend
@@ -85,9 +84,11 @@ public void ConfigureServices(IServiceCollection services)
             services.Configure<BackendOptions>(Configuration.GetSection(nameof(BackendOptions)))
                     .AddQueueProcessing();
 
-            services.Configure<VersionInfo>(Configuration.GetSection(nameof(VersionInfo)));
+            // Moved into its own file
+            // services.Configure<VersionInfo>(Configuration.GetSection(nameof(VersionInfo)));
 
             services.Configure<InstallConfig>(Configuration.GetSection(InstallConfig.InstallCfgSection));
+            services.Configure<VersionConfig>(Configuration.GetSection(VersionConfig.VersionCfgSection));
 
             services.AddBackendProcessRunner(Configuration);
 
@@ -116,7 +117,7 @@ public void Configure(IApplicationBuilder app,
                 app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "CodeProject SenseAI API v1"));
             }
 
-            InitializeIntallConfig(installConfig.Value, logger);
+            InitializeInstallConfig(installConfig.Value, logger);
 
             bool forceHttps = Configuration.GetValue<bool>(nameof(forceHttps));
             if (forceHttps)
@@ -137,7 +138,7 @@ public void Configure(IApplicationBuilder app,
             });
         }
 
-        private static void InitializeIntallConfig(InstallConfig installConfig, ILogger<Startup> logger)
+        private static void InitializeInstallConfig(InstallConfig installConfig, ILogger<Startup> logger)
         {
 
             if (installConfig is null || installConfig.Id == Guid.Empty)
@@ -148,6 +149,7 @@ private static void InitializeIntallConfig(InstallConfig installConfig, ILogger<
                     installConfig.Id = Guid.NewGuid();
                     var configValues = new { install = installConfig };
                     var filePath     = InstallConfig.InstallCfgFilename;
+
                     File.WriteAllText(filePath, System.Text.Json.JsonSerializer.Serialize(configValues, 
                         new System.Text.Json.JsonSerializerOptions { WriteIndented = true }));
                 }
diff --git a/src/API/Server/FrontEnd/VersionConfig.cs b/src/API/Server/FrontEnd/VersionConfig.cs
@@ -0,0 +1,18 @@
+﻿using CodeProject.SenseAI.API.Common;
+
+namespace CodeProject.SenseAI.API.Server.Frontend
+{
+    /// <summary>
+    /// Version instance config values.
+    /// </summary>
+    public class VersionConfig
+    {
+        internal static string VersionCfgFilename = "version.json";
+        internal static string VersionCfgSection  = "versionSection";
+
+        /// <summary>
+        /// Gets or sets the version info
+        /// </summary>
+        public VersionInfo? VersionInfo { get; set; }
+    }
+}
diff --git a/src/API/Server/FrontEnd/VersionService.cs b/src/API/Server/FrontEnd/VersionService.cs
@@ -22,12 +22,12 @@ public class VersionService
         /// <param name="versionOptions">The version Options instance.</param>
         /// <param name="installOptions">The install Options instance.</param>
         /// <param name="configuration">The Configuration instance</param>
-        public VersionService(IOptions<VersionInfo> versionOptions,
+        public VersionService(IOptions<VersionConfig> versionOptions,
                               IOptions<InstallConfig> installOptions,
                               IConfiguration configuration)
         {
             Configuration = configuration;
-            VersionInfo   = versionOptions.Value;
+            VersionConfig = versionOptions.Value;
             InstallConfig = installOptions.Value;
         }
 
@@ -39,7 +39,7 @@ public VersionService(IOptions<VersionInfo> versionOptions,
         /// <summary>
         /// Gets the version info for the current instance.
         /// </summary>
-        public VersionInfo VersionInfo { get; }
+        public VersionConfig VersionConfig { get; }
 
         /// <summary>
         /// Gets the install config for the current instance.
@@ -79,14 +79,13 @@ public VersionService(IOptions<VersionInfo> versionOptions,
                     if (version is not null)
                     {
                         // A small adjustment. The version info contains the file *name* not a file
-                        // URL, and that name is relative to the official download location. We
-                        // return just the name as a naive protection against man in the middle
-                        // attacks. The URL we send the user to will come from the local config
-                        // settings.
+                        // URL. We return just the name as a naive protection against man in the
+                        // middle attacks. The actual URL we send the user to will come from the
+                        // local config settings.
                         if (!string.IsNullOrWhiteSpace(version.File))
                         {
                             string updateDownloadUrl = Configuration.GetValue<string>("UpdateDownloadUrl");
-                            version.File = updateDownloadUrl + version.File;
+                            version.File = updateDownloadUrl;
                         }
 
                         Common.Logger.Log($"Latest version available is {version.Version}");
diff --git a/src/API/Server/FrontEnd/appsettings.json b/src/API/Server/FrontEnd/appsettings.json
@@ -8,19 +8,11 @@
         }
     },
 
-    "VersionInfo": {
-        "Major": 0,
-        "Minor": 1,
-        "Patch": 8,
-        "PreRelease": "Beta1",
-        "Build": 0,
-        "File": "CodeProject.SenseAI.0.0108.zip"
-    },
-
     "AllowedHosts": "*",
     "ForceHttps": false,
-    "UpdateCheckUrl": "https://www.codeproject.com/ai/version.aspx",
-    "UpdateDownloadUrl": "https://www.codeproject.com/ai/sense/",
+
+    "UpdateCheckUrl":    "https://www.codeproject.com/ai/sense/version.aspx",
+    "UpdateDownloadUrl": "https://www.codeproject.com/ai/sense/latest.aspx",
 
     "BackendOptions": {
         "ResponseTimeout": "00:00:30",
diff --git a/src/API/Server/FrontEnd/version.json b/src/API/Server/FrontEnd/version.json
@@ -0,0 +1,12 @@
+{
+    "versionSection": {
+        "versionInfo": {
+            "Major": 0,
+            "Minor": 1,
+            "Patch": 8,
+            "PreRelease": "Beta1",
+            "Build": 0,
+            "File": "CodeProject.SenseAI.0.0108.zip"
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public static async Task Main(string[] args)`
`31`	`31`	`.ConfigureAppConfiguration((hostingContext, config) =>`
`32`	`32`	`{`
`33`	`33`	`config.AddJsonFile(InstallConfig.InstallCfgFilename, reloadOnChange: true, optional: true);`
	`34`	`+ config.AddJsonFile(VersionConfig.VersionCfgFilename, reloadOnChange: true, optional: true);`
`34`	`35`	`})`
`35`	`36`	`.Build();`
`36`	`37`	`var hostTask = host.RunAsync();`