Fix small issue in highlight trigger/ignore preview page with setting the background colours, add test

changedetectionio/__init__.py

@@ -764,6 +764,8 @@ def changedetection_app(config=None, datastore_o=None):
     @login_required
     def preview_page(uuid):
         content = []
+        ignored_line_numbers = []
+        trigger_line_numbers = []
 
         # More for testing, possible to return the first/only
         if uuid == 'first':
@@ -782,25 +784,38 @@ def changedetection_app(config=None, datastore_o=None):
             filename = watch['history'][timestamps[-1]]
             try:
                 with open(filename, 'r') as f:
-                    content = f.readlines()
+                    tmp = f.readlines()
-            except:
+
-                content.append("File doesnt exist or unable to read file {}".format(filename))
+                    # Get what needs to be highlighted
-        else:
+                    ignore_rules = watch.get('ignore_text', []) + datastore.data['settings']['application']['global_ignore_text']
-            content.append("No history found")
+
+                    # .readlines will keep the \n, but we will parse it here again, in the future tidy this up
+                    ignored_line_numbers = html_tools.strip_ignore_text(content="".join(tmp),
+                                                                        wordlist=ignore_rules,
+                                                                        mode='line numbers'
+                                                                        )
+
+                    trigger_line_numbers = html_tools.strip_ignore_text(content="".join(tmp),
+                                                                        wordlist=watch['trigger_text'],
+                                                                        mode='line numbers'
+                                                                        )
+                    # Prepare the classes and lines used in the template
+                    i=0
+                    for l in tmp:
+                        classes=[]
+                        i+=1
+                        if i in ignored_line_numbers:
+                            classes.append('ignored')
+                        if i in trigger_line_numbers:
+                            classes.append('triggered')
+                        content.append({'line': l, 'classes': ' '.join(classes)})
 
-        # Get what needs to be highlighted
-        ignore_rules = watch.get('ignore_text', []) + datastore.data['settings']['application']['global_ignore_text']
 
-        # .readlines will keep the \n, but we will parse it here again, in the future tidy this up
+            except Exception as e:
-        ignored_line_numbers = html_tools.strip_ignore_text(content="".join(content),
+                content.append({'line': "File doesnt exist or unable to read file {}".format(filename), 'classes': ''})
-                                                            wordlist=ignore_rules,
+        else:
-                                                            mode='line numbers'
+            content.append({'line': "No history found", 'classes': ''})
-                                                            )
 
-        trigger_line_numbers = html_tools.strip_ignore_text(content="".join(content),
-                                                            wordlist=watch['trigger_text'],
-                                                            mode='line numbers'
-                                                            )
 
         output = render_template("preview.html",
                                  content=content,

changedetectionio/templates/preview.html

@@ -13,10 +13,7 @@
         <tr>
             <td id="diff-col">
                     {% for row in content %}
-                        {% set classes = [] %}
+                    <div class="{{row.classes}}">{{row.line}}</div>
-                           {% if (loop.index in ignored_line_numbers) %}{{ classes.append("ignored") }}{% endif %}
-                           {% if (loop.index in triggered_line_numbers) %}{{ classes.append("triggered") }}{% endif %}
-                    <div class="{{ classes|join(' ') }}">{{row}}</div>
                     {% endfor %}
             </td>
         </tr>