fix: stupid type()

Author: z0z0r4

curseforge_api_wrapper/client.py

@@ -59,7 +59,11 @@ class SortOrder(Enum):
 class Client:
     def __init__(self, api_key: str, endpoint: str = "https://api.curseforge.com"):
         self.api_key = api_key
-        self.headers = {"x-api-key": api_key, "Accept": "application/json", "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36 Edg/116.0.1938.54"}
+        self.headers = {
+            "x-api-key": api_key,
+            "Accept": "application/json",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36 Edg/116.0.1938.54",
+        }
         self.endpoint = endpoint
 
     def search_mods(
@@ -92,19 +96,27 @@ def search_mods(
             "gameVersions": gameVersions,
             "searchFilter": searchFilter,
             "sortField": (
-                (sortField if type(sortField) is int else sortField.value)
+                (
+                    sortField.value
+                    if isinstance(sortField, ModsSearchSortField)
+                    else sortField
+                )
                 if sortField
                 else None
             ),
             "sortOrder": (
-                (sortOrder if type(sortOrder) is str else sortOrder.value)
+                (sortOrder.value if isinstance(sortOrder, SortOrder) else sortOrder)
                 if sortOrder
                 else None
             ),
             "modLoaderType": (
-                modLoaderType
-                if type(modLoaderType) is int
-                else modLoaderType.value if modLoaderType else None
+                (
+                    modLoaderType.value
+                    if isinstance(modLoaderType, ModLoaderType)
+                    else modLoaderType
+                )
+                if modLoaderType
+                else None
             ),
             "modLoaderTypes": modLoaderTypes,
             "gameVersionTypeId": gameVersionTypeId,
@@ -150,9 +162,9 @@ def get_mod_files(
             params={
                 "gameVersion": gameVersion,
                 "modLoaderType": (
-                    modLoaderType
-                    if type(modLoaderType) is int
-                    else modLoaderType.value if modLoaderType else None
+                    modLoaderType.value
+                    if isinstance(modLoaderType, ModLoaderType)
+                    else modLoaderType if modLoaderType else None
                 ),
                 "gameVersionTypeId": gameVersionTypeId,
                 "index": index,
@@ -190,7 +202,6 @@ def get_fingerprint(
         res = request(url, method="POST", headers=self.headers, json=data)
         return FingerprintResult(**res["data"])
 
-
     def get_categories(
         self,
         gameId: int,

tests/test_client.py

@@ -21,51 +21,51 @@
 @pytest.mark.search
 def test_search_mods():
     res = client.search_mods(gameId=432, pageSize=10, searchFilter="fabric-api")
-    assert type(res) == SearchResult
+    assert isinstance(res, SearchResult)
 
 @pytest.mark.mod
 def test_get_mod():
     for modId in modIds:
         res = client.get_mod(modId)
-        assert type(res) == Mod
+        assert isinstance(res, Mod)
 
 @pytest.mark.mod
 def test_get_mods():
     res = client.get_mods(modIds)
-    assert type(res) == list
-    assert all([type(mod) == Mod for mod in res])
+    assert isinstance(res, list)
+    assert all([isinstance(mod, Mod) for mod in res])
 
 @pytest.mark.file
 def test_get_mod_files():
     for modId in modIds:
         res = client.get_mod_files(modId)
-        assert type(res) == ModFilesResult
+        assert isinstance(res, ModFilesResult)
 
 @pytest.mark.file
 def test_get_file():
     res = client.get_file(modId, fileId)
-    assert type(res) == File
+    assert isinstance(res, File)
 
 @pytest.mark.file
 def test_get_files():
     res = client.get_files(fileIds)
-    assert type(res) == list
-    assert all([type(file) == File for file in res])
+    assert isinstance(res, list)
+    assert all([isinstance(file, File) for file in res])
 
 @pytest.mark.file
 def test_get_file_download_url():
     res = client.get_file_download_url(modId, fileId)
-    assert type(res) == str
+    assert isinstance(res, str)
 
 @pytest.mark.fingerprint
 def test_get_fingerprint():
     res = client.get_fingerprint(fingerprints)
-    assert type(res) == FingerprintResult
+    assert isinstance(res, FingerprintResult)
     res = client.get_fingerprint(fingerprints, gameId=432)
-    assert type(res) == FingerprintResult
+    assert isinstance(res, FingerprintResult)
 
 @pytest.mark.category
 def test_get_categories():
     res = client.get_categories(gameId=432)
-    assert type(res) == list
-    assert all([type(category) == Category for category in res])
+    assert isinstance(res, list)
+    assert all([isinstance(category, Category) for category in res])