From c806a1435e776ba941bc6588530b2ce12be0ac80 Mon Sep 17 00:00:00 2001
From: Dzmitry Neviadomski <nevack.d@gmail.com>
Date: Tue, 14 Jun 2022 18:17:02 +0300
Subject: [PATCH] [macOS] Fix Group auto-assigning based on NSPredicate (#3289)

* [macOS] Fix Group NSPredicate

Property was renames, but previously saved predicates were not updated.

* [macOS] Update xibs for creating Group NSPredicate with new name.

* [macOS] Allow execution for Group NSPredicate restored secured storage.
---
 macosx/GroupsController.mm        | 1 +
 macosx/Torrent.mm                 | 6 ++++++
 macosx/da.lproj/GroupRules.xib    | 4 ++--
 macosx/de.lproj/GroupRules.xib    | 4 ++--
 macosx/en.lproj/GroupRules.xib    | 4 ++--
 macosx/es.lproj/GroupRules.xib    | 4 ++--
 macosx/fr.lproj/GroupRules.xib    | 4 ++--
 macosx/it.lproj/GroupRules.xib    | 4 ++--
 macosx/nl.lproj/GroupRules.xib    | 4 ++--
 macosx/pt_PT.lproj/GroupRules.xib | 4 ++--
 macosx/ru.lproj/GroupRules.xib    | 4 ++--
 macosx/tr.lproj/GroupRules.xib    | 4 ++--
 12 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/macosx/GroupsController.mm b/macosx/GroupsController.mm
index 81b7e0f12..6035cdd19 100644
--- a/macosx/GroupsController.mm
+++ b/macosx/GroupsController.mm
@@ -424,6 +424,7 @@ GroupsController* fGroupsInstance = nil;
     }
 
     NSPredicate* predicate = [self autoAssignRulesForIndex:index];
+    [predicate allowEvaluation];
     BOOL eval = NO;
     @try
     {
diff --git a/macosx/Torrent.mm b/macosx/Torrent.mm
index f9aa5b235..054ee6223 100644
--- a/macosx/Torrent.mm
+++ b/macosx/Torrent.mm
@@ -2175,4 +2175,10 @@ bool trashDataFile(char const* filename, tr_error** error)
     }
 }
 
+// For backward comatibility for previously saved Group Predicates.
+- (NSArray<FileListNode*>*)fFlatFileList
+{
+    return self.flatFileList;
+}
+
 @end
diff --git a/macosx/da.lproj/GroupRules.xib b/macosx/da.lproj/GroupRules.xib
index 5f70e20a3..952c6556e 100644
--- a/macosx/da.lproj/GroupRules.xib
+++ b/macosx/da.lproj/GroupRules.xib
@@ -135,7 +135,7 @@ Gw
                                         <predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
                                             <array key="leftExpressionObject">
                                                 <expression type="keyPath">
-                                                    <string key="keyPath">fFlatFileList.name</string>
+                                                    <string key="keyPath">flatFileList.name</string>
                                                 </expression>
                                                 <expression type="keyPath">
                                                     <string key="keyPath">allTrackersFlat</string>
@@ -148,7 +148,7 @@ Gw
                                                     <items>
                                                         <menuItem title="Enhver fil" state="on" id="161">
                                                             <expression key="representedObject" type="keyPath">
-                                                                <string key="keyPath">fFlatFileList.name</string>
+                                                                <string key="keyPath">flatFileList.name</string>
                                                             </expression>
                                                         </menuItem>
                                                         <menuItem title="Enhver tracker" id="162">
diff --git a/macosx/de.lproj/GroupRules.xib b/macosx/de.lproj/GroupRules.xib
index 66b57e54d..c3e2b1032 100644
--- a/macosx/de.lproj/GroupRules.xib
+++ b/macosx/de.lproj/GroupRules.xib
@@ -135,7 +135,7 @@ Gw
                                         <predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
                                             <array key="leftExpressionObject">
                                                 <expression type="keyPath">
-                                                    <string key="keyPath">fFlatFileList.name</string>
+                                                    <string key="keyPath">flatFileList.name</string>
                                                 </expression>
                                                 <expression type="keyPath">
                                                     <string key="keyPath">allTrackersFlat</string>
@@ -148,7 +148,7 @@ Gw
                                                     <items>
                                                         <menuItem title="Name einer Datei" state="on" id="161">
                                                             <expression key="representedObject" type="keyPath">
-                                                                <string key="keyPath">fFlatFileList.name</string>
+                                                                <string key="keyPath">flatFileList.name</string>
                                                             </expression>
                                                         </menuItem>
                                                         <menuItem title="Genutzter Tracker" id="162">
