webtoolkit 0.1.46__tar.gz → 0.1.48__tar.gz

{webtoolkit-0.1.46 → webtoolkit-0.1.48}/PKG-INFO

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

{webtoolkit-0.1.46 → webtoolkit-0.1.48}/pyproject.toml

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

{webtoolkit-0.1.46 → webtoolkit-0.1.48}/webtoolkit/handlers/defaulturlhandler.py

@@ -143,9 +143,30 @@ class DefaultCompoundChannelHandler(DefaultChannelHandler):
             return self.get_response().get_text()
 
     def get_response(self):
+        """
+        There can be many responses.
+        If at least one is invalid - return it
+
+        If responses are valid return best match
+        """
+        valid_responses = []
+        invalid_responses = []
+
         responses = self.get_responses()
-        if responses and len(responses) > 0:
-            return responses[0]
+        for response in responses:
+            if response.is_valid():
+                valid_responses.append(response)
+            else:
+                invalid_responses.append(response)
+
+        if len(invalid_responses) > 0:
+            return invalid_responses[0]
+
+        for response in responses:
+            if response.url == self.url:
+                return response
+
+        return responses[0]
 
     def get_responses(self):
         if self.responses and len(self.responses) > 0:

{webtoolkit-0.1.46 → webtoolkit-0.1.48}/webtoolkit/remoteurl.py

@@ -42,7 +42,11 @@ class RemoteUrl(ContentInterface):
         :param all_properties: A dictionary of pre-fetched properties for the URL.
         :param social_properties: A dictionary of pre-fetched social media properties.
         """
+        if request is not None and url is None:
+            url = request.url
+
         super().__init__(url=url, contents=None)
+
         self.request = request
         self.remote_server_location = remote_server_location
         self.server = RemoteServer(remote_server=self.remote_server_location)
@@ -53,6 +57,9 @@ class RemoteUrl(ContentInterface):
         if self.all_properties:
             self.get_responses()
 
+    def get_url(self):
+        return self.url
+
     def get_remote_server_location():
         return RemoteServer.get_remote_server_location()