Merge branch 'dev' into Remove-trim-from-query

Author: taooceros

.github/workflows/stale.yml

@@ -0,0 +1,23 @@
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v4
+        with:
+          stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
+          days-before-stale: 30
+          days-before-close: 5
+          days-before-pr-close: -1
+          exempt-all-milestones: true
+          close-issue-message: 'This issue was closed because it has been stale for 5 days with no activity. If you feel this issue still needs attention please feel free to reopen.'

Flow.Launcher.Core/Flow.Launcher.Core.csproj

@@ -53,7 +53,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Droplex" Version="1.4.0" />
+    <PackageReference Include="Droplex" Version="1.4.1" />
     <PackageReference Include="FSharp.Core" Version="5.0.2" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.1.3" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" />

Flow.Launcher/Themes/Base.xaml

@@ -6,7 +6,6 @@
 using System.Windows;
 using System.Windows.Controls;
 using Mages.Core;
-using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Plugin.Caculator.ViewModels;
 using Flow.Launcher.Plugin.Caculator.Views;
 
@@ -25,6 +24,9 @@ public class Main : IPlugin, IPluginI18n, ISettingProvider
                         @")+$", RegexOptions.Compiled);
         private static readonly Regex RegBrackets = new Regex(@"[\(\)\[\]]", RegexOptions.Compiled);
         private static Engine MagesEngine;
+        private const string comma = ",";
+        private const string dot = ".";
+
         private PluginInitContext Context { get; set; }
 
         private static Settings _settings;
@@ -35,7 +37,7 @@ public void Init(PluginInitContext context)
             Context = context;
             _settings = context.API.LoadSettingJsonStorage<Settings>();
             _viewModel = new SettingsViewModel(_settings);
-            
+
             MagesEngine = new Engine(new Configuration
             {
                 Scope = new Dictionary<string, object>
@@ -54,7 +56,19 @@ public List<Result> Query(Query query)
 
             try
             {
-                var expression = query.Search.Replace(",", ".");
+                string expression;
+
+                switch (_settings.DecimalSeparator)
+                {
+                    case DecimalSeparator.Comma:
+                    case DecimalSeparator.UseSystemLocale when CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator == ",":
+                        expression = query.Search.Replace(",", ".");
+                        break;
+                    default:
+                        expression = query.Search;
+                        break;
+                }
+
                 var result = MagesEngine.Interpret(expression);
 
                 if (result?.ToString() == "NaN")
@@ -76,6 +90,7 @@ public List<Result> Query(Query query)
                             IcoPath = "Images/calculator.png",
                             Score = 300,
                             SubTitle = Context.API.GetTranslation("flowlauncher_plugin_calculator_copy_number_to_clipboard"),
+                            CopyText = newResult,
                             Action = c =>
                             {
                                 try
@@ -119,6 +134,10 @@ private bool CanCalculate(Query query)
                 return false;
             }
 
+            if ((query.Search.Contains(dot) && GetDecimalSeparator() != dot) ||
+                (query.Search.Contains(comma) && GetDecimalSeparator() != comma))
+                return false;
+
             return true;
         }
 
@@ -142,8 +161,8 @@ private string GetDecimalSeparator()
             switch (_settings.DecimalSeparator)
             {
                 case DecimalSeparator.UseSystemLocale: return systemDecimalSeperator;
-                case DecimalSeparator.Dot: return ".";
-                case DecimalSeparator.Comma: return ",";
+                case DecimalSeparator.Dot: return dot;
+                case DecimalSeparator.Comma: return comma;
                 default: return systemDecimalSeperator;
             }
         }

Plugins/Flow.Launcher.Plugin.Calculator/Main.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+
 namespace Flow.Launcher.Plugin.Caculator
 {
     public class Settings

Plugins/Flow.Launcher.Plugin.Calculator/Settings.cs

@@ -4,7 +4,7 @@
   "Name": "Calculator",
   "Description": "Provide mathematical calculations.(Try 5*3-2 in Flow Launcher)",
   "Author": "cxfksword",
-  "Version": "1.1.9",
+  "Version": "1.1.10",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Caculator.dll",

Plugins/Flow.Launcher.Plugin.Calculator/plugin.json

@@ -51,8 +51,11 @@ Dedicated to making your workflow flow more seamless. Search everything from app
 
 ### Installation
 
-| [Windows 7+ installer](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest/download/Flow-Launcher-Setup.exe) | [Portable](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest/download/Flow-Launcher-Portable.zip) | `winget install "Flow Launcher"` | `scoop install Flow-Launcher` |
-| :----------------------------------------------------------: | :----------------------------------------------------------: | :------------------------------: | :------------------------------: |
+| [Windows 7+ installer](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest/download/Flow-Launcher-Setup.exe) | [Portable](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest/download/Flow-Launcher-Portable.zip) |
+| :----------------------------------------------------------: | :----------------------------------------------------------: |
+
+| `winget install "Flow Launcher"` | `scoop install Flow-Launcher` | `choco install Flow-Launcher` |
+| :------------------------------: | :------------------------------: | :------------------------------: |
 
 > When installing for the first time Windows may raise an issue about security due to code not being signed, if you downloaded from this repo then you are good to continue the set up.