Merge branch 'master' into 4020-custom-colours

changedetectionio/blueprint/tags/__init__.py

@@ -29,6 +29,7 @@ def construct_blueprint(datastore: ChangeDetectionStore):
                                  form=add_form,
                                  generate_tag_colors=processors.generate_processor_badge_colors,
                                  tag_count=tag_count,
+                                 wcag_text_color=processors.wcag_text_color,
                                  )
 
         return output

changedetectionio/blueprint/tags/form.py

@@ -12,12 +12,9 @@ class group_restock_settings_form(restock_settings_form):
     overrides_watch = BooleanField('Activate for individual watches in this tag/group?', default=False)
     url_match_pattern = StringField('Auto-apply to watches with URLs matching',
                                     render_kw={"placeholder": "e.g. *://example.com/* or github.com/myorg"})
+    tag_colour = StringField('Tag colour', default='')
 
 class SingleTag(Form):
 
     name = StringField('Tag name', [validators.InputRequired()], render_kw={"placeholder": "Name"})
     save_button = SubmitField('Save', render_kw={"class": "pure-button pure-button-primary"})
-
-
-
-

changedetectionio/blueprint/tags/templates/edit-tag.html

@@ -57,6 +57,32 @@
                         </ul>
                     </div>
                     {% endif %}
+                    <div class="pure-control-group">
+                        <label>{{ _('Tag colour') }}</label>
+                        <div style="display:flex; align-items:center; gap:0.75em;">
+                            <input type="checkbox" id="use_custom_colour"
+                                   {% if data.get('tag_colour') %}checked{% endif %}>
+                            <label for="use_custom_colour" style="margin:0">{{ _('Custom colour') }}</label>
+                            <input type="color" id="tag_colour_picker"
+                                   value="{{ data.get('tag_colour') or '#4f8ef7' }}"
+                                   {% if not data.get('tag_colour') %}disabled{% endif %}>
+                            <input type="hidden" name="tag_colour" id="tag_colour_hidden"
+                                   value="{{ data.get('tag_colour', '') }}">
+                        </div>
+                        <span class="pure-form-message-inline">{{ _('Leave unchecked to use the auto-generated colour based on the tag name.') }}</span>
+                    </div>
+                    <script>
+                    (function () {
+                        var cb = document.getElementById('use_custom_colour');
+                        var picker = document.getElementById('tag_colour_picker');
+                        var hidden = document.getElementById('tag_colour_hidden');
+                        picker.addEventListener('input', function () { hidden.value = this.value; });
+                        cb.addEventListener('change', function () {
+                            picker.disabled = !this.checked;
+                            hidden.value = this.checked ? picker.value : '';
+                        });
+                    })();
+                    </script>
                 </fieldset>
             </div>
 

changedetectionio/blueprint/tags/templates/groups-overview.html

@@ -7,6 +7,9 @@
 {%- for uuid, tag in available_tags -%}
 {%- if tag and tag.title -%}
 {%- set class_name = tag.title|sanitize_tag_class -%}
