- Added: Only one instance of SMA can be run #156

- Added: Rescue tool ("SMA Updater") which can install or update to any SMA version #152
- Added: Installer ability to rollback to a previous version #151
- Added: Distribution channels for SMA updates (stable, beta, nightly) #86
- Added: Update settings accessible from Collection Window
- Added: Shortcut for "SMA Updater" on install
- Added: Debug symbols (pdb) to Services nuspec
- Fixed: SMA interrupts update mid-way when exiting #88 #161 #151
- Updated: Stub executable now selects the version based on the local RELEASES file first #161 #151
- Updated: Improved Installer ability to optimize the download size by choosing delta updates
- Updated: All windows' default size are less or equal to 800x600 #160
- Updated: Tool tips (wip) #166
- Updated: All projects to PackageReference
- Updated: Change log is now generated before build to include the include the latest commit messages in the package
- Updated: Packages

Author: alexis-

ChangeLogs

@@ -1,7 +1,13 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT UNLESS YOU KNOW WHAT YOU ARE DOING.
 # CHANGE LOG
 
-[Next version (3d4d54688e1b3390524525d1f443b88d6e470ea4)]
+[2.0.3.451]
+- Fixed: Updated plugin does not refresh in the UI (still happens in the Browse tab)
+- Fixed: Occasional error when updating a Plugin
+- Misc: Reorganized Template plugin
+
+
+[2.0.3.435]
 - Added: SuperMemo 18.04 compatibility #138
 - Added: automated ChangeLog and NuPkg Release notes #52
 - Added: Splash screen (also overrides SuperMemo's) #100

SuperMemoAssistant.sln

@@ -21,8 +21,7 @@
 // DEALINGS IN THE SOFTWARE.
 // 
 // 
-// Created On:   2020/02/12 22:20
-// Modified On:  2020/02/12 22:20
+// Modified On:  2020/03/23 04:02
 // Modified By:  Alexis
 
 #endregion
@@ -42,28 +41,27 @@ public partial class App
   {
     #region Methods
 
-    private Task<bool> LoadConfigs(out NativeDataCfg nativeDataCfg, out CoreCfg coreCfg)
+    private async Task<(bool success, NativeDataCfg nativeDataCfg, CoreCfg coreCfg)> LoadConfigs()
     {
-      nativeDataCfg = LoadNativeDataConfig().Result;
-      coreCfg    = LoadCoreConfig().Result;
+      var nativeDataCfg = await LoadNativeDataConfig().ConfigureAwait(false);
+      var coreCfg       = await LoadCoreConfig().ConfigureAwait(false);
 
       if (nativeDataCfg == null || coreCfg == null)
-        return Task.FromResult(false);
+        return (false, null, null);
 
-      return Task.FromResult(true);
+      return (true, nativeDataCfg, coreCfg);
     }
 
     private async Task<CoreCfg> LoadCoreConfig()
     {
       try
       {
-        return await SMA.Core.Configuration.Load<CoreCfg>()
+        return await SMA.Core.Configuration
+                        .Load<CoreCfg>()
                         .ConfigureAwait(false) ?? new CoreCfg();
       }
       catch (SMAException)
       {
-        await "Failed to open CoreCfg.json. Make sure file is unlocked and try again.".ErrorMsgBox();
-
         return null;
       }
     }
@@ -72,13 +70,12 @@ private async Task<NativeDataCfg> LoadNativeDataConfig()
     {
       try
       {
-        return await SMA.Core.Configuration.Load<NativeDataCfg>(SMAExecutableInfo.Instance.DirectoryPath)
+        return await SMA.Core.Configuration
+                        .Load<NativeDataCfg>(SMAExecutableInfo.Instance.DirectoryPath)
                         .ConfigureAwait(false);
       }
       catch (SMAException)
       {
-        await "Failed to load native data config file.".ErrorMsgBox();
-
         return null;
       }
     }

libs/MSBuild.Tools

@@ -38,22 +38,10 @@
         <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Sentry" publicKeyToken="fba2ec45388e2af0" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="FontAwesome5" publicKeyToken="9cfaf01297a008f8" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Sentry.Protocol" publicKeyToken="fba2ec45388e2af0" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Sentry.Serilog" publicKeyToken="fba2ec45388e2af0" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

libs/Process.NET

@@ -44,6 +44,7 @@
 using SuperMemoAssistant.SMA.Utils;
 using SuperMemoAssistant.Sys.Windows;
 using SuperMemoAssistant.UI;
+using SuperMemoAssistant.Utils;
 
 namespace SuperMemoAssistant
 {
@@ -66,6 +67,8 @@ public partial class App : Application
     /// <param name="e"></param>
     protected override void OnExit(ExitEventArgs e)
     {
+      SMAInstaller.Instance.Semaphore.Wait();
+
       _taskbarIcon?.Dispose();
       _splashScreen?.Close();
       _splashScreen = null;
@@ -93,8 +96,14 @@ private async void Application_Startup(object           o,
     {
       _taskbarIcon = (TaskbarIcon)FindResource("TbIcon");
 
+      if (ApplicationSingleton.IsOnlyInstance(_ => LogTo.Warning("SuperMemoAssistant is already running. Exiting."), e.Args) == false)
+      {
+        Shutdown(SMAExitCodes.ExitCodeSMAAlreadyRunning);
+        return;
+      }
+
       if (Parser.Default.ParseArguments<SMAParameters>(e.Args) is Parsed<SMAParameters> parsed)
-        await LoadApp(parsed.Value);
+        await LoadApp(parsed.Value).ConfigureAwait(false);
 
       else
         Shutdown(SMAExitCodes.ExitCodeParametersError);
@@ -118,20 +127,22 @@ private async Task LoadApp(SMAParameters args)
       if (AssemblyCheck.CheckRequired(out var errMsg) == false || CheckSMALocation(out errMsg) == false)
       {
         LogTo.Warning(errMsg);
-        await errMsg.ErrorMsgBox();
+        await errMsg.ErrorMsgBox().ConfigureAwait(false);
 
         Shutdown(SMAExitCodes.ExitCodeDependencyError);
         return;
       }
 
       //
       // Load main configuration files
-      if (await LoadConfigs(out var nativeDataCfg, out var coreCfg) == false)
+      var (success, nativeDataCfg, coreCfg) = await LoadConfigs().ConfigureAwait(true);
+
+      if (success == false)
       {
         errMsg =
           $"At least one essential config file could not be loaded: nativeDataCfg ? {nativeDataCfg == null} ; startupCfg ? {coreCfg == null}";
         LogTo.Warning(errMsg);
-        await errMsg.ErrorMsgBox();
+        await errMsg.ErrorMsgBox().ConfigureAwait(false);
 
         Shutdown(SMAExitCodes.ExitCodeConfigError);
         return;
@@ -197,23 +208,21 @@ private async Task LoadApp(SMAParameters args)
 
         Exception ex;
 
-        if ((ex = await SMA.Core.SMA.Start(nativeDataCfg, smCollection).ConfigureAwait(true)) != null)
+        if (true && (ex = await SMA.Core.SMA.Start(nativeDataCfg, smCollection).ConfigureAwait(true)) != null)
         {
-          await Dispatcher.InvokeAsync(async () =>
-          {
-            _splashScreen?.Close();
-            _splashScreen = null;
+          
+          _splashScreen?.Close();
+          _splashScreen = null;
 
-            await $"SMA failed to start: {ex.Message}".ErrorMsgBox();
+          await $"SMA failed to start: {ex.Message}".ErrorMsgBox().ConfigureAwait(false);
 
-            Shutdown(SMAExitCodes.ExitCodeSMAStartupError);
-          });
+          Shutdown(SMAExitCodes.ExitCodeSMAStartupError);
 
           return;
         }
 
         if (SMAExecutableInfo.Instance.IsDev == false)
-          await SMAInstaller.Instance.Update();
+          await SMAInstaller.Instance.Update().ConfigureAwait(false);
       }
       else
       {

libs/Squirrel.Windows

@@ -68,7 +68,7 @@ public sealed class SMAInstaller
 
     #region Properties & Fields - Non-Public
 
-    private readonly AsyncSemaphore _semaphore = new AsyncSemaphore(1);
+    public AsyncSemaphore Semaphore { get; } = new AsyncSemaphore(1);
 
     #endregion
 
@@ -110,17 +110,28 @@ public static bool HandleEvent(SMAParameters parameters, out bool firstRun)
         using (var mgr = CreateUpdateMgr())
         {
           Logger.Information($"SuperMemo Assistant version {parameters.SquirrelInstalled} installed. Creating shortcuts.");
+
           mgr.CreateShortcutForThisExe();
 
+          mgr.CreateShortcutsForExecutable(
+            SMAFileSystem.UpdaterExeFile.FullPathWin,
+            ShortcutLocation.StartMenu,
+            false, null, null);
+
           return true;
         }
 
       if (parameters.SquirrelUninstalled != null)
         using (var mgr = CreateUpdateMgr())
         {
           Logger.Information($"SuperMemo Assistant version {parameters.SquirrelUninstalled} uninstalled. Removing shortcuts.");
+
           mgr.RemoveShortcutForThisExe();
 
+          mgr.RemoveShortcutsForExecutable(
+            SMAFileSystem.UpdaterExeFile.FullPathWin,
+            ShortcutLocation.StartMenu);
+
           return true;
         }
 
@@ -141,8 +152,6 @@ public static bool HandleEvent(SMAParameters parameters, out bool firstRun)
     /// <returns></returns>
     public async Task Update()
     {
-      // TODO: Ensure only one Update is running across all instances of SMA (in case SMA is closed during the update process)
-      // TODO: Offer manual updates
       // TODO: Add option to wait for user confirmation to update
 
       if (UpdateEnabled == false)
@@ -158,12 +167,12 @@ public async Task Update()
         CancellationTokenSource cts = new CancellationTokenSource(0);
         cts.Cancel();
 
-        using (await _semaphore.LockAsync(cts.Token))
+        using (await Semaphore.LockAsync(cts.Token))
         using (var updateMgr = CreateUpdateMgr())
         {
           State = SMAUpdateState.Fetching;
 
-          var updateInfo = await updateMgr.CheckForUpdate(false, progress => ProgressPct = progress);
+          var updateInfo = await updateMgr.CheckForUpdate(true, false, progress => ProgressPct = progress);
 
           if (updateInfo?.ReleasesToApply == null)
           {
@@ -202,7 +211,7 @@ public async Task Update()
       }
       finally
       {
-        _semaphore.Release();
+        Semaphore.Release();
 
         if (updateVersion != null)
           NotifyUpdateResult(updateVersion);

src/AppHosts/SuperMemoAssistant/App.Configs.cs

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>SuperMemoAssistant</id>
-    <!-- version will be replaced by MSBuild -->
+    <!-- version will be replaced by MSBuild (see SuperMemoAssistant.csproj) -->
     <version>0.0.0.0</version>
     <title>SuperMemo Assistant</title>
     <authors>SuperMemo.wiki</authors>
@@ -12,34 +12,10 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright></copyright>
     <dependencies />
-    <releaseNotes>- Added: SuperMemo 18.04 compatibility #138
-- Added: automated ChangeLog and NuPkg Release notes #52
-- Added: Splash screen (also overrides SuperMemo's) #100
-- Added: Plugin labels (e.g. Official, Verified)
-- Added: A ChangeLog Popup after update, and a Change Logs Tab in the Settings #134
-- Added: Limited settings window to one instance displayed at a time #113
-- Added: Tool tips (hints) to UI icons that do not have a label #130
-- Added: During installation, the confirmation popup displays the install folder destination #129
-- Added: Import collection from SuperMemo (supermemo.ini) setup step #73
-- Added Notifications #53
-- Added Notification + Option to restart on plugin crash
-- Added plugin labels #133
-- Added ToolTips to UI icons #130
-- Added install destination folder in confirmation popup message #129 (Squirrel.Windows)
-- Added cancel button + reset in Collection Selection #117
-- Added a setup step to import collections from supermemo.ini #73
-- Added CfgBase with reset on cancel
-- Added automatic version configuration
-- Added more documentation
-- Updated: ChangeLogs is now an embedded resource
-- Updated: NuSpec dependencies version
-- Updated: Packages
-- Updated: ChangeLogs
-- Fixed: Change Log window now displays correctly
-- Fixed: Wrong offsets for Hook and Concept in NativeDataCfg.json
-- Fixed: Collection Selection &gt; Options, and other option windows can now be canceled and revert changes #117
-- Misc: Cleaned up SMAInstaller from legacy Change Log code
-- Several other minor updates
+    <!-- releaseNotes will be replaced by MSBuild.Tools (see SuperMemoAssistant.csproj and https://github.com/alexis-/MSBuild.Tools) -->
+    <releaseNotes>- Fixed: Updated plugin does not refresh in the UI (still happens in the Browse tab)
+- Fixed: Occasional error when updating a Plugin
+- Misc: Reorganized Template plugin
 </releaseNotes>
   </metadata>
   <files>

src/AppHosts/SuperMemoAssistant/App.config

@@ -0,0 +1,49 @@
+#region License & Metadata
+
+// The MIT License (MIT)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+// 
+// 
+// Modified On:  2020/03/19 01:50
+// Modified By:  Alexis
+
+#endregion
+
+
+
+
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace SuperMemoAssistant.Models
+{
+  [DataContract]
+  internal class AppPayload
+
+  {
+    #region Properties & Fields - Public
+
+    /// <summary>A list of command line arguments.</summary>
+    [DataMember]
+    public List<string> CommandLineArguments { get; set; } = new List<string>();
+
+    #endregion
+  }
+}

src/AppHosts/SuperMemoAssistant/App.xaml.cs

@@ -35,11 +35,12 @@ public static class SMAExitCodes
   {
     #region Constants & Statics
 
-    public const int ExitCodeParametersError = 1;
-    public const int ExitCodeDependencyError = 2;
-    public const int ExitCodeConfigError     = 3;
-    public const int ExitCodeSMASetupError   = 4;
-    public const int ExitCodeSMAStartupError = 5;
+    public const int ExitCodeParametersError   = 1;
+    public const int ExitCodeDependencyError   = 2;
+    public const int ExitCodeConfigError       = 3;
+    public const int ExitCodeSMASetupError     = 4;
+    public const int ExitCodeSMAStartupError   = 5;
+    public const int ExitCodeSMAAlreadyRunning = 6;
 
     #endregion
   }

src/AppHosts/SuperMemoAssistant/Installer/SMAInstaller.cs

@@ -84,8 +84,7 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.3.450")]
-[assembly: AssemblyFileVersion("2.0.3.450")]
+[assembly: AssemblyVersion("2.0.4.82")]
+[assembly: AssemblyFileVersion("2.0.4.82")]
 
-[assembly: AssemblyInformationalVersion("2.0.3")]
+[assembly: AssemblyInformationalVersion("2.0.4")]