diff --git a/macosx/en.lproj/GroupRules.xib b/macosx/en.lproj/GroupRules.xib
index df962ed5f..59b63b193 100644
--- a/macosx/en.lproj/GroupRules.xib
+++ b/macosx/en.lproj/GroupRules.xib
@@ -135,7 +135,7 @@ Gw
                                         <predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
                                             <array key="leftExpressionObject">
                                                 <expression type="keyPath">
-                                                    <string key="keyPath">fFlatFileList.name</string>
+                                                    <string key="keyPath">flatFileList.name</string>
                                                 </expression>
                                                 <expression type="keyPath">
                                                     <string key="keyPath">allTrackersFlat</string>
@@ -148,7 +148,7 @@ Gw
                                                     <items>
                                                         <menuItem title="Any File" state="on" id="161">
                                                             <expression key="representedObject" type="keyPath">
-                                                                <string key="keyPath">fFlatFileList.name</string>
+                                                                <string key="keyPath">flatFileList.name</string>
                                                             </expression>
                                                         </menuItem>
                                                         <menuItem title="Any Tracker" id="162">
diff --git a/macosx/es.lproj/GroupRules.xib b/macosx/es.lproj/GroupRules.xib
index c840f2440..c39110da0 100644
--- a/macosx/es.lproj/GroupRules.xib
+++ b/macosx/es.lproj/GroupRules.xib
@@ -135,7 +135,7 @@ Gw
                                         <predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
                                             <array key="leftExpressionObject">
                                                 <expression type="keyPath">
-                                                    <string key="keyPath">fFlatFileList.name</string>
+                                                    <string key="keyPath">flatFileList.name</string>
                                                 </expression>
                                                 <expression type="keyPath">
                                                     <string key="keyPath">allTrackersFlat</string>
@@ -148,7 +148,7 @@ Gw
                                                     <items>
                                                         <menuItem title="Cualquier archivo" state="on" id="161">
                                                             <expression key="representedObject" type="keyPath">
-                                                                <string key="keyPath">fFlatFileList.name</string>
+                                                                <string key="keyPath">flatFileList.name</string>
                                                             </expression>
                                                         </menuItem>
                                                         <menuItem title="Cualquier tracker" id="162">
diff --git a/macosx/fr.lproj/GroupRules.xib b/macosx/fr.lproj/GroupRules.xib
index e8abf5668..36e08fbad 100644
--- a/macosx/fr.lproj/GroupRules.xib
+++ b/macosx/fr.lproj/GroupRules.xib
@@ -135,7 +135,7 @@ Gw
                                         <predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
                                             <array key="leftExpressionObject">
                                                 <expression type="keyPath">
-                                                    <string key="keyPath">fFlatFileList.name</string>
+                                                    <string key="keyPath">flatFileList.name</string>
                                                 </expression>
                                                 <expression type="keyPath">
                                                     <string key="keyPath">allTrackersFlat</string>
@@ -148,7 +148,7 @@ Gw
                                                     <items>
                                                         <menuItem title="Un fichier" state="on" id="161">
                                                             <expression key="representedObject" type="keyPath">
-                                                                <string key="keyPath">fFlatFileList.name</string>
+                                                                <string key="keyPath">flatFileList.name</string>
                                                             </expression>
                                                         </menuItem>
                                                         <menuItem title="Un trackeur" id="162">
diff --git a/macosx/it.lproj/GroupRules.xib b/macosx/it.lproj/GroupRules.xib
index 3481221d1..cb54cc080 100644
--- a/macosx/it.lproj/GroupRules.xib
+++ b/macosx/it.lproj/GroupRules.xib
@@ -135,7 +135,7 @@ Gw
                                         <predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
                                             <array key="leftExpressionObject">
                                                 <expression type="keyPath">
-                                                    <string key="keyPath">fFlatFileList.name</string>
+                                                    <string key="keyPath">flatFileList.name</string>
                                                 </expression>
                                                 <expression type="keyPath">
                                                     <string key="keyPath">allTrackersFlat</string>
@@ -148,7 +148,7 @@ Gw
                                                     <items>
                                                         <menuItem title="Un qualsiasi file" state="on" id="161">
                                                             <expression key="representedObject" type="keyPath">
-                                                                <string key="keyPath">fFlatFileList.name</string>
+                                                                <string key="keyPath">flatFileList.name</string>
                                                             </expression>
                                                         </menuItem>
                                                         <menuItem title="Un qualsiasi server traccia" id="162">
