fix(blog): acquitter les GUID apres livraison XMPP
This commit is contained in:
@@ -230,11 +230,13 @@ class PipelineRunner:
|
||||
data = normalize_step(fetched, generated_at=now)
|
||||
|
||||
try:
|
||||
blog_articles = fetch_blog_step(self._blog_client, self._blog_state)
|
||||
blog_result = fetch_blog_step(self._blog_client, self._blog_state)
|
||||
blog_articles = list(blog_result.articles)
|
||||
except PipelineCriticalError:
|
||||
raise
|
||||
except Exception as exc:
|
||||
self._warn("fetch_blog", self._redact(exc))
|
||||
blog_result = None
|
||||
blog_articles = []
|
||||
|
||||
try:
|
||||
@@ -290,8 +292,11 @@ class PipelineRunner:
|
||||
)
|
||||
if self._channel is not None and not self._dry_run:
|
||||
try:
|
||||
if not send_step(self._channel, message):
|
||||
delivered = send_step(self._channel, message)
|
||||
if not delivered:
|
||||
self._warn("send", "Le canal XMPP a refusé l'envoi")
|
||||
elif blog_result is not None and self._blog_state is not None:
|
||||
self._blog_state.acknowledge(blog_result)
|
||||
except PipelineCriticalError:
|
||||
raise
|
||||
except Exception as exc:
|
||||
|
||||
@@ -2,23 +2,28 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from pronote_sync.models.blog import BlogArticle
|
||||
from pronote_sync.sources.blog.result import BlogRSSFetchResult
|
||||
from pronote_sync.sources.blog.rss import BlogRSSClient
|
||||
from pronote_sync.sources.blog.state import BlogRSSState
|
||||
from pronote_sync.utils.redaction import redact_exception
|
||||
|
||||
|
||||
def fetch_blog_step(client: BlogRSSClient | None, state: BlogRSSState | None) -> list[BlogArticle]:
|
||||
"""Récupère les articles RSS nouveaux en conservant l'état du client.
|
||||
def fetch_blog_step(client: BlogRSSClient | None, state: BlogRSSState | None) -> BlogRSSFetchResult:
|
||||
"""Récupère les articles RSS nouveaux sans les acquitter.
|
||||
|
||||
L'état des GUID est acquitté séparément par le pipeline après confirmation
|
||||
de la livraison XMPP. Les en-têtes de cache d'une réponse sans article
|
||||
peuvent être conservés immédiatement, car aucune livraison n'est alors en
|
||||
attente.
|
||||
|
||||
:param client: Client RSS configuré, ou ``None`` lorsque le blog est désactivé.
|
||||
:param state: État de déduplication et de cache HTTP associé au run.
|
||||
:return: Nouveaux articles du blog.
|
||||
:rtype: list[BlogArticle]
|
||||
:return: Résultat de récupération, incluant les métadonnées de cache.
|
||||
:rtype: BlogRSSFetchResult
|
||||
:raises RuntimeError: Si la récupération RSS injectée échoue.
|
||||
"""
|
||||
if client is None or state is None:
|
||||
return []
|
||||
return BlogRSSFetchResult()
|
||||
try:
|
||||
etag, last_modified = state.get_cache_headers()
|
||||
result = client.fetch_and_parse(
|
||||
@@ -26,9 +31,8 @@ def fetch_blog_step(client: BlogRSSClient | None, state: BlogRSSState | None) ->
|
||||
)
|
||||
if result.error is not None:
|
||||
raise RuntimeError(result.error) from None
|
||||
if not result.not_modified:
|
||||
state.add_guids(article.id for article in result.articles)
|
||||
if not result.not_modified and not result.articles:
|
||||
state.update_cache_headers(result.etag, result.last_modified)
|
||||
return list(result.articles)
|
||||
return result
|
||||
except Exception as exc:
|
||||
raise RuntimeError(f"Récupération du blog échouée : {redact_exception(exc)}") from None
|
||||
|
||||
Reference in New Issue
Block a user