Closes #2330 #2337

changedetectionio/blueprint/browser_steps/browser_steps.py

@@ -49,6 +49,10 @@
 # ONLY Works in Playwright because we need the fullscreen screenshot
 class steppable_browser_interface():
  page = None
+ start_url = None
+
+ def __init__(self, start_url):
+ self.start_url = start_url
 
  # Convert and perform "Click Button" for example
  def call_action(self, action_name, selector=None, optional_value=None):
@@ -87,6 +91,10 @@ def action_goto_url(self, selector=None, value=None):
  logger.debug(f"Time to goto URL {time.time()-now:.2f}s")
  return response
 
+ # Incase they request to go back to the start
+ def action_goto_site(self, selector=None, value=None):
+ return self.action_goto_url(value=self.start_url)
+
  def action_click_element_containing_text(self, selector=None, value=''):
  if not len(value.strip()):
  return

changedetectionio/content_fetchers/base.py

@@ -113,22 +113,21 @@ def get_all_headers(self):
  def browser_steps_get_valid_steps(self):
  if self.browser_steps is not None and len(self.browser_steps):
  valid_steps = filter(
- lambda s: (s['operation'] and len(s['operation']) and s['operation'] != 'Choose one' and s['operation'] != 'Goto site'),
+ lambda s: (s['operation'] and len(s['operation']) and s['operation'] != 'Choose one'),
  self.browser_steps)
 
  return valid_steps
 
  return None
 
- def iterate_browser_steps(self):
+ def iterate_browser_steps(self, start_url=None):
  from changedetectionio.blueprint.browser_steps.browser_steps import steppable_browser_interface
  from playwright._impl._errors import TimeoutError, Error
  from changedetectionio.safe_jinja import render as jinja_render
-
  step_n = 0
 
  if self.browser_steps is not None and len(self.browser_steps):
- interface = steppable_browser_interface()
+ interface = steppable_browser_interface(start_url=start_url)
  interface.page = self.page
  valid_steps = self.browser_steps_get_valid_steps()
 

changedetectionio/content_fetchers/playwright.py

@@ -119,7 +119,7 @@ def run(self,
 
  # Re-use as much code from browser steps as possible so its the same
  from changedetectionio.blueprint.browser_steps.browser_steps import steppable_browser_interface
- browsersteps_interface = steppable_browser_interface()
+ browsersteps_interface = steppable_browser_interface(start_url=url)
  browsersteps_interface.page = self.page
 
  response = browsersteps_interface.action_goto_url(value=url)
@@ -172,7 +172,7 @@ def run(self,
 
  # Run Browser Steps here
  if self.browser_steps_get_valid_steps():
- self.iterate_browser_steps()
+ self.iterate_browser_steps(start_url=url)
 
  self.page.wait_for_timeout(extra_wait * 1000)