playwright helper improvements

haruhi_dl/playwright.py

@@ -3,18 +3,34 @@ from __future__ import unicode_literals
 
 from .utils import (
     ExtractorError,
+    is_outdated_version,
 )
 
 
 class PlaywrightHelper():
     _pw = None
     _pw_version = None
+    pw_instance = None
+    _required_pw_version = '1.8.0a1'
+    _extractor = None
+
+    def __init__(self, extractor):
+        self._extractor = extractor
+
+    @classmethod
+    def _check_version(cls):
+        if 'a' in cls._required_pw_version:
+            return is_outdated_version(cls._pw_version.split('a')[0], cls._required_pw_version.split('a')[0])
+        return is_outdated_version(cls._pw_version, cls._required_pw_version)
 
     @classmethod
     def _real_import_pw(cls):
-        from playwright import sync_playwright, _repo_version
-        cls._pw = sync_playwright
-        cls._pw_version = _repo_version.version
+        from playwright._repo_version import version
+        cls._pw_version = version
+        if cls._check_version() is False:
+            raise ExtractorError('Playwright version %s is required (%s found)' % (cls._required_pw_version, version), expected=True)
+        from playwright.sync_api import sync_playwright
+        cls._pw = lambda x: sync_playwright()
 
     @classmethod
     def _import_pw(cls, fatal=True):
@@ -23,9 +39,40 @@ class PlaywrightHelper():
         except ImportError:
             if fatal is True:
                 raise ExtractorError('Playwright could not be imported', expected=True)
+        except ExtractorError as err:
+            if fatal is True:
+                raise err
 
     @classmethod
     def _version(cls):
         if not cls._pw_version:
             cls._import_pw(fatal=False)
         return cls._pw_version
+
+    def pw(self):
+        if not self._pw:
+            self._import_pw(fatal=True)
+        if not self.pw_instance:
+            self.pw_instance = self._pw().__enter__()
+        return self.pw_instance
+
+    def pw_stop(self):
+        self.pw_instance.stop()
+
+    def browser_stop(self):
+        self.browser.close()
+
+    def open_page(self, url, display_id, browser_used='firefox', note='Opening page in %(browser)s'):
+        pw = self.pw()
+        self.pw_instance = pw
+        browser = {
+            'firefox': pw.firefox,
+            'chromium': pw.chromium,
+            'webkit': pw.webkit,
+        }[browser_used].launch()
+        self.browser = browser
+        if not self._extractor._downloader.params.get('quiet'):
+            self._extractor.to_screen('%s: %s' % (display_id, note % {'browser': browser_used}))
+        page = browser.new_page()
+        page.goto(url)
+        return page