Merge pull request #102 from jibedoubleve/issue_100-99-98

Fix Issues
#100,
#99,
#98

src/Lanceur.Core/Services/IDataService.cs

@@ -65,6 +65,13 @@ public interface IDataService
         /// <returns>Points of the chart</returns>
         IEnumerable<DataPoint<DateTime, double>> GetUsage(Per per, long? idSession = null);
 
+        /// <summary>
+        /// Hydrate the macro with its <c>id</c> and <c>count</c>. This method will try to find the 
+        /// macro by using its name  that should be something like '@it_s_name@'
+        /// </summary>
+        /// <param name="alias">Macro to hydrate</param>
+        void HydrateMacro(QueryResult alias);
+
         /// <summary>
         /// Update the usage of the specified <see cref="QueryResult"/>
         /// </summary>

src/Lanceur.Infra.SQLite/Models/Tuple.cs

@@ -0,0 +1,8 @@
+namespace Lanceur.Infra.SQLite
+{
+    internal record Tuple<T1, T2>
+    {
+        public T1 Item1 { get; set; }
+        public T2 Item2 { get; set; }
+    }
+}

src/Lanceur.Infra.SQLite/SQLiteAppSettingsService.cs

@@ -15,7 +15,7 @@ public class SQLiteAppSettingsService : SQLiteServiceBase, IAppSettingsService
             "IdSession",
             "ShowAtStartup",
             "HotKey.Key",
-            "HotKey.ModifierKeys",
+            "HotKey.ModifierKey",
             "Repository.ScoreLimit",
             "Window.Position.Left",
             "Window.Position.Top",
@@ -97,7 +97,8 @@ public void Save(AppSettings settings)
 
             foreach (var item in Keys)
             {
-                DB.Connection.Execute(sql, new { key = item, value = settings.GetPropValue(item) });
+                var value = settings.GetPropValue(item);
+                DB.Connection.Execute(sql, new { key = item, value });
             }
         }
 

src/Lanceur.Infra.SQLite/SQLiteDataService.cs

@@ -6,7 +6,7 @@
 
 namespace Lanceur.Infra.SQLite
 {
-    public class SQLiteDataService : SQLiteServiceBase, IDataService
+    public partial class SQLiteDataService : SQLiteServiceBase, IDataService
     {
         #region Fields
 
@@ -161,6 +161,30 @@ public IEnumerable<DataPoint<DateTime, double>> GetUsage(Per per, long? idSessio
             };
         }
 
+        public void HydrateMacro(QueryResult alias)
+        {
+            var sql = @"
+            select
+	            a.id        as Item1,
+                count(a.id) as Item2
+            from
+	            alias a
+                inner join alias_usage au on a.id = au.id_alias
+            where
+	            file_name like @name
+            group by
+	            a.id  ";
+
+            var results = DB.Connection.Query<Tuple<int, int>>(sql, new { name = alias.Name });
+
+            if (results.Count() == 1)
+            {
+                var item = results.ElementAt(0);
+                alias.Id = item.Item1;
+                alias.Count = item.Item2;
+            }
+        }
+
         public IEnumerable<QueryResult> RefreshUsage(IEnumerable<QueryResult> result) => _aliasDbAction.RefreshUsage(result);
 
         public void Remove(AliasQueryResult alias) => _aliasDbAction.Remove(alias);

src/Lanceur.Infra/Managers/MacroManager.cs

@@ -15,16 +15,18 @@ public class MacroManager : IMacroManager
 
         private static Dictionary<string, ExecutableQueryResult> _macroInstances = null;
         private readonly Assembly _asm;
+        private readonly IDataService _dataService;
         private readonly IAppLogger _log;
 
         #endregion Fields
 
         #region Constructors
 
-        public MacroManager(Assembly asm, IAppLoggerFactory logFactory = null)
+        public MacroManager(Assembly asm, IAppLoggerFactory logFactory = null, IDataService dataService = null)
         {
             _asm = asm;
             _log = Locator.Current.GetLogger<MacroManager>(logFactory);
+            _dataService = Locator.Current.GetService<IDataService>();
         }
 
         #endregion Constructors
@@ -50,6 +52,8 @@ where t.GetCustomAttributes<MacroAttribute>().Any()
 
                         var description = (type.GetCustomAttribute(typeof(DescriptionAttribute)) as DescriptionAttribute)?.Description;
                         alias.SetDescription(description);
+
+                        _dataService.HydrateMacro(alias);
 
                         macroInstances.Add(name, alias);
                         _log.Info($"Found macro '{name}'");
@@ -95,7 +99,7 @@ public QueryResult Handle(QueryResult item)
                 }
                 else
                 {
-                    /* Well, this a misconfigured macro, log it and forget it */
+                    /* Well, this is a misconfigured macro, log it and forget it */
                     _log.Warning($"User has misconfigured a Macro with name '{src.FileName}'. Fix the name of the macro or remove the alias from the database.");
                     return null;
                 }

