feat(async): make utils.response_content sync agnostic

vishes-shell · vishes-shell · commit 0c4d320af7a3 · 2020-02-29T18:20:20.000+03:00
diff --git a/gitlab/utils.py b/gitlab/utils.py
@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import asyncio
 from urllib.parse import urlparse
 
 
@@ -23,7 +24,7 @@ def __call__(self, chunk):
         print(chunk)
 
 
-async def response_content(response, streamed, action):
+async def aresponse_content(response, streamed, action):
     if streamed is False:
         return response.content
 
@@ -35,6 +36,21 @@ async def response_content(response, streamed, action):
             action(chunk)
 
 
+def response_content(response, streamed, action):
+    if asyncio.iscoroutine(response):
+        return aresponse_content(response, streamed, action)
+
+    if streamed is False:
+        return response.content
+
+    if action is None:
+        action = _StdoutStream()
+
+    for chunk in response.iter_bytes():
+        if chunk:
+            action(chunk)
+
+
 def copy_dict(dest, src):
     for k, v in src.items():
         if isinstance(v, dict):
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
@@ -1570,7 +1570,7 @@ def content(self, streamed=False, action=None, chunk_size=1024, **kwargs):
         result =  self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action)  # TODO:???
+        return utils.response_content(result, streamed, action)  
 
 
 class SnippetManager(CRUDMixin, RESTManager):
@@ -1918,7 +1918,7 @@ def artifacts(self, streamed=False, action=None, chunk_size=1024, **kwargs):
         result =  self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action)  # TODO: ???
+        return utils.response_content(result, streamed, action)
 
     @cli.register_custom_action("ProjectJob")
     @exc.on_http_error(exc.GitlabGetError)
@@ -1946,7 +1946,7 @@ def artifact(self, path, streamed=False, action=None, chunk_size=1024, **kwargs)
         result =  self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action)  # TODO: ???
+        return utils.response_content(result, streamed, action)
 
     @cli.register_custom_action("ProjectJob")
     @exc.on_http_error(exc.GitlabGetError)
@@ -1973,7 +1973,7 @@ def trace(self, streamed=False, action=None, chunk_size=1024, **kwargs):
         result =  self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action)  # TODO: ???
+        return utils.response_content(result, streamed, action)  
 
 
 class ProjectJobManager(RetrieveMixin, RESTManager):
@@ -3458,7 +3458,7 @@ def raw(
         result =  self.gitlab.http_get(
             path, query_data=query_data, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action)  # TODO: ???
+        return utils.response_content(result, streamed, action)  
 
     @cli.register_custom_action("ProjectFileManager", ("file_path", "ref"))
     @exc.on_http_error(exc.GitlabListError)
@@ -3768,7 +3768,7 @@ def content(self, streamed=False, action=None, chunk_size=1024, **kwargs):
         result =  self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action)  # TODO: ???
+        return utils.response_content(result, streamed, action)  
 
 
 class ProjectSnippetManager(CRUDMixin, RESTManager):
@@ -4088,7 +4088,7 @@ def download(self, streamed=False, action=None, chunk_size=1024, **kwargs):
         result =  self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action)  # TODO: ???
+        return utils.response_content(result, streamed, action)  
 
 
 class ProjectExportManager(GetWithoutIdMixin, CreateMixin, RESTManager):
@@ -4279,7 +4279,7 @@ def repository_raw_blob(
         result =  self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action)  # TODO: ???
+        return utils.response_content(result, streamed, action)  
 
     @cli.register_custom_action("Project", ("from_", "to"))
     @exc.on_http_error(exc.GitlabGetError)
@@ -4356,7 +4356,7 @@ def repository_archive(
         result =  self.manager.gitlab.http_get(
             path, query_data=query_data, raw=True, streamed=streamed, **kwargs
         )
-        return utils.response_content(result, streamed, action)  # TODO: ???
+        return utils.response_content(result, streamed, action)  
 
     @cli.register_custom_action("Project", ("forked_from_id",))
     @exc.on_http_error(exc.GitlabCreateError)
@@ -4636,7 +4636,7 @@ def snapshot(
         result =  self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action)  # TODO:??? 
+        return utils.response_content(result, streamed, action)  
 
     @cli.register_custom_action("Project", ("scope", "search"))
     @exc.on_http_error(exc.GitlabSearchError)
@@ -4729,7 +4729,7 @@ def artifact(
         result = self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action)  # TODO:??? 
+        return utils.response_content(result, streamed, action)  
 
 
 class ProjectManager(CRUDMixin, RESTManager):
