manageres to separate folder

ispras · Aug 8, 2024 · 984fa3d · 984fa3d
1 parent 7c5a50b
commit 984fa3d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 49 deletions.
diff --git a/scrapypuppeteer/__init__.py b/scrapypuppeteer/__init__.py
@@ -6,3 +6,21 @@
     PuppeteerRecaptchaSolverResponse,
     PuppeteerJsonResponse,
 )
+
+__all__ = ["BrowserManager"]
+
+from abc import ABC, abstractmethod
+
+class BrowserManager(ABC):
+    @abstractmethod
+    def process_request(self, request, spider):
+        pass
+
+    @abstractmethod
+    def close_used_contexts(self):
+        pass
+
+    @abstractmethod
+    def process_response(self, middleware, request, response, spider):
+        pass
+
diff --git a/scrapypuppeteer/browser_manager.py b/scrapypuppeteer/browser_manager.py
diff --git a/scrapypuppeteer/browser_managers/__init__.py b/scrapypuppeteer/browser_managers/__init__.py
diff --git a/scrapypuppeteer/local_browser_manager.py → ...browser_managers/local_browser_manager.py b/scrapypuppeteer/local_browser_manager.py → ...browser_managers/local_browser_manager.py
@@ -1,5 +1,3 @@
-import json
-import logging
 from collections import defaultdict
 from typing import List, Union
 from urllib.parse import urlencode, urljoin
@@ -11,18 +9,7 @@
 from scrapy.http import Headers, TextResponse, Response
 from scrapy.utils.log import failure_to_exc_info
 from twisted.python.failure import Failure
-import time
-
-from scrapypuppeteer.actions import (
-    Click,
-    GoBack,
-    GoForward,
-    GoTo,
-    RecaptchaSolver,
-    Screenshot,
-    Scroll,
-    CustomJsAction,
-)
+
 from scrapypuppeteer.response import (
     PuppeteerResponse,
     PuppeteerHtmlResponse,
@@ -41,7 +28,7 @@
 import base64
 
 
-from scrapypuppeteer.browser_manager import BrowserManager
+from scrapypuppeteer import BrowserManager
 
 
 class ContextManager:

diff --git a/scrapypuppeteer/service_browser_manager.py → ...owser_managers/service_browser_manager.py b/scrapypuppeteer/service_browser_manager.py → ...owser_managers/service_browser_manager.py
@@ -32,8 +32,7 @@
 )
 from scrapypuppeteer.request import ActionRequest, PuppeteerRequest, CloseContextRequest
 
-from scrapypuppeteer.browser_manager import BrowserManager
-
+from scrapypuppeteer import BrowserManager
 
 
 class ServiceBrowserManager(BrowserManager):
@@ -50,6 +49,7 @@ def __init__(self, service_base_url, include_meta, include_headers, crawler):
 
 
     def process_request(self, request):
+
         if isinstance(request, CloseContextRequest):
             return self.process_close_context_request(request)
 

diff --git a/scrapypuppeteer/middleware.py b/scrapypuppeteer/middleware.py
@@ -31,17 +31,8 @@
 )
 from scrapypuppeteer.request import ActionRequest, PuppeteerRequest, CloseContextRequest
 
-
-
-
-from scrapypuppeteer.service_browser_manager import ServiceBrowserManager
-
-from scrapypuppeteer.local_browser_manager import LocalBrowserManager
-
-
-
-
-
+from scrapypuppeteer.browser_managers.local_browser_manager import LocalBrowserManager
+from scrapypuppeteer.browser_managers.service_browser_manager import ServiceBrowserManager
 
 class PuppeteerServiceDownloaderMiddleware:
     """