webchanges 3.38.0__tar.gz → 3.39.0__tar.gz

{webchanges-3.38.0/webchanges.egg-info → webchanges-3.39.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webchanges
-Version: 3.38.0
+Version: 3.39.0
 Summary: Web Changes Delivered. AI-Summarized. Totally Anonymous.
 Author-email: Mike Borsetti <mike+webchanges@borsetti.com>
 Maintainer-email: Mike Borsetti <mike+webchanges@borsetti.com>
@@ -123,22 +123,25 @@ notifications and AI-powered summaries to your favorite `platform
 
 Highlights
 ==========
-- **AI-powered change summaries** via Gemini (`ai_google differ
-  <https://webchanges.readthedocs.io/en/stable/differs.html#ai-google-diff>`__, BETA).
-- **Structural diffs for JSON and XML** via the `deepdiff differ
-  <https://webchanges.readthedocs.io/en/stable/differs.html#deepdiff-diff>`__.
-- **Visual diffs for images** via the `image differ
-  <https://webchanges.readthedocs.io/en/stable/differs.html#image-diff>`__ (BETA).
-- **Bypass TLS/JA3 fingerprinting** with the optional `curl_cffi
-  <https://webchanges.readthedocs.io/en/stable/jobs.html#http-client>`__ HTTP client.
-- **JSON-Schema-validated** ``jobs.yaml`` and ``config.yaml`` for editor autocompletion and inline validation.
+- **Watch anything**: web pages (in a `real browser
+  <https://webchanges.readthedocs.io/en/stable/jobs.html#use-browser>`__ if needed), APIs, local files and command
+  output.
+- **Track only what matters** with over 30 `filters <https://webchanges.readthedocs.io/en/stable/filters.html>`__.
+- **Read changes at a glance** in formatted HTML, side by side, word by word, as `AI summaries
+  <https://webchanges.readthedocs.io/en/stable/differs.html#ai-google-diff>`__ and more.
+- **Get notified anywhere**: email, Telegram, Discord, ntfy, webhooks and `more
+  <https://webchanges.readthedocs.io/en/stable/reporters.html>`__.
+- **Few false alarms**: transient errors can be held back and repeated ones reported `once
+  <https://webchanges.readthedocs.io/en/stable/jobs.html#suppress-repeated-errors>`__.
+- **Runs on your machine**, total privacy, no account needed, and extends with Python `hooks
+  <https://webchanges.readthedocs.io/en/stable/hooks.html>`__.
 
 
 Requirements
 ============
 **webchanges** requires |support|. For the best experience, use the current version of `Python
-<https://www.python.org/downloads/>`__; older Python versions are supported for 3 years after they're replaced. Free-threaded Python is supported, though some
-optional dependencies may not be.
+<https://www.python.org/downloads/>`__; older Python versions are supported for 3 years after they're replaced.
+Free-threaded Python is supported.
 
 For Generative AI summaries (BETA), you need a free `API Key from Google Cloud AI Studio
 <https://aistudio.google.com/app/apikey>`__ (see `here
@@ -224,7 +227,7 @@ Schedule
 
 Code
 ====
-|coveralls| |issues| |code_style| |OpenSSF_Scorecard|
+|coveralls| |issues| |code_style|
 
 The code, issues tracker, and discussions are hosted on `GitHub <https://github.com/mborsetti/webchanges>`__.
 
@@ -243,10 +246,11 @@ License
 =======
 |license|
 
-See the `complete licenses <https://raw.githubusercontent.com/mborsetti/webchanges/refs/heads/main/LICENSE.md>`__ (released
-under the `MIT License <https://opensource.org/licenses/MIT>`__ but redistributing modified source code, dated 30
-July 2020, from `urlwatch 2.21 <https://github.com/thp/urlwatch/tree/346b25914b0418342ffe2fb0529bed702fddc01f>`__
-licensed under a `BSD 3-Clause License
+See the `complete licenses
+<https://raw.githubusercontent.com/mborsetti/webchanges/refs/heads/main/LICENSE.md>`__ (released under the `MIT
+License <https://opensource.org/licenses/MIT>`__ but redistributing modified source code, dated 30 July 2020, from
+`urlwatch 2.21 <https://github.com/thp/urlwatch/tree/346b25914b0418342ffe2fb0529bed702fddc01f>`__ licensed under a
+`BSD 3-Clause License
 <https://raw.githubusercontent.com/thp/urlwatch/346b25914b0418342ffe2fb0529bed702fddc01f/COPYING>`__).
 
 
@@ -302,6 +306,3 @@ see the `comparison <https://webchanges.readthedocs.io/en/stable/upgrading.html>
 .. .. |snyk| image:: https://snyk.io/advisor/python/webchanges/badge.svg
 ..     :target: https://security.snyk.io/package/pip/webchanges
 ..     :alt: Snyk Package Health Score
-.. |OpenSSF_Scorecard| image:: https://api.scorecard.dev/projects/github.com/mborsetti/webchanges/badge
-    :target: https://scorecard.dev/viewer/?uri=github.com/mborsetti/webchanges
-    :alt: OpenSSF Scoreard

{webchanges-3.38.0 → webchanges-3.39.0}/README.rst

@@ -16,22 +16,25 @@ notifications and AI-powered summaries to your favorite `platform
 
 Highlights
 ==========
-- **AI-powered change summaries** via Gemini (`ai_google differ
-  <https://webchanges.readthedocs.io/en/stable/differs.html#ai-google-diff>`__, BETA).
-- **Structural diffs for JSON and XML** via the `deepdiff differ
-  <https://webchanges.readthedocs.io/en/stable/differs.html#deepdiff-diff>`__.
-- **Visual diffs for images** via the `image differ
-  <https://webchanges.readthedocs.io/en/stable/differs.html#image-diff>`__ (BETA).
-- **Bypass TLS/JA3 fingerprinting** with the optional `curl_cffi
-  <https://webchanges.readthedocs.io/en/stable/jobs.html#http-client>`__ HTTP client.
-- **JSON-Schema-validated** ``jobs.yaml`` and ``config.yaml`` for editor autocompletion and inline validation.
+- **Watch anything**: web pages (in a `real browser
+  <https://webchanges.readthedocs.io/en/stable/jobs.html#use-browser>`__ if needed), APIs, local files and command
+  output.
+- **Track only what matters** with over 30 `filters <https://webchanges.readthedocs.io/en/stable/filters.html>`__.
+- **Read changes at a glance** in formatted HTML, side by side, word by word, as `AI summaries
+  <https://webchanges.readthedocs.io/en/stable/differs.html#ai-google-diff>`__ and more.
+- **Get notified anywhere**: email, Telegram, Discord, ntfy, webhooks and `more
+  <https://webchanges.readthedocs.io/en/stable/reporters.html>`__.
+- **Few false alarms**: transient errors can be held back and repeated ones reported `once
+  <https://webchanges.readthedocs.io/en/stable/jobs.html#suppress-repeated-errors>`__.
+- **Runs on your machine**, total privacy, no account needed, and extends with Python `hooks
+  <https://webchanges.readthedocs.io/en/stable/hooks.html>`__.
 
 
 Requirements
 ============
 **webchanges** requires |support|. For the best experience, use the current version of `Python
-<https://www.python.org/downloads/>`__; older Python versions are supported for 3 years after they're replaced. Free-threaded Python is supported, though some
-optional dependencies may not be.
+<https://www.python.org/downloads/>`__; older Python versions are supported for 3 years after they're replaced.
+Free-threaded Python is supported.
 
 For Generative AI summaries (BETA), you need a free `API Key from Google Cloud AI Studio
 <https://aistudio.google.com/app/apikey>`__ (see `here
@@ -117,7 +120,7 @@ Schedule
 
 Code
 ====
-|coveralls| |issues| |code_style| |OpenSSF_Scorecard|
+|coveralls| |issues| |code_style|
 
 The code, issues tracker, and discussions are hosted on `GitHub <https://github.com/mborsetti/webchanges>`__.
 
@@ -136,10 +139,11 @@ License
 =======
 |license|
 
-See the `complete licenses <https://raw.githubusercontent.com/mborsetti/webchanges/refs/heads/main/LICENSE.md>`__ (released
-under the `MIT License <https://opensource.org/licenses/MIT>`__ but redistributing modified source code, dated 30
-July 2020, from `urlwatch 2.21 <https://github.com/thp/urlwatch/tree/346b25914b0418342ffe2fb0529bed702fddc01f>`__
-licensed under a `BSD 3-Clause License
+See the `complete licenses
+<https://raw.githubusercontent.com/mborsetti/webchanges/refs/heads/main/LICENSE.md>`__ (released under the `MIT
+License <https://opensource.org/licenses/MIT>`__ but redistributing modified source code, dated 30 July 2020, from
+`urlwatch 2.21 <https://github.com/thp/urlwatch/tree/346b25914b0418342ffe2fb0529bed702fddc01f>`__ licensed under a
+`BSD 3-Clause License
 <https://raw.githubusercontent.com/thp/urlwatch/346b25914b0418342ffe2fb0529bed702fddc01f/COPYING>`__).
 
 
@@ -194,7 +198,4 @@ see the `comparison <https://webchanges.readthedocs.io/en/stable/upgrading.html>
 ..     :alt: Security Status
 .. .. |snyk| image:: https://snyk.io/advisor/python/webchanges/badge.svg
 ..     :target: https://security.snyk.io/package/pip/webchanges
-..     :alt: Snyk Package Health Score
-.. |OpenSSF_Scorecard| image:: https://api.scorecard.dev/projects/github.com/mborsetti/webchanges/badge
-    :target: https://scorecard.dev/viewer/?uri=github.com/mborsetti/webchanges
-    :alt: OpenSSF Scoreard
+..     :alt: Snyk Package Health Score

{webchanges-3.38.0 → webchanges-3.39.0}/webchanges/__init__.py

@@ -22,7 +22,7 @@ __project_name__ = str(__package__)
 # * MINOR version when you add functionality in a backwards compatible manner, and
 # * MICRO or PATCH version when you make backwards compatible bug fixes. We no longer use '0'
 # If unsure on increments, use pkg_resources.parse_version to parse
-__version__ = '3.38.0'
+__version__ = '3.39.0'
 __description__ = (
     'Check web (or command output) for changes since last run and notify.\n\nAnonymously alerts you of web changes.'
 )

{webchanges-3.38.0 → webchanges-3.39.0}/webchanges/_resources/config.schema.json

@@ -334,6 +334,11 @@
           "description": "Sender's email address. Do not use a primary mailbox; create a throwaway account for webchanges.",
           "default": ""
         },
+        "reply_to": {
+          "type": "string",
+          "description": "Reply-To email address(es), used by email clients when replying to the report. For multiple addresses, concatenate with commas. If blank, no Reply-To header is sent.",
+          "default": ""
+        },
         "subject": {
           "type": "string",
           "description": "Subject line. Use {count}, {jobs}, and {jobs_files} placeholders (see html.title for details).",
@@ -984,6 +989,21 @@
             { "$ref": "#/$defs/_ConfigReportXmpp" },
             { "type": "array", "items": { "$ref": "#/$defs/_ConfigReportXmpp" }, "minItems": 1 }
           ]
+        },
+        "mattermost": {
+          "type": ["object", "array"],
+          "description": "Deprecated (legacy); replace with 'webhook' and add 'markdown: true'. Still runs as a webhook reporter with Markdown.",
+          "deprecated": true
+        },
+        "shell": {
+          "type": ["object", "array"],
+          "description": "Deprecated (legacy); replace with 'run_command'. Still runs its 'command' (a string or a list of arguments, without a shell) with the text report on its standard input; sub-directives 'command', 'ignore_stdout' (default true) and 'ignore_stderr' (default false).",
+          "deprecated": true
+        },
+        "slack": {
+          "type": ["object", "array"],
+          "description": "Deprecated (legacy); rename to 'webhook' (same sub-directives). Still runs as a webhook reporter.",
+          "deprecated": true
         }
       }
     },

{webchanges-3.38.0 → webchanges-3.39.0}/webchanges/_resources/jobs.schema.json

@@ -169,6 +169,11 @@
       "description": "If true, accepts a server's weak (1024-bit) Diffie-Hellman key by lowering the OpenSSL security level (certificates are still verified). Supported by http_client httpx and requests, not by curl_cffi.",
       "default": false
     },
+    "ignore_incomplete_reads": {
+      "type": "boolean",
+      "description": "If true, suppresses errors caused by the server closing the connection before sending the complete response. Not supported with use_browser: true.",
+      "default": false
+    },
     "params": {
       "type": "object",
       "additionalProperties": { "type": "string" },
@@ -369,9 +374,22 @@
       "deprecated": true,
       "deprecationMessage": "Use 'url' with 'use_browser: true' instead of 'navigate'."
     },
+    "useragent": {
+      "type": "string",
+      "description": "Deprecated (legacy): set a 'User-Agent' header in 'headers' instead.",
+      "deprecated": true,
+      "deprecationMessage": "Set a 'User-Agent' header in 'headers' instead of 'useragent'."
+    },
+    "browser": {
+      "type": "string",
+      "enum": ["chromium", "firefox", "webkit"],
+      "description": "Deprecated (legacy): use 'use_browser: <browser>' instead ('chromium' is 'use_browser: true').",
+      "deprecated": true,
+      "deprecationMessage": "Use 'use_browser: <browser>' instead of 'browser'."
+    },
     "wait_for": {
       "type": ["integer", "string"],
-      "description": "No longer supported (Pyppeteer): use 'wait_for_function', 'wait_for_selector' or 'wait_for_timeout' instead.",
+      "description": "No longer supported (Pyppeteer): use 'wait_for_function', 'wait_for_selector' or 'wait_for_timeout' instead. In legacy 'navigate' jobs, a selector, run as 'wait_for_selector'.",
       "deprecated": true,
       "deprecationMessage": "Use 'wait_for_function', 'wait_for_selector' or 'wait_for_timeout' instead of 'wait_for'."
     },
@@ -383,8 +401,9 @@
     },
     "stderr": {
       "type": "string",
-      "description": "Ignored; accepted for compatibility with urlwatch (command jobs).",
-      "deprecated": true
+      "enum": ["ignore", "forward", "fail", "stdout"],
+      "description": "What to do with the standard error output of a command job: 'ignore' reports it only when the command fails (exits with a non-zero code), 'forward' also writes it to webchanges' own standard error, 'fail' fails the job if there is any, and 'stdout' merges it into the standard output, i.e. into the data. For backward compatibility, 'urlwatch' is accepted for 'forward'.",
+      "default": "ignore"
     },
     "differ": {
       "oneOf": [
@@ -744,6 +763,11 @@
       "type": "boolean",
       "description": "If true, only report the first occurrence of an error."
     },
+    "treat_new_as_changed": {
+      "type": "boolean",
+      "description": "If true, report a new job (its first successful run) as changed, with its content shown as a diff from empty content, instead of as new.",
+      "default": false
+    },
     "compared_versions": {
       "type": "integer",
       "description": "Number of versions to keep/compare."

{webchanges-3.38.0 → webchanges-3.39.0}/webchanges/cli.py

@@ -72,7 +72,12 @@ def migrate_from_legacy(
         ('hooks.py', hooks_file),
     ]
     if any(dest is not None for _, dest in yaml_dests):
+        # Like urlwatch itself: ~/.urlwatch if it exists, otherwise the platform's configuration directory (e.g.
+        # ~/.config/urlwatch on Linux).
         legacy_project_path = Path.home() / f'.{legacy_package}'
+        if not legacy_project_path.is_dir():
+            legacy_project_path = platformdirs.user_config_path(legacy_package)
+        logger.debug('Looking for legacy %s files in %s', legacy_package, legacy_project_path)
         if legacy_project_path.is_dir():
             pairs.extend((legacy_project_path / name, dest) for name, dest in yaml_dests if dest is not None)
 

{webchanges-3.38.0 → webchanges-3.39.0}/webchanges/command.py

@@ -103,19 +103,23 @@ class UrlwatchCommand:
     def jobs_from_joblist(self) -> Iterator[JobBase]:
         """Generates the jobs to process from the joblist and/or the tags entered in the CLI."""
         if self.urlwatcher.urlwatch_config.joblist:
-            jobs = [self._find_job(job_entry) for job_entry in self.urlwatcher.urlwatch_config.joblist]
+            # A job selected more than once (e.g. by its index and by its URL, or by --prepare-jobs adding a new job
+            # that was also selected) is run only once.
+            jobs = list(
+                dict.fromkeys(self._find_job(job_entry) for job_entry in self.urlwatcher.urlwatch_config.joblist)
+            )
             enabled_jobs = [job for job in jobs if job.is_enabled()]
-            disabled = len(enabled_jobs) - len(jobs)
+            disabled = len(jobs) - len(enabled_jobs)
             disabled_str = f' (excluding {disabled} disabled)' if disabled else ''
             logger.debug(
-                f'Processing {len(enabled_jobs)} job{"s" if enabled_jobs else ""}{disabled_str} as specified in '
-                f'command line: {", ".join(str(j) for j in self.urlwatcher.urlwatch_config.joblist)}'
+                f'Processing {len(enabled_jobs)} job{"s" if len(enabled_jobs) != 1 else ""}{disabled_str} as '
+                f'specified in command line: {", ".join(str(j) for j in self.urlwatcher.urlwatch_config.joblist)}'
             )
         else:
             enabled_jobs = [job for job in self.urlwatcher.jobs if job.is_enabled()]
-            disabled = len(enabled_jobs) - len(self.urlwatcher.jobs)
+            disabled = len(self.urlwatcher.jobs) - len(enabled_jobs)
             disabled_str = f' (excluding {disabled} disabled)' if disabled else ''
-            logger.debug(f'Processing {len(enabled_jobs)} job{"s" if enabled_jobs else ""}{disabled_str}')
+            logger.debug(f'Processing {len(enabled_jobs)} job{"s" if len(enabled_jobs) != 1 else ""}{disabled_str}')
 
         tags = self.tags_from_cli()
         if tags:
@@ -196,11 +200,12 @@ class UrlwatchCommand:
     def _find_job(self, query: str | int) -> JobBase:
         """Finds the job based on a query.
 
-        It is matched to the job index (also negative) or a job location (i.e. the url/user_visible_url or command).
+        It is matched to the job index (also negative), a job name, or a job location (i.e. the url/user_visible_url
+        or command).
 
         :param query: The query.
         :return: The matching JobBase.
-        :raises IndexError: If job is not found.
+        :raises ValueError: If no job, or more than one job, matches.
         """
         if isinstance(query, int):
             index = query
@@ -208,11 +213,25 @@ class UrlwatchCommand:
             try:
                 index = int(query)
             except ValueError:
-                query = unquote_plus(query)
-                try:
-                    return next((job for job in self.urlwatcher.jobs if unquote_plus(job.get_location()) == query))
-                except StopIteration:
-                    raise ValueError(f"Job {query} does not match any job's url/user_visible_url or command.") from None
+                location = unquote_plus(query)
+                jobs = [
+                    job
+                    for job in self.urlwatcher.jobs
+                    if job.name == query or unquote_plus(job.get_location()) == location
+                ]
+                if not jobs:
+                    raise ValueError(
+                        f"Job {query} does not match any job's name, url/user_visible_url or command."
+                    ) from None
+                if len(jobs) > 1:
+                    raise ValueError(
+                        f'Job {query} matches {len(jobs)} jobs; select the job by its index number instead:\n'
+                        + '\n'.join(
+                            f'• {job.get_indexed_location()}' + (f' ({job.name})' if job.name else '') for job in jobs
+                        )
+                    ) from None
+                logger.debug('Job %s matched %s', query, jobs[0].get_indexed_location())
+                return jobs[0]
 
         if index == 0:
             raise ValueError(f'Job index {index} out of range.')
@@ -226,7 +245,7 @@ class UrlwatchCommand:
     def _find_job_with_defaults(self, query: str | int) -> JobBase:
         """Returns the job with defaults based on job_id.
 
-        This could match an index or a location (url/user_visible_url or command). Accepts negative numbers.
+        This could match an index, a name or a location (url/user_visible_url or command). Accepts negative numbers.
 
         :param query: The query.
         :return: The matching JobBase with defaults.
@@ -813,6 +832,8 @@ class UrlwatchCommand:
                     ('--delete', self.urlwatch_config.delete),
                     ('--add', self.urlwatch_config.add),
                     ('--change-location', self.urlwatch_config.change_location),
+                    ('--enable', self.urlwatch_config.enable),
+                    ('--disable', self.urlwatch_config.disable),
                 )
                 if value is not None
             )
@@ -829,10 +850,13 @@ class UrlwatchCommand:
                 if sys.__stdin__ and sys.__stdin__.isatty():
                     print(
                         f'WARNING: About to permanently delete {job.get_indexed_location()}.\n'
-                        '         Job file will be overwritten and all remarks lost.'
+                        '         Job file will be overwritten and all remarks lost.\n'
                         '         This operation cannot be undone!\n'
                     )
-                    resp = input("         Please enter 'Y' to proceed: ")
+                    try:
+                        resp = input("         Please enter 'Y' to proceed: ")
+                    except EOFError:  # e.g. stdin redirected from NUL on Windows, which isatty() reports as a terminal
+                        resp = ''
                     if not resp.upper().startswith('Y'):
                         print(f'Quitting. Job {job.index_number} has not been deleted and job file is unmodified.')
                         return 1
@@ -885,11 +909,61 @@ class UrlwatchCommand:
                 print(f'Job not found: "{self.urlwatch_config.change_location[0]}".')
                 return 1
             message = 'Do you want me to update the jobs file (remarks will be lost)? [y/N] '
-            if not input(message).lower().startswith('y'):
+            try:
+                resp = input(message)
+            except EOFError:  # no input available (e.g. run by cron, or stdin redirected from the null device)
+                resp = ''
+            if not resp.lower().startswith('y'):
                 print(f'Please manually update the jobs file by replacing "{old_loc}" with "{new_loc}".')
             else:
                 self.urlwatcher.jobs_storage.save(self.urlwatcher.jobs)
 
+        for query, enable in ((self.urlwatch_config.enable, True), (self.urlwatch_config.disable, False)):
+            if query is not None and self._set_job_enabled(query, enable):
+                return 1
+
+        return 0
+
+    def _set_job_enabled(self, query: str, enable: bool) -> int:
+        """Enable or disable a job (urlwatch's --enable and --disable) by setting its 'enabled' directive and
+        rewriting the jobs file, which loses its remarks.
+
+        :param query: The job's index number, name or URL/command.
+        :param enable: True to enable the job, False to disable it.
+        :returns: 0 if successful (including when the job already was in the state requested), 1 otherwise.
+        """
+        verb = 'enable' if enable else 'disable'
+        try:
+            job = self._find_job(query)
+        except ValueError as e:
+            print(e)
+            return 1
+        config = self.urlwatcher.config_storage.config
+        if job.with_defaults(config).is_enabled() == enable:
+            print(f'Job {job.index_number} is already {verb}d: {job.get_location()}. The jobs file is unmodified.')
+            return 0
+        if sys.__stdin__ and sys.__stdin__.isatty():
+            print(
+                f'WARNING: About to {verb} {job.get_indexed_location()}.\n'
+                '         Job file will be overwritten and all remarks lost.\n'
+            )
+            try:
+                resp = input("         Please enter 'Y' to proceed: ")
+            except EOFError:  # e.g. stdin redirected from NUL on Windows, which isatty() reports as a terminal
+                resp = ''
+            if not resp.upper().startswith('Y'):
+                print(f'Quitting. Job {job.index_number} has not been {verb}d and job file is unmodified.')
+                return 1
+        if enable:
+            # Remove the directive, unless the job would remain disabled by job_defaults
+            job.enabled = None
+            if not job.with_defaults(config).is_enabled():
+                job.enabled = True
+        else:
+            job.enabled = False
+        logger.info('Job %s: %sd (enabled: %s)', job.index_number, verb, job.enabled)
+        print(f'{verb.capitalize()}d job {job.index_number}: {job.get_location()}.')
+        self.urlwatcher.jobs_storage.save(self.urlwatcher.jobs)
         return 0
 
     def check_telegram_chats(self) -> None:
@@ -1227,7 +1301,13 @@ class UrlwatchCommand:
         if self.urlwatch_config.dump_history:
             self._exit(self.dump_history(self.urlwatch_config.dump_history))
 
-        if self.urlwatch_config.add or self.urlwatch_config.delete or self.urlwatch_config.change_location:
+        if (
+            self.urlwatch_config.add
+            or self.urlwatch_config.delete
+            or self.urlwatch_config.change_location
+            or self.urlwatch_config.enable
+            or self.urlwatch_config.disable
+        ):
             self._exit(self.modify_urls())
 
         if self.urlwatch_config.test_reporter and not self.urlwatch_config.joblist:

{webchanges-3.38.0 → webchanges-3.39.0}/webchanges/config.py

@@ -42,10 +42,12 @@ class CommandConfig(BaseConfig):
     delete: str | None
     delete_snapshot: str | None
     detailed_versions: bool
+    disable: str | None
     dump_history: str | None
     edit: bool
     edit_config: bool
     edit_hooks: bool
+    enable: str | None
     errors: str | None
     features: bool
     footnote: str | None
@@ -136,7 +138,7 @@ class CommandConfig(BaseConfig):
         parser.add_argument(
             'joblist',
             nargs='*',
-            help=('JOB(S) to run (index number(s) as per --list; if one also URL/command) (default: run all jobs)'),
+            help='JOB(S) to run (index number(s) as per --list, name(s) or URL(s)/command(s)) (default: run all jobs)',
             metavar='JOB(S)',
         )
         parser.add_argument(
@@ -216,6 +218,16 @@ class CommandConfig(BaseConfig):
             metavar='REGEX',
             dest='list_jobs',
         )
+        group.add_argument(
+            '--enable',
+            help='enable a JOB (by index, name or URL/command) by rewriting the jobs file, losing its remarks',
+            metavar='JOB',
+        )
+        group.add_argument(
+            '--disable',
+            help='disable a JOB (by index, name or URL/command) by rewriting the jobs file, losing its remarks',
+            metavar='JOB',
+        )
         group.add_argument(
             '--tags',
             action='append',
@@ -234,8 +246,8 @@ class CommandConfig(BaseConfig):
             '--test',
             nargs='?',
             const=True,
-            help='test a JOB (by index or URL/command) and show filtered output; if no JOB, check config and jobs '
-            'file(s) syntax for errors',
+            help='test a JOB (by index, name or URL/command) and show filtered output; if no JOB, check config and '
+            'jobs file(s) syntax for errors',
             metavar='JOB',
             dest='test_job',
         )
@@ -255,8 +267,8 @@ class CommandConfig(BaseConfig):
         group.add_argument(
             '--test-differ',
             nargs='+',
-            help='show diff(s) using existing saved snapshots of a JOB (by index or URL/command); can be combined with '
-            '--test-reporter',
+            help='show diff(s) using existing saved snapshots of a JOB (by index, name or URL/command); can be '
+            'combined with --test-reporter',
             metavar='JOB',
             dest='test_differ',
         )
@@ -270,7 +282,7 @@ class CommandConfig(BaseConfig):
         )
         group.add_argument(
             '--dump-history',
-            help='print all saved changed snapshots for a JOB (by index or URL/command)',
+            help='print all saved changed snapshots for a JOB (by index, name or URL/command)',
             metavar='JOB',
         )
         group.add_argument(
@@ -377,7 +389,7 @@ class CommandConfig(BaseConfig):
         )
         group.add_argument(
             '--delete-snapshot',
-            help='delete the last saved changed snapshot of JOB (index or URL/command)',
+            help='delete the last saved changed snapshot of JOB (index, name or URL/command)',
             metavar='JOB',
         )
         group.add_argument(
@@ -388,7 +400,7 @@ class CommandConfig(BaseConfig):
         group.add_argument(
             '--change-location',
             nargs=2,
-            help='change the location of an existing JOB (index or URL/command)',
+            help='change the location of an existing JOB (index, name or URL/command)',
             metavar=('JOB', 'NEW_LOCATION'),
         )
 
@@ -437,7 +449,7 @@ class CommandConfig(BaseConfig):
         )
         group.add_argument(
             '--delete',
-            # help='delete a job (by index or URL/command) [use --edit-jobs instead]',
+            # help='delete a job (by index, name or URL/command) [use --edit-jobs instead]',
             help=argparse.SUPPRESS,
             metavar='JOB',
         )

{webchanges-3.38.0 → webchanges-3.39.0}/webchanges/filters/_html.py

@@ -234,6 +234,17 @@ class Html2TextFilter(FilterBase):
         options = subfilter.copy()
         method = options.pop('method', 'html2text')
 
+        if method == 'lynx':  # urlwatch; lynx's options (e.g. width) mean nothing to the html2text package
+            ignored = f' and its options {", ".join(options)}, which are ignored' if options else ''
+            warnings.warn(
+                f"Filter html2text's method 'lynx' is no longer supported and the filter's default method is used "
+                f'instead: remove method{ignored} ({self.job.get_indexed_location()})',
+                DeprecationWarning,
+                stacklevel=1,
+            )
+            method = 'html2text'
+            options = {}
+
         if method in {'html2text', 'pyhtml2text'}:  # pythtml2text for backward compatibility
             if method == 'pyhtml2text':
                 warnings.warn(
@@ -290,12 +301,6 @@ class Html2TextFilter(FilterBase):
             stripped_tags = html.unescape(re.sub(r'<[^>]*>', '', data))
             return '\n'.join((line.rstrip() for line in stripped_tags.splitlines() if line.strip() != '')), 'text/plain'
 
-        if method == 'lynx':
-            raise NotImplementedError(
-                f"Filter html2text's method 'lynx' is no longer supported; for similar results, use the filter without "
-                f'specifying a method. ({self.job.get_indexed_location()})'
-            )
-
         raise ValueError(f"Unknown method {method} for filter 'html2text'. ({self.job.get_indexed_location()})")