Fix : DSM 5 can't fetch Storage data

therealj4nd3rs0n · Apr 28, 2020 · aa57f9b · aa57f9b
1 parent 1569715
commit aa57f9b
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/synology_dsm/synology_dsm.py b/synology_dsm/synology_dsm.py
@@ -28,6 +28,10 @@ class SynologyDSM(object):
     API_INFO = "SYNO.API.Info"
     API_AUTH = "SYNO.API.Auth"
 
+    DSM_5_WEIRD_URL_API = [
+        SynoStorage.API_KEY,
+    ]
+
     def __init__(
         self,
         dsm_ip,
@@ -74,16 +78,22 @@ def _debuglog(self, message):
         if self._debugmode:
             print("DEBUG: " + message)
 
-    def _build_url(self, api):
-        if (
-            api == SynoStorage.API_KEY
+    def _is_weird_api_url(self, api):
+        """Returns True if the API URL is not common (nas_base_url/webapi/path?params) [Only handles DSM 5 for now]."""
+        return (
+            api in self.DSM_5_WEIRD_URL_API
             and self._information
             and self._information.version
             and int(self._information.version) < 7321  # < DSM 6
-        ):
-            return (
-                "%s/webman/modules/StorageManager/storagehandler.cgi?" % self._base_url
-            )
+        )
+
+    def _build_url(self, api):
+        if self._is_weird_api_url(api):
+            if api == SynoStorage.API_KEY:
+                return (
+                    "%s/webman/modules/StorageManager/storagehandler.cgi?"
+                    % self._base_url
+                )
 
         return "%s/webapi/%s?" % (self._base_url, self.apis[api]["path"])
 
@@ -177,7 +187,7 @@ def _request(
             self.login()
 
         # Check if API is available
-        if not self.apis.get(api):
+        if not self.apis.get(api) and not self._is_weird_api_url(api):
             raise SynologyDSMAPINotExistsException(api)
 
         # Build request params