Refactor a code

milchchan · Dec 12, 2023 · 9c51cd5 · 9c51cd5
1 parent fb6dd06
commit 9c51cd5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Apricot/Agent.xaml.cs b/Apricot/Agent.xaml.cs
@@ -1464,7 +1464,7 @@ public Agent(string name)
 
                                             character.Likes += 1;
 
-                                            Script.Instance.TryEnqueue(Script.Instance.Prepare(from sequence in Script.Instance.Sequences where sequence.Name!.Equals("Like") && sequence.Owner!.Equals(this.characterName) select sequence, character.Likes.ToString(System.Globalization.CultureInfo.InvariantCulture)));
+                                            Script.Instance.Run(from sequence in Script.Instance.Sequences where sequence.Name!.Equals("Like") && sequence.Owner!.Equals(this.characterName) select sequence, character.Likes.ToString(System.Globalization.CultureInfo.InvariantCulture));
 
                                             backgroundBrush = new SolidColorBrush(Color.FromArgb((byte)(backgroundColor.A * 75 / 100), backgroundColor.R, backgroundColor.G, backgroundColor.B));
 
@@ -3871,7 +3871,7 @@ protected override void OnMouseDoubleClick(MouseButtonEventArgs e)
 
                     foreach (Motion motion in query)
                     {
-                        Script.Instance.TryEnqueue(Script.Instance.Prepare(q, motion.Current.Path));
+                        Script.Instance.Run(q, motion.Current.Path);
                     }
                 }
             }

diff --git a/Apricot/Script.cs b/Apricot/Script.cs
@@ -5743,6 +5743,11 @@ public void Resume()
             }
         }
 
+        public void Run(IEnumerable<Sequence> sequences, string? state)
+        {
+            TryEnqueue(Prepare(sequences, state));
+        }
+
         public IEnumerable<Sequence> Prepare(IEnumerable<Sequence> sequences, string? state)
         {
             return Prepare(sequences, state, delegate (IEnumerable<Sequence> collection)

diff --git a/Weather/WeatherExtension.cs b/Weather/WeatherExtension.cs
@@ -323,7 +323,7 @@ private async void Update(Geocoordinate geocoordinate)
 
                     while (queue.Count > 0)
                     {
-                        Script.Instance.TryEnqueue(Script.Instance.Prepare(sequenceList, queue.Dequeue()));
+                        Script.Instance.Run(sequenceList, queue.Dequeue());
                     }
                 }
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -323,7 +323,7 @@ private async void Update(Geocoordinate geocoordinate) @@
                         while (queue.Count > 0)
                         {
-                            Script.Instance.TryEnqueue(Script.Instance.Prepare(sequenceList, queue.Dequeue()));
+                            Script.Instance.Run(sequenceList, queue.Dequeue());
                         }
                     }
                 }
@@ Expand Down @@