From 6641d25e5e27be4aa3a1ae7f8d4aceca25fc4c31 Mon Sep 17 00:00:00 2001
From: Cassidy Burden <burdencassidy@utexas.edu>
Date: Fri, 30 Dec 2016 19:42:09 -0600
Subject: [PATCH] Fix default userdata path for Linux

Change default userdata path for Linux to ~/.steam/steam/userdata
and add support for multiple paths in case this problem occurs again.
---
 pysteam/paths.py | 42 ++++++++++++++++++++++++++----------------
 pysteam/steam.py | 26 ++++++++++++++------------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/pysteam/paths.py b/pysteam/paths.py
index cef6274..8fd6d24 100644
--- a/pysteam/paths.py
+++ b/pysteam/paths.py
@@ -19,23 +19,33 @@
 # See also the `get_steam()` function, which will return a valid Steam
 # instance for the current platform.
 
-def default_osx_userdata_path():
-  return os.path.join(
-    os.path.expanduser("~"),
-    "Library",
-    "Application Support",
-    "Steam",
-    "userdata"
-  )
+def default_osx_userdata_paths():
+  return [
+    os.path.join(
+       os.path.expanduser("~"),
+      "Library",
+      "Application Support",
+      "Steam",
+      "userdata"
+    )
+  ]
 
-def default_linux_userdata_path():
-  return os.path.join(
-    os.path.expanduser("~"),
-    ".local",
-    "share",
-    "Steam",
-    "userdata"
-  )
+def default_linux_userdata_paths():
+  return [
+    os.path.join(
+      os.path.expanduser("~"),
+      ".local",
+      "share",
+      "Steam",
+      "userdata"
+    ),
+    os.path.join(
+      os.path.expanduser("~"),
+      ".steam",
+      "steam",
+      "userdata"
+    )
+  ]
 
 # =============================================================================
 # User-specific paths
diff --git a/pysteam/steam.py b/pysteam/steam.py
index 97c02dc..ef01ca0 100644
--- a/pysteam/steam.py
+++ b/pysteam/steam.py
@@ -9,23 +9,27 @@
 
 from model import LocalUserContext, Steam
 
+def _resolve_userdata_path(paths):
+  """
+  Helper function which checks if the potential userdata directory exists
+  and returns a new Steam instance with that userdata directory if it does.
+  If the directory doesnt exist it returns None instead
+  """
+  if not paths: return None
+  return next((Steam(path) for path in paths if os.path.exists(path)), None)
+
 def get_steam():
   """
   Returns a Steam object representing the current Steam installation on the
   users computer. If the user doesn't have Steam installed, returns None.
   """
-  # Helper function which checks if the potential userdata directory exists
-  # and returns a new Steam instance with that userdata directory if it does.
-  # If the directory doesnt exist it returns None instead
-  helper = lambda udd: Steam(udd) if os.path.exists(udd) else None
-
-  # For both OS X and Linux, Steam stores it's userdata in a consistent
-  # location.
+  # For both OS X and Linux, Steam stores it's userdata in a few consistent
+  # locations.
   plat = platform.system()
   if plat == 'Darwin':
-    return helper(paths.default_osx_userdata_path())
+    return _resolve_userdata_path(paths.default_osx_userdata_paths())
   if plat == 'Linux':
-    return helper(paths.default_linux_userdata_path())
+    return _resolve_userdata_path(paths.default_linux_userdata_paths())
 
   # Windows is a bit trickier. The userdata directory is stored in the Steam
   # installation directory, meaning that theoretically it could be anywhere.
@@ -33,9 +37,7 @@ def get_steam():
   # still possible for us to figure out automatically
   if plat == 'Windows':
     possible_dir = winutils.find_userdata_directory()
-    # Unlike the others, `possible_dir` might be None (if something odd
-    # happened with the registry)
-    return helper(possible_dir) if possible_dir is not None else None
+    return _resolve_userdata_path([possible_dir])
   # This should never be hit. Windows, OS X, and Linux should be the only
   # supported platforms.
   # TODO: Add logging here so that the user (developer) knows that something