Added support for non global persistent variables

- removed flat symbols checkbox because buggy - minor fixes and better logging into RestoreViewModel - related to #17
fbarresi · Apr 26, 2021 · c4dbaaa · c4dbaaa
1 parent 3fa7911
commit c4dbaaa
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 33 deletions.
diff --git a/TwinCatAdsTool.Gui/ViewModels/BackupViewModel.cs b/TwinCatAdsTool.Gui/ViewModels/BackupViewModel.cs
@@ -23,7 +23,6 @@ public class BackupViewModel : ViewModelBase
         private readonly Subject<JObject> variableSubject = new Subject<JObject>();
         private string backupText;
         private ObservableAsPropertyHelper<string> currentTaskHelper;
-        private bool useFlatSymbolList;
 
         public BackupViewModel(IClientService clientService, IPersistentVariableService persistentVariableService)
         {
@@ -45,17 +44,6 @@ public string BackupText
         public ReactiveCommand<Unit, Unit> Read { get; set; }
         public ReactiveCommand<Unit, Unit> Save { get; set; }
 
-        public bool UseFlatSymbolList
-        {
-            get => useFlatSymbolList;
-            set
-            {
-                if (value == useFlatSymbolList) return;
-                useFlatSymbolList = value;
-                raisePropertyChanged();
-            }
-        }
-
         public override void Init()
         {
             variableSubject
@@ -79,8 +67,9 @@ public override void Init()
 
         private async Task<Unit> ReadVariables()
         {
-            var persistentVariables = await persistentVariableService.ReadGlobalPersistentVariables(clientService.Client, 
-                UseFlatSymbolList ? clientService.FlatViewSymbols : clientService.TreeViewSymbols);
+            var persistentVariables = await persistentVariableService.ReadGlobalPersistentVariables(
+                clientService.Client, 
+                clientService.TreeViewSymbols);
             variableSubject.OnNext(persistentVariables);
             Logger.Debug(Resources.ReadPersistentVariables);
 

diff --git a/TwinCatAdsTool.Gui/ViewModels/RestoreViewModel.cs b/TwinCatAdsTool.Gui/ViewModels/RestoreViewModel.cs
@@ -172,26 +172,39 @@ private async Task<Unit> WriteVariables()
             {
                 foreach (var variable in DisplayVariables)
                 {
-                    try
+                    var jObject = await JObject.LoadAsync(new JsonTextReader(new StringReader(variable.Json)));
+
+                    foreach (var p in jObject.Properties())
                     {
-                        var jObject = JObject.Load(new JsonTextReader(new StringReader(variable.Json)));
-                        foreach (var p in jObject.Properties())
+                        try
                         {
                             Logger.Debug($"Restoring variable '{variable.Name}.{p.Name}' from backup...");
-                            if(p.Value is JObject)
-                                await clientService.Client.WriteJson(variable.Name + "." + p.Name, (JObject) p.Value, force: true);
-                            else if(p.Value is JArray)
-                                await clientService.Client.WriteJson(variable.Name + "." + p.Name, (JArray) p.Value, force: true);
-                            else if (p.Value is JValue)
-                                await clientService.Client.WriteAsync(variable.Name + "." + p.Name, p.Value);
-                            else
-                                Logger.Error($"Unable to write variable '{variable.Name}.{p.Name}' from backup: no type case match!");
+                            switch (p.Value)
+                            {
+                                case JObject value:
+                                    await clientService.Client.WriteJson(variable.Name + "." + p.Name, value,
+                                        force: true);
+                                    break;
+                                case JArray array:
+                                    await clientService.Client.WriteJson(variable.Name + "." + p.Name, array,
+                                        force: true);
+                                    break;
+                                case JValue:
+                                    await clientService.Client.WriteAsync(variable.Name + "." + p.Name, p.Value);
+                                    break;
+                                default:
+                                    Logger.Error(
+                                        $"Unable to write variable '{variable.Name}.{p.Name} := {p.Value.ToString(Formatting.None)}' from backup: no type case match!");
+                                    break;
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            Logger.Error($"Unable to write variable '{variable.Name}.{p.Name} := {p.Value.ToString(Formatting.None)}' from backup!", ex);
+                            MessageBox.Show($"{variable.Name}.{p.Name} := {p.Value.ToString(Formatting.None)} \n {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
                         }
                     }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show($"{ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    }
+
                 }
             }
 

diff --git a/TwinCatAdsTool.Gui/Views/BackupView.xaml b/TwinCatAdsTool.Gui/Views/BackupView.xaml
@@ -29,7 +29,6 @@
                     >
             </Button>
 
-            <CheckBox IsChecked="{Binding UseFlatSymbolList, UpdateSourceTrigger=PropertyChanged}" Margin="16" Content="{x:Static properties:Resources.UseFlatSymbolList}"/>
             <Label Margin="24,16,0,16" Content="{Binding CurrentTask}"/>
 
 

diff --git a/TwinCatAdsTool.Logic/Services/PersistentVariableService.cs b/TwinCatAdsTool.Logic/Services/PersistentVariableService.cs
@@ -30,14 +30,20 @@ public async Task<JObject> ReadGlobalPersistentVariables(AdsClient client, IInst
             {
                 if (client.IsConnected)
                 {
-                    var iterator = new SymbolIterator(symbols, s => s.IsPersistent && s.InstancePath.Split('.').Length == 2 && !s.InstancePath.Contains("["));
+                    var iterator = new SymbolIterator(symbols,
+                            s => s.IsPersistent && s.InstancePath.Split('.').Length >= 2 &&
+                                 !s.InstancePath.Contains("["))
+                        ;
+
+                    var peristentSymbols = iterator.Where(s => s.Parent != null ? !iterator.Contains(s.Parent) : true);
 
                     var variables = new Dictionary<string, List<JObject>>();
-                    foreach (var symbol in iterator)
+                    foreach (var symbol in peristentSymbols)
                     {
                         var splitPath = symbol.InstancePath.Split('.');
-                        var globalName = splitPath.First();
                         var localName = splitPath.Last();
+                        var globalName = symbol.InstancePath.Replace($".{localName}", string.Empty);
+
                         if (!variables.ContainsKey(globalName))
                         {
                             variables.Add(globalName, new List<JObject>());