+{%- if tag.get('tag_colour') -%}
+.watch-tag-list.tag-{{ class_name }} { background-color: {{ tag.tag_colour }}; color: {{ wcag_text_color(tag.tag_colour) }}; }
+{%- else -%}
 {%- set colors = generate_tag_colors(tag.title) -%}
 .watch-tag-list.tag-{{ class_name }} {
   background-color: {{ colors['light']['bg'] }};
@@ -17,6 +20,7 @@ html[data-darkmode="true"] .watch-tag-list.tag-{{ class_name }} {
   color: {{ colors['dark']['color'] }};
 }
 {%- endif -%}
+{%- endif -%}
 {%- endfor -%}
 </style>
 

changedetectionio/blueprint/watchlist/__init__.py

@@ -92,6 +92,7 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
             extra_classes='has-queue' if not update_q.empty() else '',
             form=form,
             generate_tag_colors=processors.generate_processor_badge_colors,
+            wcag_text_color=processors.wcag_text_color,
             guid=datastore.data['app_guid'],
             has_proxies=proxy_list,
             hosted_sticky=os.getenv("SALTED_PASS", False) == False,

changedetectionio/blueprint/watchlist/templates/watch-overview.html

@@ -71,6 +71,13 @@ document.addEventListener('DOMContentLoaded', function() {
 {%- for uuid, tag in tags -%}
 {%- if tag and tag.title -%}
 {%- set class_name = tag.title|sanitize_tag_class -%}
+{%- if tag.get('tag_colour') -%}
+.button-tag.tag-{{ class_name }},
+.watch-tag-list.tag-{{ class_name }} {
+  background-color: {{ tag.tag_colour }};
+  color: {{ wcag_text_color(tag.tag_colour) }};
+}
+{%- else -%}
 {%- set colors = generate_tag_colors(tag.title) -%}
 .button-tag.tag-{{ class_name }} {
   background-color: {{ colors['light']['bg'] }};
@@ -92,6 +99,7 @@ html[data-darkmode="true"] .watch-tag-list.tag-{{ class_name }} {
   color: {{ colors['dark']['color'] }};
 }
 {%- endif -%}
+{%- endif -%}
 {%- endfor -%}
 </style>
 <div class="box" id="form-quick-watch-add">

changedetectionio/diff/__init__.py

@@ -76,7 +76,7 @@ def extract_changed_to(raw_diff: str) -> str:
     return '\n'.join(m.group(1) or m.group(2) for m in _EXTRACT_ADDED_RE.finditer(raw_diff))
 
 
-def render_inline_word_diff(before_line: str, after_line: str, ignore_junk: bool = False, markdown_style: str = None, tokenizer: str = 'words_and_html', include_change_type_prefix: bool = True) -> tuple[str, bool]:
+def render_inline_word_diff(before_line: str, after_line: str, ignore_junk: bool = False, markdown_style: str = None, tokenizer: str = 'words_and_html') -> tuple[str, bool]:
     """
     Render word-level differences between two lines inline using diff-match-patch library.
 
@@ -163,20 +163,14 @@ def render_inline_word_diff(before_line: str, after_line: str, ignore_junk: bool
         if removed_tokens:
             removed_full = ''.join(removed_tokens).rstrip()
             trailing_removed = ''.join(removed_tokens)[len(removed_full):] if len(''.join(removed_tokens)) > len(removed_full) else ''
-            if include_change_type_prefix:
-                result_parts.append(f'{CHANGED_PLACEMARKER_OPEN}{removed_full}{CHANGED_PLACEMARKER_CLOSED}{trailing_removed}')
-            else:
-                result_parts.append(f'{removed_full}{trailing_removed}')
+            result_parts.append(f'{CHANGED_PLACEMARKER_OPEN}{removed_full}{CHANGED_PLACEMARKER_CLOSED}{trailing_removed}')
 
         if added_tokens:
             if result_parts:  # Add newline between removed and added
                 result_parts.append('\n')
             added_full = ''.join(added_tokens).rstrip()
             trailing_added = ''.join(added_tokens)[len(added_full):] if len(''.join(added_tokens)) > len(added_full) else ''
-            if include_change_type_prefix:
-                result_parts.append(f'{CHANGED_INTO_PLACEMARKER_OPEN}{added_full}{CHANGED_INTO_PLACEMARKER_CLOSED}{trailing_added}')
-            else:
-                result_parts.append(f'{added_full}{trailing_added}')
+            result_parts.append(f'{CHANGED_INTO_PLACEMARKER_OPEN}{added_full}{CHANGED_INTO_PLACEMARKER_CLOSED}{trailing_added}')
 
         return ''.join(result_parts), has_changes
     else:
@@ -186,27 +180,21 @@ def render_inline_word_diff(before_line: str, after_line: str, ignore_junk: bool
             if op == 0:  # Equal
                 result_parts.append(text)
             elif op == 1:  # Insertion
-                if not include_change_type_prefix:
-                    result_parts.append(text)
+                # Don't wrap empty content (e.g., whitespace-only tokens after rstrip)
+                content = text.rstrip()
+                trailing = text[len(content):] if len(text) > len(content) else ''
+                if content:
+                    result_parts.append(f'{ADDED_PLACEMARKER_OPEN}{content}{ADDED_PLACEMARKER_CLOSED}{trailing}')
                 else:
-                    # Don't wrap empty content (e.g., whitespace-only tokens after rstrip)
-                    content = text.rstrip()
-                    trailing = text[len(content):] if len(text) > len(content) else ''
-                    if content:
-                        result_parts.append(f'{ADDED_PLACEMARKER_OPEN}{content}{ADDED_PLACEMARKER_CLOSED}{trailing}')
-                    else:
-                        result_parts.append(trailing)
+                    result_parts.append(trailing)
             elif op == -1:  # Deletion
-                if not include_change_type_prefix:
-                    result_parts.append(text)
+                # Don't wrap empty content (e.g., whitespace-only tokens after rstrip)
+                content = text.rstrip()
+                trailing = text[len(content):] if len(text) > len(content) else ''
+                if content:
+                    result_parts.append(f'{REMOVED_PLACEMARKER_OPEN}{content}{REMOVED_PLACEMARKER_CLOSED}{trailing}')
                 else:
-                    # Don't wrap empty content (e.g., whitespace-only tokens after rstrip)
-                    content = text.rstrip()
-                    trailing = text[len(content):] if len(text) > len(content) else ''
-                    if content:
-                        result_parts.append(f'{REMOVED_PLACEMARKER_OPEN}{content}{REMOVED_PLACEMARKER_CLOSED}{trailing}')
-                    else:
-                        result_parts.append(trailing)
+                    result_parts.append(trailing)
 
         return ''.join(result_parts), has_changes
 
@@ -402,7 +390,7 @@ def customSequenceMatcher(
 
             # Use inline word-level diff for single line replacements when word_diff is enabled
             if word_diff and len(before_lines) == 1 and len(after_lines) == 1:
-                inline_diff, has_changes = render_inline_word_diff(before_lines[0], after_lines[0], ignore_junk=ignore_junk, tokenizer=tokenizer, include_change_type_prefix=include_change_type_prefix)
+                inline_diff, has_changes = render_inline_word_diff(before_lines[0], after_lines[0], ignore_junk=ignore_junk, tokenizer=tokenizer)
                 # Check if there are any actual changes (not just whitespace when ignore_junk is enabled)
                 if ignore_junk and not has_changes:
                     # No real changes, skip this line

changedetectionio/processors/__init__.py

@@ -341,6 +341,18 @@ def get_processor_descriptions():
     return descriptions
 
 
+def wcag_text_color(hex_bg: str) -> str:
+    """Return #000000 or #ffffff for maximum WCAG contrast against hex_bg."""
+    hex_bg = hex_bg.lstrip('#')
+    if len(hex_bg) != 6:
+        return '#000000'
+    r, g, b = (int(hex_bg[i:i+2], 16) / 255 for i in (0, 2, 4))
+    def lin(c):
+        return c / 12.92 if c <= 0.04045 else ((c + 0.055) / 1.055) ** 2.4
+    L = 0.2126 * lin(r) + 0.7152 * lin(g) + 0.0722 * lin(b)
+    return '#000000' if L > 0.179 else '#ffffff'
+
+
 def generate_processor_badge_colors(processor_name):
     """
     Generate consistent colors for a processor badge based on its name.

changedetectionio/tests/unit/test_notification_diff.py

@@ -462,61 +462,5 @@ Line 3 with tabs and spaces"""
         self.assertEqual(extract_changed_to(raw),   "")
 
 
-    def test_word_diff_no_prefix_whole_line_replaced(self):
-        """When include_change_type_prefix=False, word-level diffs for whole-line
-        replacements must not include placemarkers (issue #3816)."""
-        before = "73"
-        after = "100"
-
-        raw = diff.render_diff(before, after, word_diff=True, include_change_type_prefix=False)
-
-        self.assertNotIn('PLACEMARKER', raw)
-        # Should contain just the raw values separated by newline
-        self.assertIn('73', raw)
-        self.assertIn('100', raw)
-
-    def test_word_diff_no_prefix_inline_changes(self):
-        """When include_change_type_prefix=False, inline word-level diffs
-        must not include placemarkers (issue #3816)."""
-        before = "the price is 50 dollars"
-        after = "the price is 75 dollars"
-
-        raw = diff.render_diff(before, after, word_diff=True, include_change_type_prefix=False)
-
-        self.assertNotIn('PLACEMARKER', raw)
-        self.assertIn('50', raw)
-        self.assertIn('75', raw)
-
-    def test_word_diff_with_prefix_still_wraps(self):
-        """Default include_change_type_prefix=True must still wrap tokens."""
-        before = "73"
-        after = "100"
-
-        raw = diff.render_diff(before, after, word_diff=True, include_change_type_prefix=True)
-
-        self.assertIn('PLACEMARKER', raw)
-
-    def test_word_diff_no_prefix_exact_output(self):
-        """Pin exact output for include_change_type_prefix=False to catch regressions.
-
-        Whole-line replacement: old and new values separated by newline, no markers.
-        Inline partial replacement: equal tokens kept, changed tokens (both old and new)
-        appended without markers — this means old+new are concatenated in place.
-        """
-        # Whole-line replaced: both values on separate lines, clean
-        raw = diff.render_diff('73', '100', word_diff=True, include_change_type_prefix=False)
-        self.assertEqual(raw, '73\n100')
-
-        # Inline word replacement: equal context preserved, old+new token concatenated in-place
-        raw = diff.render_diff('the price is 50 dollars', 'the price is 75 dollars',
-                               word_diff=True, include_change_type_prefix=False)
-        self.assertEqual(raw, 'the price is 5075 dollars')
-
-        # Sanity: with prefix the whole-line case is fully wrapped
-        raw = diff.render_diff('73', '100', word_diff=True, include_change_type_prefix=True)
-        self.assertEqual(raw, '@changed_PLACEMARKER_OPEN73@changed_PLACEMARKER_CLOSED\n'
-                               '@changed_into_PLACEMARKER_OPEN100@changed_into_PLACEMARKER_CLOSED')
-
-
 if __name__ == '__main__':
     unittest.main()