Merge pull request #20 from nelinory/development

Development to Main

Author: nelinory

AssemblyInfo.cs

@@ -10,7 +10,7 @@
                                               // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyVersion("0.3.*")]
+[assembly: AssemblyVersion("0.4.*")]
 [assembly: AssemblyTitle("Supernote Desktop Client")]
 [assembly: AssemblyProduct("Supernote Desktop Client")]
 [assembly: AssemblyCopyright("Copyright © nelinory 2023")]

Converters/BoolToVisibilityInversonConverter.cs

@@ -9,7 +9,7 @@ internal class BoolToVisibilityInversionConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return (bool)value ? Visibility.Hidden : Visibility.Visible;
+            return (bool)value ? Visibility.Collapsed : Visibility.Visible;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

Core/DiagnosticLogger.cs

@@ -3,7 +3,7 @@
 
 namespace SupernoteDesktopClient.Core
 {
-    static class DiagnosticLogger
+    public static class DiagnosticLogger
     {
         public static void Log(string messageTemplate, [CallerMemberName] string callerName = "", params object[] args)
         {

Core/ImageManager.cs

@@ -1,6 +1,5 @@
 using SupernoteDesktopClient.Core.Win32Api;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Windows.Interop;
 using System.Windows.Media;
@@ -15,37 +14,37 @@ public static class ImageManager
 
         public static ImageSource GetImageSource(string filename)
         {
-            return GetImageSourceFromCache(filename, new Size(24, 24), ItemType.File, ItemState.Undefined);
+            return GetImageSourceFromCache(filename, ItemType.File, ItemState.Undefined);
         }
 
         public static ImageSource GetImageSource(string directory, ItemState folderType)
         {
-            return GetImageSourceFromCache(directory, new Size(24, 24), ItemType.Folder, folderType);
+            return GetImageSourceFromCache(directory, ItemType.Folder, folderType);
         }
 
-        private static ImageSource GetFileImageSource(string filename, Size size)
+        private static ImageSource GetFileImageSource(string filename)
         {
             using (var icon = NativeMethods.GetIcon(Path.GetExtension(filename), ItemType.File, IconSize.Large, ItemState.Undefined))
             {
                 return Imaging.CreateBitmapSourceFromHIcon(icon.Handle,
                     System.Windows.Int32Rect.Empty,
-                    BitmapSizeOptions.FromWidthAndHeight(size.Width, size.Height));
+                    BitmapSizeOptions.FromEmptyOptions());
             }
         }
 
-        private static ImageSource GetDirectoryImageSource(string directory, Size size, ItemState folderType)
+        private static ImageSource GetDirectoryImageSource(string directory, ItemState folderType)
         {
             using (var icon = NativeMethods.GetIcon(directory, ItemType.Folder, IconSize.Large, folderType))
             {
                 return Imaging.CreateBitmapSourceFromHIcon(icon.Handle,
                     System.Windows.Int32Rect.Empty,
-                    BitmapSizeOptions.FromWidthAndHeight(size.Width, size.Height));
+                    BitmapSizeOptions.FromEmptyOptions());
             }
         }
 
-        private static ImageSource GetImageSourceFromCache(string itemName, Size itemSize, ItemType itemType, ItemState itemState)
+        private static ImageSource GetImageSourceFromCache(string itemName, ItemType itemType, ItemState itemState)
         {
-            string cacheKey = $"{(itemType is ItemType.Folder ? ItemType.Folder : Path.GetExtension(itemName))}#{itemSize.Width}#{itemSize.Height}";
+            string cacheKey = $"{(itemType is ItemType.Folder ? ItemType.Folder : Path.GetExtension(itemName))}";
 
             ImageSource returnValue;
             _imageSourceCache.TryGetValue(cacheKey, out returnValue);
@@ -59,9 +58,9 @@ private static ImageSource GetImageSourceFromCache(string itemName, Size itemSiz
                     if (returnValue == null)
                     {
                         if (itemType is ItemType.Folder)
-                            returnValue = GetDirectoryImageSource(itemName, itemSize, itemState);
+                            returnValue = GetDirectoryImageSource(itemName, itemState);
                         else
-                            returnValue = GetFileImageSource(itemName, itemSize);
+                            returnValue = GetFileImageSource(itemName);
 
                         if (returnValue != null)
                             _imageSourceCache.Add(cacheKey, returnValue);

Core/UpdateManager.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace SupernoteDesktopClient.Core
+{
+    public static class UpdateManager
+    {
+        private static bool _updateAvailable = false;
+        private static string _updateMessage = String.Empty;
+        private static string _updateDetails = String.Empty;
+
+        public static async Task<(bool updateAvailable, string updateMessage, string updateDetails)> CheckForUpdate()
+        {
+            if (_updateAvailable == true)
+                return (_updateAvailable, _updateMessage, _updateDetails);
+            else
+            {
+                _updateDetails = String.Empty;
+
+                using (HttpClient client = new HttpClient(new HttpClientHandler() { AllowAutoRedirect = false }))
+                {
+                    // github will always redirect releases/latest to a latest version tag
+                    using (HttpResponseMessage response = await client.GetAsync(@"https://github.com/nelinory/SupernoteDesktopClient/releases/latest"))
+                    {
+                        try
+                        {
+                            string redirect = response.Headers.Location.ToString();
+                            if (String.IsNullOrWhiteSpace(redirect) == false)
+                            {
+                                string githubVersion = redirect.Substring(redirect.LastIndexOf("/") + 1);
+                                string currentVersion = ApplicationManager.GetAssemblyVersion();
+
+                                if (String.CompareOrdinal(githubVersion, currentVersion) > 0)
+                                {
+                                    _updateAvailable = true;
+                                    _updateDetails = $"View {githubVersion} release details.";
+                                }
+                            }
+                        }
+                        catch (Exception)
+                        {
+                            _updateAvailable = false;
+                        }
+                    }
+                }
+
+                _updateMessage = (_updateAvailable == true)
+                    ? "There is a new release of Supernote Desktop Client available."
+                    : "You already have the latest version of Supernote Desktop Client installed.";
+
+                return (_updateAvailable, _updateMessage, _updateDetails);
+            }
+        }
+
+        public static (bool updateAvailable, string updateMessage, string updateDetails) GetUpdateDetails()
+        {
+            return (_updateAvailable, _updateMessage, _updateDetails);
+        }
+    }
+}

Extensions/StringExtensions.cs

@@ -15,7 +15,7 @@ public static string MaskSerialNumber(this string value)
 
             if (value.Length > totaUnmaskedCharacters)
             {
-                return value.Substring(0, unmaskedStartCharacters) + new String('X', value.Length - totaUnmaskedCharacters) + value.Substring(value.Length - unmaskedEdnCharacters);
+                return String.Concat(value.AsSpan(0, unmaskedStartCharacters), new String('X', value.Length - totaUnmaskedCharacters), value.AsSpan(value.Length - unmaskedEdnCharacters));
             }
             else
                 return value;

Core/TaskExtension.cs Extensions/TaskExtension.csCore/TaskExtension.cs renamed to Extensions/TaskExtension.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace SupernoteDesktopClient.Core
+namespace SupernoteDesktopClient.Extensions
 {
     public static class TaskExtension
     {

Models/MediaDeviceChangedMessage.cs Messages/MediaDeviceChangedMessage.csModels/MediaDeviceChangedMessage.cs renamed to Messages/MediaDeviceChangedMessage.cs

@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.Messaging.Messages;
 
-namespace SupernoteDesktopClient.Models
+namespace SupernoteDesktopClient.Messages
 {
     public class MediaDeviceChangedMessage : ValueChangedMessage<DeviceInfo>
     {

Models/SettingsChangedMessage.cs Messages/SettingsChangedMessage.csModels/SettingsChangedMessage.cs renamed to Messages/SettingsChangedMessage.cs

@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.Messaging.Messages;
 
-namespace SupernoteDesktopClient.Models
+namespace SupernoteDesktopClient.Messages
 {
     public class SettingsChangedMessage : ValueChangedMessage<string>
     {

Models/FileSystemObjectInfo.cs

@@ -69,6 +69,7 @@ private void OnOpenSelectedItem(object parameter)
             }
             catch (Exception)
             {
+                // TODO: Error handling
             }
         }