webtoolkit 0.1.54__tar.gz → 0.1.57__tar.gz

{webtoolkit-0.1.54 → webtoolkit-0.1.57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: webtoolkit
-Version: 0.1.54
+Version: 0.1.57
 Summary: Web tools and interfaces for Internet data processing.
 License: GPL3
 Author: Iwan Grozny

{webtoolkit-0.1.54 → webtoolkit-0.1.57}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [tool.poetry]
 name = "webtoolkit"
-version = "0.1.54"
+version = "0.1.57"
 description = "Web tools and interfaces for Internet data processing."
 authors = ["Iwan Grozny <renegat@renegat0x0.ddns.net>"]
 license = "GPL3"

{webtoolkit-0.1.54 → webtoolkit-0.1.57}/webtoolkit/baseurl.py

@@ -550,7 +550,7 @@ class BaseUrl(ContentInterface):
         request_data["crawler_type"] = type(request_data["crawler_type"]).__name__
         all_properties.append({"name": "Request", "data": request_data})
 
-        response_data = self.get_response_data()
+        response_data = self.get_response_data(streams)
         all_properties.append({"name": "Response", "data": response_data})
         if response:
             raw_headers_data = response.get_headers()
@@ -639,7 +639,7 @@ class BaseUrl(ContentInterface):
 
         return response_data
 
-    def get_response_data(self):
+    def get_response_data(self, streams):
         """
         Returns response data
         Easy digestible response data

{webtoolkit-0.1.54 → webtoolkit-0.1.57}/webtoolkit/remoteserver.py

@@ -235,14 +235,30 @@ class RemoteServer(object):
         return responses
 
     def get_response(all_properties):
+        """
         responses = RemoteServer.get_responses(all_properties)
         if not responses:
             return
 
         if "Default" in responses:
             return responses["Default"]
+
+        # first try to return stream that matches request link
+        properties = RemoteServer.read_properties_section("Properties", all_properties)
+        if properties:
+            link = properties.get("link")
+            if link:
+                response = responses.get(link)
+                if response:
+                    return response
+
+        # return first found response
         for url in responses:
             return responses[url]
+        """
+        response_data = RemoteServer.read_properties_section("Response", all_properties)
+        response = json_to_response(response_data)
+        return response
 
     def encode(data):
         return urllib.parse.quote(data, safe="")

{webtoolkit-0.1.54 → webtoolkit-0.1.57}/webtoolkit/remoteurl.py

@@ -81,10 +81,7 @@ class RemoteUrl(ContentInterface):
         if not responses:
             return
 
-        if "Default" in responses:
-            return responses["Default"]
-        for url in responses:
-            return responses[url]
+        return RemoteServer.get_response(self.all_properties)
 
     def get_text(self):
         """Provides URL response text. Useful if link provides one response."""