src/Lanceur.Infra/Services/SearchService.cs

@@ -73,6 +73,7 @@ public IEnumerable<QueryResult> Search(Cmdline query)
                 results.AddRange(res);
             }
 
+            // Remember the query
             foreach (var result in results) { result.Query = query; }
 
             if (results.Any())
@@ -86,8 +87,14 @@ public IEnumerable<QueryResult> Search(Cmdline query)
 
                 // Updgrade alias to executable macro and return the result
                 var toReturn = _macroManager.Handle(results);
+
+                //Refresh the thumbnails
                 _thumbnailManager.RefreshThumbnails(toReturn);
-                return toReturn;
+
+                // Order the list and return the result
+                return toReturn
+                        .OrderByDescending(e => e.Count)
+                        .ThenBy(e => e.Name);
             }
             else { return DisplayQueryResult.SingleFromResult("No result found", iconKind: "AlertCircleOutline"); }
         }

src/Lanceur/Lanceur.csproj

@@ -11,6 +11,7 @@
   <ItemGroup>
     <None Remove="SQL\script-0.1.1.sql" />
     <None Remove="SQL\script-0.1.sql" />
+    <None Remove="SQL\script-0.10.sql" />
     <None Remove="SQL\script-0.2.sql" />
     <None Remove="SQL\script-0.3.sql" />
     <None Remove="SQL\script-0.4.1.sql" />
@@ -31,6 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="SQL\script-0.10.sql" />
     <EmbeddedResource Include="SQL\script-0.9.sql" />
     <EmbeddedResource Include="SQL\script-0.8.sql" />
     <EmbeddedResource Include="SQL\script-0.7.sql" />

src/Lanceur/SQL/script-0.10.sql

@@ -0,0 +1,12 @@
+/*
+ * Add into the database the default values into the Settings table
+ */
+
+ insert into settings (s_key, s_value)
+select
+	'HotKey.ModifierKey',
+  s_value
+from settings  
+where s_key = 'HotKey.ModifierKeys';
+
+delete from settings where s_key = 'HotKey.ModifierKeys';

src/Lanceur/Views/AppSettingsViewModel.cs

@@ -103,7 +103,6 @@ public AppSettingsViewModel(
 
         private TimeSpan GetDelay()
         {
-            _settings.Save(Context.AppSettings);
             var delay = Context.AppSettings.RestartDelay;
             var time = TimeSpan.FromMilliseconds(delay);
             return time;
@@ -123,15 +122,18 @@ private ActivationContext OnActivate()
 
         private async void OnSaveSettings()
         {
-            //Save DB Path
+            //Save DB Path in property file
             _stg[Setting.DbPath] = DbPath?.Replace("\"", "");
             _stg.Save();
 
-            // Save hotkey & Session
+            // Save hotkey & Session in DB
             Context.AppSettings.RestartDelay = RestartDelay;
             Context.AppSettings.HotKey = HotKeySection;
             if (CurrentSession is not null) { Context.AppSettings.IdSession = CurrentSession.Id; }
 
+            //Save settings
+            _settings.Save(Context.AppSettings);
+
             TimeSpan time = GetDelay();
             Toast.Information($"Application settings saved. Restart in {time.TotalMilliseconds} milliseconds");
             await _delay.Of(time);