drb-driver-http 1.3.4__tar.gz → 1.3.6__tar.gz

{drb_driver_http-1.3.4/drb_driver_http.egg-info → drb_driver_http-1.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drb-driver-http
-Version: 1.3.4
+Version: 1.3.6
 Summary: DRB Http driver
 Author: GAEL Systems
 Author-email: drb-python@gael.fr

{drb_driver_http-1.3.4 → drb_driver_http-1.3.6}/drb/drivers/http/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-07-18T15:06:45+0200",
+ "date": "2025-03-25T14:38:50+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "7040fb7f6f65fd452bcae5937f5be5b47cf68b24",
- "version": "1.3.4"
+ "full-revisionid": "7db4ae8d4ff1a5d43115b127f9b0b2801a30a566",
+ "version": "1.3.6"
 }
 '''  # END VERSION_JSON
 

{drb_driver_http-1.3.4 → drb_driver_http-1.3.6}/drb/drivers/http/http.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import io
 import re
+import sys
 
 import keyring
 from deprecated import deprecated
@@ -39,7 +40,7 @@ class EmptyAuth(AuthBase):
        retry=retry_if_exception_type(DrbHttpNodeException))
 def get(path: str, auth: AuthBase, redirect, headers, params: Dict[str, Any]):
     return requests.get(path, stream=True, auth=auth, allow_redirects=redirect,
-                        headers=headers, **params)
+                        headers=headers, params=params)
 
 
 @retry(stop=stop_after_attempt(5),
@@ -284,17 +285,22 @@ class DrbHttpNode(AbstractNode):
             for x in res.headers:
                 self.__imatmul__((x, res.headers[x]))
 
-    @property
-    def name(self) -> str:
-        key = ('Content-Disposition', None)
-        if key in self._attrs.keys():
-            p = re.compile('filename ?= ?"(.*)"')
-            res = p.search(self.get_attribute(key[0]))
-            if res is not None:
-                return res.group(1)
+    def __get_name_from_url(self):
         parsed_uri = urlparse(self._path)
         return str(parsed_uri.path).split('/')[-1]
 
+    @property
+    def name(self) -> str:
+        self.__init_header()
+        try:
+            disposition = self.__matmul__('content-disposition')
+            r = re.search(r'filename ?= ?((["\'])?(.*)(["\'])?)', disposition)
+            if r:
+                return r.group(1).replace("'", "").replace('"', "")
+            return self.__get_name_from_url()
+        except DrbException:
+            return self.__get_name_from_url()
+
     @property
     @deprecated(version='1.2.0',
                 reason='Only bracket browse should be use')

{drb_driver_http-1.3.4 → drb_driver_http-1.3.6/drb_driver_http.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drb-driver-http
-Version: 1.3.4
+Version: 1.3.6
 Summary: DRB Http driver
 Author: GAEL Systems
 Author-email: drb-python@gael.fr

{drb_driver_http-1.3.4 → drb_driver_http-1.3.6}/tests/test_drb_impl_http.py

@@ -118,8 +118,16 @@ class TestDrbHttp(unittest.TestCase):
             DrbHttpNode(self.url_ok).attributes[key]
 
     def test_name(self):
-        node = DrbHttpNode(self.url_ok)
-        self.assertEqual('test.txt', node.name)
+        expected = "data.json"
+        with patch('requests.head') as mock_head:
+            mock_head.return_value.status_code = 200
+            mock_head.return_value.headers = {
+                'Content-Type': 'application/json',
+                'Content-Length': 20,
+                'Content-Disposition': f'attachment; filename="{expected}"',
+            }
+            node = DrbHttpNode('http://something.net/foobar')
+            self.assertEqual(expected, node.name)
 
     def test_namespace_uri(self):
         node = DrbHttpNode(self.url_ok)