use clipId to update database

fuzzzerd · Sep 29, 2023 · 4ccbf38 · 4ccbf38
1 parent 9434c5a
commit 4ccbf38
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 14 deletions.
diff --git a/SharpFM.App/MainWindow.axaml b/SharpFM.App/MainWindow.axaml
@@ -21,17 +21,18 @@
             <MenuItem Header="_File">
                 <MenuItem Command="{Binding NewEmptyItem}" Header="_New" />
                 <Separator />
+                <MenuItem Command="{Binding SaveToDb}" Header="Save All" />
+                <Separator />
                 <MenuItem Command="{Binding ExitApplication}" Header="_Exit" />
             </MenuItem>
             <MenuItem Header="_Edit">
-                <MenuItem Command="{Binding CopySelectedToClip}" Header="Copy" />
-                <MenuItem Command="{Binding PasteFileMakerClipData}" Header="Paste" />
+                <MenuItem Command="{Binding CopySelectedToClip}" Header="Copy as FileMaker Blob" />
+                <MenuItem Command="{Binding PasteFileMakerClipData}" Header="Paste From FileMaker Blob" />
             </MenuItem>
             <MenuItem Header="Transform">
                 <MenuItem Command="{Binding CopyAsClass}" Header="Copy as C# Class" />
             </MenuItem>
             <MenuItem Header="Storage">
-                <MenuItem Command="{Binding SaveToDb}" Header="Save Db" />
                 <MenuItem Command="{Binding ClearDb}" Header="Clear Db" />
             </MenuItem>
             <MenuItem Header="{Binding Version}" />

diff --git a/SharpFM.App/ViewModels/ClipViewModel.cs b/SharpFM.App/ViewModels/ClipViewModel.cs
@@ -15,9 +15,23 @@ private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
 
     public FileMakerClip Clip { get; set; }
 
-    public ClipViewModel(FileMakerClip clip)
+    public ClipViewModel(FileMakerClip clip) : this(clip, null) { }
+
+    public ClipViewModel(FileMakerClip clip, int? clipId)
     {
         Clip = clip;
+        ClipId = clipId;
+    }
+
+    private int? _clipId;
+    public int? ClipId
+    {
+        get => _clipId;
+        set
+        {
+            _clipId = value;
+            NotifyPropertyChanged();
+        }
     }
 
     public string ClipType

diff --git a/SharpFM.App/ViewModels/MainWindowViewModel.cs b/SharpFM.App/ViewModels/MainWindowViewModel.cs
@@ -31,16 +31,17 @@ public MainWindowViewModel()
 
         Console.WriteLine($"Database path: {_context.DbPath}.");
 
-        Keys = new ObservableCollection<ClipViewModel>();
+        FileMakerClips = new ObservableCollection<ClipViewModel>();
 
         foreach (var clip in _context.Clips)
         {
-            Keys.Add(new ClipViewModel(
+            FileMakerClips.Add(new ClipViewModel(
                     new FileMakerClip(
                         clip.ClipName,
                         clip.ClipType,
                         clip.ClipXml
-                    )
+                    ),
+                    clip.ClipId
                 )
             );
         }
@@ -50,11 +51,12 @@ public void SaveToDb()
     {
         var dbClips = _context.Clips.ToList();
 
-        foreach (var clip in Keys)
+        foreach (var clip in FileMakerClips)
         {
-            if (dbClips.Any(dbc => dbc.ClipName == clip.Name))
+            var dbClip = dbClips.FirstOrDefault(dbc => dbc.ClipName == clip.Name);
+
+            if (dbClip is not null)
             {
-                var dbClip = dbClips.First(dbc => dbc.ClipName == clip.Name);
                 dbClip.ClipType = clip.ClipType;
                 dbClip.ClipXml = clip.ClipXml;
             }
@@ -99,7 +101,7 @@ public void NewEmptyItem()
             var clip = new FileMakerClip("New", FileMakerClip.ClipTypes.First()?.KeyId ?? "", Array.Empty<byte>());
             var clipVm = new ClipViewModel(clip);
 
-            Keys.Add(clipVm);
+            FileMakerClips.Add(clipVm);
         }
         catch (Exception e)
         {
@@ -160,12 +162,12 @@ public async Task PasteFileMakerClipData()
 
                 // don't bother adding a duplicate. For some reason entries were getting entered twice per clip
                 // this is not the most efficient method to detect it, but it works well enough for now
-                if (Keys.Any(k => k.ClipXml == clip.XmlData))
+                if (FileMakerClips.Any(k => k.ClipXml == clip.XmlData))
                 {
                     continue;
                 }
 
-                Keys.Add(new ClipViewModel(clip));
+                FileMakerClips.Add(new ClipViewModel(clip));
             }
         }
         catch (Exception e)
@@ -198,6 +200,9 @@ public async Task CopySelectedToClip()
         }
     }
 
+    /// <summary>
+    /// SharpFM Version.
+    /// </summary>
     public string Version
     {
         get
@@ -208,7 +213,7 @@ public string Version
         }
     }
 
-    public ObservableCollection<ClipViewModel> Keys { get; set; }
+    public ObservableCollection<ClipViewModel> FileMakerClips { get; set; }
 
     private ClipViewModel? _selectedClip;
     public ClipViewModel? SelectedClip