Merge branch 'master' into duplicate-fix

Resolved merge conflicts between parallel development branches:
- Merged lib_path and _libs parameter implementations for custom library paths
- Deduplicated Workshop GetAppDependencies methods
- Added new Workshop API methods (UGC query, download callbacks)
- Preserved SWPY_PATH env var support from master
- Maintained backward compatibility with both lib_path and _libs parameters

Priority order for library search:
1. lib_path (if provided)
2. _libs (if provided)
3. SWPY_PATH env var
4. Current directory
5. Package directory
6. Nuitka fallback

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: cebarks

library/SteamworksPy.cpp

@@ -22,6 +22,7 @@
 
 #include <iostream>
 #include <string>
+#include <cstdint>
 
 //-----------------------------------------------
 // Definitions

library/sdk/redist/.gitignore

@@ -44,17 +44,21 @@ class STEAMWORKS(object):
     :param lib_path: Optional path to directory containing Steamworks libraries
                      (libsteam_api.so/dylib/dll and SteamworksPy.so/dylib/dll)
                      If not provided, searches current directory, package directory, and Nuitka fallback
+    :param _libs: Alternative parameter for library path (deprecated, use lib_path instead)
+                  Kept for backward compatibility
     """
     _arch = steamworks_util.get_arch()
     _native_supported_platforms = ['linux', 'linux2', 'darwin', 'win32']
 
     def __init__(
         self,
         supported_platforms: list = [],
-        lib_path: str | Path | None = None
+        lib_path: str | Path | None = None,
+        _libs=None
     ) -> None:
         self._supported_platforms = supported_platforms
         self._lib_path = lib_path
+        self._libs = _libs
         self._loaded 	= False
         self._cdll 		= None
 
@@ -72,9 +76,11 @@ def _get_library_search_paths(self) -> list[str]:
 
         Priority order:
         1. Custom lib_path (if provided)
-        2. Current working directory
-        3. Package directory
-        4. Nuitka fallback (2 dirs up from __file__)
+        2. Custom _libs (if provided)
+        3. SWPY_PATH env var (if set)
+        4. Current working directory
+        5. Package directory
+        6. Nuitka fallback (2 dirs up from __file__)
 
         :return: List of directory paths to search
         """
@@ -85,13 +91,21 @@ def _get_library_search_paths(self) -> list[str]:
             resolved_path = str(Path(self._lib_path).resolve())
             paths.append(resolved_path)
 
-        # Priority 2: Current working directory
+        # Priority 2: Custom _libs if provided (backward compatibility)
+        if self._libs is not None:
+            paths.append(self._libs)
+
+        # Priority 3: SWPY_PATH environment variable
+        if os.environ.get('SWPY_PATH'):
+            paths.append(os.environ['SWPY_PATH'])
+
+        # Priority 4: Current working directory
         paths.append(os.getcwd())
 
-        # Priority 3: Package directory
+        # Priority 5: Package directory
         paths.append(os.path.dirname(__file__))
 
-        # Priority 4: Nuitka fallback (2 dirs up)
+        # Priority 6: Nuitka fallback (2 dirs up)
         if is_nuitka:
             nuitka_path = os.path.split(os.path.split(__file__)[0])[0]
             paths.append(nuitka_path)
@@ -117,12 +131,18 @@ def _setup_library_path(self) -> None:
         Configure LD_LIBRARY_PATH environment variable for library loading.
         Only needed on Linux/macOS.
         """
-        # Build path list (custom path gets priority)
+        # Build path list (custom paths get priority)
         paths_to_add = []
 
         if self._lib_path is not None:
             paths_to_add.append(str(Path(self._lib_path).resolve()))
 
+        if self._libs is not None:
+            paths_to_add.append(self._libs)
+
+        if os.environ.get('SWPY_PATH'):
+            paths_to_add.append(os.environ['SWPY_PATH'])
+
         paths_to_add.append(os.getcwd())
 
         # Preserve existing LD_LIBRARY_PATH

steamworks/__init__.py

@@ -15,7 +15,7 @@ class SteamWorkshop(object):
     _RemoteStorageSubscribePublishedFileResult_t 	= CFUNCTYPE(None, SubscriptionResult)
     _RemoteStorageUnsubscribePublishedFileResult_t 	= CFUNCTYPE(None, SubscriptionResult)
     _SteamUGCQueryCompleted_t = CFUNCTYPE(None, SteamUGCQueryCompleted_t)
-    _GetAppDependenciesResult_t = CFUNCTYPE(None, GetAppDependenciesResult_t)
+    _GetAppDependenciesCallback_t = CFUNCTYPE(None, GetAppDependenciesResult_t)
     _DownloadItemResult_t = CFUNCTYPE(None, DownloadItemResult_t)
 
     _CreateItemResult			= None
@@ -25,7 +25,7 @@ class SteamWorkshop(object):
     _RemoteStorageSubscribePublishedFileResult 	= None
     _RemoteStorageUnsubscribePublishedFileResult = None
     _SteamUGCQueryCompleted = None
-    _GetAppDependenciesResult = None
+    _GetAppDependenciesCallback = None
     _DownloadItemResult = None
 
 
@@ -479,36 +479,11 @@ def SetGetAppDependenciesCallback(self, callback: object) -> bool:
         :param callback: callable
         :return: bool
         """
