Add handling of {{p|ubisoftconnect}}, and fix store assignment when you buy a game on Steam but the saves are in the Ubisoft Connect root

data/manifest.yaml

@@ -18941,32 +18941,33 @@ Assassin's Creed Unity:
       when:
         - os: windows
           store: uplay
+    <root>/savegames/<storeUserId>/857:
+      tags:
+        - save
+      when:
+        - store: uplay
     <winDocuments>/Assassin's Creed Unity/ACU.ini:
       tags:
         - config
       when:
         - os: windows
-    '{{P|ubisoftconnect}}/savegames/<storeUserId>/857':
-      tags:
-        - save
-      when:
-        - store: steam
   installDir:
     Assassin's Creed Unity: {}
   steam:
     id: 289650
 Assassin's Creed Valhalla:
   files:
+    <root>/savegames/<storeUserId>/13504:
+      tags:
+        - save
+      when:
+        - os: windows
+          store: uplay
     <winDocuments>/Assassin's Creed Valhalla:
       tags:
         - config
       when:
         - os: windows
-    '{{p|ubisoftconnect}}/savegames/<storeUserId>/13504':
-      tags:
-        - save
-      when:
-        - os: windows
 'Assassin''s Creed: Brotherhood':
   files:
     <home>/Saved Games/Assassin's Creed Brotherhood:
@@ -124943,16 +124944,17 @@ Immortals:
     id: 883270
 Immortals Fenyx Rising:
   files:
+    <root>/savegames/<storeUserId>/5405:
+      tags:
+        - save
+      when:
+        - os: windows
+          store: uplay
     <winDocuments>/Immortals Fenyx Rising:
       tags:
         - config
       when:
         - os: windows
-    '{{p|ubisoftconnect}}/savegames/<storeUserId>/5405':
-      tags:
-        - save
-      when:
-        - os: windows
 Immune - True Survival:
   installDir:
     Immune: {}
@@ -286813,16 +286815,17 @@ Watch Dogs 2:
     id: 447040
 'Watch Dogs: Legion':
   files:
+    <root>/savegames/<storeUserId>/3353:
+      tags:
+        - save
+      when:
+        - os: windows
+          store: uplay
     <winDocuments>/My Games/Watch Dogs Legion/WD3_GamerProfile.xml:
       tags:
         - config
       when:
         - os: windows
-    '{{p|ubisoftconnect}}/savegames/<storeUserId>/3353':
-      tags:
-        - save
-      when:
-        - os: windows
   registry:
     HKEY_CURRENT_USER/SOFTWARE/Ubisoft/WatchDogsLegion:
       tags:

src/wiki.ts

@@ -124,6 +124,12 @@ const PATH_ARGS: { [arg: string]: { mapped: string, when?: Constraint, registry?
             store: "uplay"
         },
     },
+    ubisoftconnect: {
+        mapped: "<root>",
+        when: {
+            store: "uplay"
+        },
+    },
     hkcu: {
         mapped: "HKEY_CURRENT_USER",
         when: { os: "windows" },
@@ -400,7 +406,11 @@ function getConstraintFromSystem(system: string, path: string): Constraint {
         constraint.store = "origin";
     } else {
         constraint.os = parseOs(system);
-        constraint.store = getStoreConstraintFromPath(path);
+    }
+
+    const storeFromPath = getStoreConstraintFromPath(path);
+    if (storeFromPath !== undefined) {
+        constraint.store  = storeFromPath;
     }
 
     return constraint;