diff --git a/macosx/nl.lproj/GroupRules.xib b/macosx/nl.lproj/GroupRules.xib
index 5f0c12857..22216fbb8 100644
--- a/macosx/nl.lproj/GroupRules.xib
+++ b/macosx/nl.lproj/GroupRules.xib
@@ -135,7 +135,7 @@ Gw
                                         <predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
                                             <array key="leftExpressionObject">
                                                 <expression type="keyPath">
-                                                    <string key="keyPath">fFlatFileList.name</string>
+                                                    <string key="keyPath">flatFileList.name</string>
                                                 </expression>
                                                 <expression type="keyPath">
                                                     <string key="keyPath">allTrackersFlat</string>
@@ -148,7 +148,7 @@ Gw
                                                     <items>
                                                         <menuItem title="Elk bestand" state="on" id="161">
                                                             <expression key="representedObject" type="keyPath">
-                                                                <string key="keyPath">fFlatFileList.name</string>
+                                                                <string key="keyPath">flatFileList.name</string>
                                                             </expression>
                                                         </menuItem>
                                                         <menuItem title="Elke tracker" id="162">
diff --git a/macosx/pt_PT.lproj/GroupRules.xib b/macosx/pt_PT.lproj/GroupRules.xib
index 136494668..99af4a255 100644
--- a/macosx/pt_PT.lproj/GroupRules.xib
+++ b/macosx/pt_PT.lproj/GroupRules.xib
@@ -135,7 +135,7 @@ Gw
                                         <predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
                                             <array key="leftExpressionObject">
                                                 <expression type="keyPath">
-                                                    <string key="keyPath">fFlatFileList.name</string>
+                                                    <string key="keyPath">flatFileList.name</string>
                                                 </expression>
                                                 <expression type="keyPath">
                                                     <string key="keyPath">allTrackersFlat</string>
@@ -148,7 +148,7 @@ Gw
                                                     <items>
                                                         <menuItem title="Qualquer ficheiro" state="on" id="161">
                                                             <expression key="representedObject" type="keyPath">
-                                                                <string key="keyPath">fFlatFileList.name</string>
+                                                                <string key="keyPath">flatFileList.name</string>
                                                             </expression>
                                                         </menuItem>
                                                         <menuItem title="Qualquer tracker" id="162">
diff --git a/macosx/ru.lproj/GroupRules.xib b/macosx/ru.lproj/GroupRules.xib
index e0d07a91c..8dd311e3f 100644
--- a/macosx/ru.lproj/GroupRules.xib
+++ b/macosx/ru.lproj/GroupRules.xib
@@ -135,7 +135,7 @@ Gw
                                         <predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
                                             <array key="leftExpressionObject">
                                                 <expression type="keyPath">
-                                                    <string key="keyPath">fFlatFileList.name</string>
+                                                    <string key="keyPath">flatFileList.name</string>
                                                 </expression>
                                                 <expression type="keyPath">
                                                     <string key="keyPath">allTrackersFlat</string>
@@ -148,7 +148,7 @@ Gw
                                                     <items>
                                                         <menuItem title="Любой файл" state="on" id="161">
                                                             <expression key="representedObject" type="keyPath">
-                                                                <string key="keyPath">fFlatFileList.name</string>
+                                                                <string key="keyPath">flatFileList.name</string>
                                                             </expression>
                                                         </menuItem>
                                                         <menuItem title="Любой трекер" id="162">
diff --git a/macosx/tr.lproj/GroupRules.xib b/macosx/tr.lproj/GroupRules.xib
index 1c09f474d..5f8f54a21 100644
--- a/macosx/tr.lproj/GroupRules.xib
+++ b/macosx/tr.lproj/GroupRules.xib
@@ -135,7 +135,7 @@ Gw
                                         <predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
                                             <array key="leftExpressionObject">
                                                 <expression type="keyPath">
-                                                    <string key="keyPath">fFlatFileList.name</string>
+                                                    <string key="keyPath">flatFileList.name</string>
                                                 </expression>
                                                 <expression type="keyPath">
                                                     <string key="keyPath">allTrackersFlat</string>
@@ -148,7 +148,7 @@ Gw
                                                     <items>
                                                         <menuItem title="Dosya" state="on" id="161">
                                                             <expression key="representedObject" type="keyPath">
-                                                                <string key="keyPath">fFlatFileList.name</string>
+                                                                <string key="keyPath">flatFileList.name</string>
                                                             </expression>
                                                         </menuItem>
                                                         <menuItem title="İzleyici" id="162">