Merge pull request #33 from ClericPy/dev

ClericPy · web-flow · commit abc172a46665 · 2020-06-27T23:53:39.000+08:00
2.3.4
diff --git a/README.md b/README.md
@@ -280,7 +280,11 @@ Crawl the given URL, output the HTML DOM
 λ python3 -m ichrome --crawl --headless --timeout=2 http://api.ipify.org/
 <html><head></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">38.143.68.66</pre></body></html>
 ```
-
+To use default user dir (ignore ichrome user-dir settings)
+> ensure the existing Chromes get closed
+```bash
+λ python3 -m ichrome 
+```
 
 Details:
 
diff --git a/ichrome/__init__.py b/ichrome/__init__.py
@@ -6,7 +6,7 @@
 from .logs import logger
 from .sync_utils import Chrome, Tab
 
-__version__ = "2.3.3"
+__version__ = "2.3.4"
 __tips__ = "[github]: https://github.com/ClericPy/ichrome\n[cdp]: https://chromedevtools.github.io/devtools-protocol/\n[cmd args]: https://peter.sh/experiments/chromium-command-line-switches/"
 __all__ = [
     'Chrome', 'ChromeDaemon', 'Tab', 'Tag', 'AsyncChrome', 'AsyncTab', 'logger',
diff --git a/ichrome/async_utils.py b/ichrome/async_utils.py
@@ -37,7 +37,7 @@
 
 
 async def _ensure_awaitable_callback_result(callback_function, result):
-    if callable(callback_function):
+    if callback_function and callable(callback_function):
         callback_result = callback_function(result)
     else:
         return result
@@ -272,14 +272,15 @@ def __init__(self,
         self._closed = False
         self._message_id = 0
         self.ws = None
-        self.default_recv_callback = default_recv_callback
         self._recv_daemon_break_callback = _recv_daemon_break_callback or self._RECV_DAEMON_BREAK_CALLBACK
         if self.chrome:
             self.req = self.chrome.req
         else:
             self.req = Requests()
         self._listener = Listener()
         self._enabled_domains: Set[str] = set()
+        self._default_recv_callback: List[Callable] = []
+        self.default_recv_callback = default_recv_callback
 
     def __hash__(self):
         return self.tab_id
@@ -306,6 +307,27 @@ def ensure_timeout(self, timeout):
         else:
             return timeout
 
+    @property
+    def default_recv_callback(self):
+        return self._default_recv_callback or []
+
+    @default_recv_callback.setter
+    def default_recv_callback(self, value):
+        if not value:
+            self._default_recv_callback = []
+        elif isinstance(value, list):
+            self._default_recv_callback = value
+        elif callable(value):
+            self._default_recv_callback = [value]
+        else:
+            raise ValueError(
+                'default_recv_callback should be list or callable, and you can use tab.default_recv_callback.append(cb) to add new callback'
+            )
+
+    @default_recv_callback.deleter
+    def default_recv_callback(self):
+        self._default_recv_callback = []
+
     async def close_browser(self, timeout=0):
         return await self.send('Browser.close', timeout=timeout)
 
@@ -405,8 +427,9 @@ async def _recv_daemon(self):
                 logger.debug(
                     f'[json] data_str can not be json.loads: {data_str}')
                 continue
-            await _ensure_awaitable_callback_result(self.default_recv_callback,
-                                                    data_dict)
+            for cb in self.default_recv_callback:
+                asyncio.ensure_future(
+                    _ensure_awaitable_callback_result(cb, data_dict))
             f = self._listener.find_future(data_dict)
             if f:
                 if f._state == _PENDING:
@@ -1008,7 +1031,9 @@ async def setBlockedURLs(self, urls: List[str], timeout=NotSet):
 
         """
         await self.enable('Network')
-        return await self.send('Network.setBlockedURLs', urls=urls, timeout=timeout)
+        return await self.send('Network.setBlockedURLs',
+                               urls=urls,
+                               timeout=timeout)
 
     async def set_url(self,
                       url: Optional[str] = None,
diff --git a/ichrome/base.py b/ichrome/base.py
@@ -118,7 +118,7 @@ def clear_chrome_process(port=None, timeout=None, max_deaths=1, interval=0.5):
                 f"[Killing] {proc}, port: {port}. {' '.join(proc.cmdline())}")
             try:
                 proc.kill()
-            except psutil._exceptions.NoSuchProcess:
+            except (psutil._exceptions.NoSuchProcess, ProcessLookupError):
                 continue
         if port:
             if procs:
diff --git a/ichrome/daemon.py b/ichrome/daemon.py
@@ -193,6 +193,7 @@ def _ensure_user_dir(cls, user_data_dir):
     def _wrap_user_data_dir(self, user_data_dir):
         main_user_dir = self._ensure_user_dir(user_data_dir)
         if main_user_dir is None:
+            self.user_data_dir = None
             return
         port_user_dir = main_user_dir / f"chrome_{self.port}"
         self.user_data_dir = port_user_dir
