Merge pull request #452 from loathingKernel/develop

EntitlementsWorker: fetch full entitlements on legendary>=0.20.35
RareDevs · Sep 6, 2024 · 7b1cbe7 · 7b1cbe7
2 parents 9e2380e + 449b531
commit 7b1cbe7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/rare/components/tabs/games/integrations/ubisoft_group.py b/rare/components/tabs/games/integrations/ubisoft_group.py
@@ -57,7 +57,11 @@ def run_real(self) -> None:
 
             if (entitlements := self.core.lgd.entitlements) is None:
                 with timelogger(logger, "Request entitlements"):
-                    entitlements = self.core.egs.get_user_entitlements()
+                    try:
+                        entitlements = self.core.egs.get_user_entitlements_full()
+                    except AttributeError as e:
+                        logger.warning(e)
+                        entitlements = self.core.egs.get_user_entitlements()
                 self.core.lgd.entitlements = entitlements
             entitlements = {i["entitlementName"] for i in entitlements}
 

diff --git a/rare/shared/workers/fetch.py b/rare/shared/workers/fetch.py
@@ -43,7 +43,11 @@ def run_real(self):
             # Get entitlements, Ubisoft integration also uses them
             self.signals.progress.emit(0, self.signals.tr("Updating entitlements"))
             with timelogger(logger, "Request entitlements"):
-                entitlements = self.core.egs.get_user_entitlements()
+                try:
+                    entitlements = self.core.egs.get_user_entitlements_full()
+                except AttributeError as e:
+                    logger.warning(e)
+                    entitlements = self.core.egs.get_user_entitlements()
             self.core.lgd.entitlements = entitlements
             logger.info(f"Entitlements: %s", len(list(entitlements)))
         self.signals.result.emit(entitlements, FetchWorker.Result.ENTITLEMENTS)