Re #1052 - Watch 'open' link should use any dynamic/template info (#1063)

changedetectionio/fetch_site_status.py

@@ -35,8 +35,6 @@ class perform_site_check():
 
 
     def run(self, uuid):
-        from jinja2 import Environment
-
         changed_detected = False
         screenshot = False  # as bytes
         stripped_text_from_html = ""
@@ -68,9 +66,7 @@ class perform_site_check():
 
         timeout = self.datastore.data['settings']['requests'].get('timeout')
 
-        # Jinja2 available in URLs along with https://pypi.org/project/jinja2-time/
-        jinja2_env = Environment(extensions=['jinja2_time.TimeExtension'])
-        url = str(jinja2_env.from_string(watch.get('url')).render())
+        url = watch.link
 
         request_body = self.datastore.data['watching'][uuid].get('body')
         request_method = self.datastore.data['watching'][uuid].get('method')

changedetectionio/model/Watch.py

@@ -88,6 +88,16 @@ class model(dict):
             print ("> Creating data dir {}".format(self.watch_data_dir))
             os.mkdir(self.watch_data_dir)
 
+    @property
+    def link(self):
+        url = self.get('url', '')
+        if '{%' in url or '{{' in url:
+            from jinja2 import Environment
+            # Jinja2 available in URLs along with https://pypi.org/project/jinja2-time/
+            jinja2_env = Environment(extensions=['jinja2_time.TimeExtension'])
+            return str(jinja2_env.from_string(url).render())
+        return url
+
     @property
     def label(self):
         # Used for sorting

changedetectionio/templates/watch-overview.html

@@ -87,7 +87,7 @@
                     <a class="state-{{'on' if watch.notification_muted}}" href="{{url_for('index', op='mute', uuid=watch.uuid, tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='bell-off.svg')}}" alt="Mute notifications" title="Mute notifications"/></a>
                 </td>
                 <td class="title-col inline">{{watch.title if watch.title is not none and watch.title|length > 0 else watch.url}}
-                    <a class="external" target="_blank" rel="noopener" href="{{ watch.url.replace('source:','') }}"></a>
+                    <a class="external" target="_blank" rel="noopener" href="{{ watch.link.replace('source:','') }}"></a>
                     <a href="{{url_for('form_share_put_watch', uuid=watch.uuid)}}"><img style="height: 1em;display:inline-block;" src="{{url_for('static_content', group='images', filename='spread.svg')}}" /></a>
 
                     {%if watch.fetch_backend == "html_webdriver" %}<img style="height: 1em; display:inline-block;" src="{{url_for('static_content', group='images', filename='Google-Chrome-icon.png')}}" />{% endif %}

requirements.txt

@@ -47,7 +47,7 @@ selenium ~= 4.1.0
 werkzeug ~= 2.0.0
 
 # Templating, so far just in the URLs but in the future can be for the notifications also
-jinja2
+jinja2 ~= 3.1
 jinja2-time
 
 # playwright is installed at Dockerfile build time because it's not available on all platforms