-        self._GetAppDependenciesResult = self._GetAppDependenciesResult_t(callback)
-        self.steam.Workshop_SetGetAppDependenciesCallback(self._GetAppDependenciesResult)
+        self._GetAppDependenciesCallback = self._GetAppDependenciesCallback_t(callback)
+        self.steam.Workshop_SetGetAppDependenciesCallback(self._GetAppDependenciesCallback)
         return True
 
 
-    def GetAppDependencies(self, published_file_id: int, callback: object = None,
-                           override_callback: bool = False) -> None:
-        """Get app dependencies for a workshop item
-
-        Returns a list of app IDs that the workshop item depends on.
-        These are "soft" dependencies shown on the Steam Workshop web page.
-        The callback may be called multiple times if there are more than 32 dependencies.
-
-        :param published_file_id: int
-        :param callback: callable - receives GetAppDependenciesResult_t
-        :param override_callback: bool
-        :return: None
-        """
-        if override_callback:
-            self.SetGetAppDependenciesCallback(callback)
-
-        elif callback and not self._GetAppDependenciesResult:
-            self.SetGetAppDependenciesCallback(callback)
-
-        if self._GetAppDependenciesResult is None:
-            raise SetupRequired('Call `SetGetAppDependenciesCallback` first or supply a `callback`')
-
-        self.steam.Workshop_GetAppDependencies(published_file_id)
-
-
     def DownloadItem(self, published_file_id: int, high_priority: bool = False,
                      callback: object = None, override_callback: bool = False) -> bool:
         """Initiate or prioritize download of a workshop item

steamworks/interfaces/workshop.py

@@ -492,10 +492,6 @@ class InputDigitalActionData_t(Structure):
         'restype': None,
         'argtypes': [MAKE_CALLBACK(None, structs.GetAppDependenciesResult_t)]
     },
-    'Workshop_GetAppDependencies': {
-        'restype': None,
-        'argtypes': [c_uint64]
-    },
     'Workshop_SetDownloadItemCallback': {
         'restype': None,
         'argtypes': [MAKE_CALLBACK(None, structs.DownloadItemResult_t)]

steamworks/methods.py

@@ -2,35 +2,48 @@
 
 
 class FindLeaderboardResult_t(Structure):
-    """ Represents the STEAMWORKS LeaderboardFindResult_t call result type """
-    _fields_ = [
-        ("leaderboardHandle", c_uint64),
-        ("leaderboardFound", c_uint32)
-    ]
+    """Represents the STEAMWORKS LeaderboardFindResult_t call result type"""
+
+    _fields_ = [("leaderboardHandle", c_uint64), ("leaderboardFound", c_uint32)]
 
 
 class CreateItemResult_t(Structure):
     _fields_ = [
         ("result", c_int),
         ("publishedFileId", c_uint64),
-        ("userNeedsToAcceptWorkshopLegalAgreement", c_bool)
+        ("userNeedsToAcceptWorkshopLegalAgreement", c_bool),
     ]
 
 
 class SubmitItemUpdateResult_t(Structure):
     _fields_ = [
         ("result", c_int),
         ("userNeedsToAcceptWorkshopLegalAgreement", c_bool),
-        ("publishedFileId", c_uint64)
+        ("publishedFileId", c_uint64),
     ]
 
 
 class ItemInstalled_t(Structure):
+    _fields_ = [("appId", c_uint32), ("publishedFileId", c_uint64)]
+
+
+class GetAppDependenciesResult(Structure):
     _fields_ = [
-        ("appId", c_uint32),
-        ("publishedFileId", c_uint64)
+        ("result", c_int32),
+        ("publishedFileId", c_uint64),
+        ("array_app_dependencies", POINTER(c_int32)),
+        ("array_num_app_dependencies", c_int32),
+        ("total_num_app_dependencies", c_int32),
     ]
 
+    def get_app_dependencies_list(self) -> list:
+        dependencies_list = []
+        array_size = self.array_num_app_dependencies
+        array_type = c_uint32 * array_size
+        array = array_type.from_address(addressof(self.array_app_dependencies.contents))
+        dependencies_list.extend(array)
+        return dependencies_list
+
 
 class GetAppDependenciesResult(Structure):
     _fields_ = [
@@ -51,10 +64,8 @@ def get_app_dependencies_list(self) -> list:
 
 
 class SubscriptionResult(Structure):
-    _fields_ = [
-        ("result", c_int32),
-        ("publishedFileId", c_uint64)
-    ]
+    _fields_ = [("result", c_int32), ("publishedFileId", c_uint64)]
+
 
 
 class SteamUGCQueryCompleted_t(Structure):