fetch2gmail 1.1.1__tar.gz → 1.1.3__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (24) hide show
  1. {fetch2gmail-1.1.1/src/fetch2gmail.egg-info → fetch2gmail-1.1.3}/PKG-INFO +1 -1
  2. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/pyproject.toml +1 -1
  3. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3/src/fetch2gmail.egg-info}/PKG-INFO +1 -1
  4. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetcher/gmail_client.py +15 -3
  5. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetcher/run.py +7 -0
  6. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetcher/web_ui.py +9 -5
  7. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/LICENSE +0 -0
  8. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/README.md +0 -0
  9. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/setup.cfg +0 -0
  10. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetch2gmail.egg-info/SOURCES.txt +0 -0
  11. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetch2gmail.egg-info/dependency_links.txt +0 -0
  12. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetch2gmail.egg-info/entry_points.txt +0 -0
  13. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetch2gmail.egg-info/requires.txt +0 -0
  14. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetch2gmail.egg-info/top_level.txt +0 -0
  15. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetcher/__init__.py +0 -0
  16. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetcher/auth_server.py +0 -0
  17. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetcher/auth_ui.py +0 -0
  18. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetcher/cli.py +0 -0
  19. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetcher/config.py +0 -0
  20. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetcher/env_file.py +0 -0
  21. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetcher/imap_client.py +0 -0
  22. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetcher/log_buffer.py +0 -0
  23. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetcher/state.py +0 -0
  24. {fetch2gmail-1.1.1 → fetch2gmail-1.1.3}/src/fetcher/ui_auth.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: fetch2gmail
3
- Version: 1.1.1
3
+ Version: 1.1.3
4
4
  Summary: Self-hosted email fetcher: IMAP to Gmail API import with idempotent state tracking
5
5
  Author: Fetch2Gmail Contributors
6
6
  License-Expression: MIT
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "fetch2gmail"
7
- version = "1.1.1"
7
+ version = "1.1.3"
8
8
  description = "Self-hosted email fetcher: IMAP to Gmail API import with idempotent state tracking"
9
9
  readme = "README.md"
10
10
  license = "MIT"
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: fetch2gmail
3
- Version: 1.1.1
3
+ Version: 1.1.3
4
4
  Summary: Self-hosted email fetcher: IMAP to Gmail API import with idempotent state tracking
5
5
  Author: Fetch2Gmail Contributors
6
6
  License-Expression: MIT
@@ -12,6 +12,11 @@ from email.parser import BytesParser
12
12
  from pathlib import Path
13
13
  from typing import Any
14
14
 
15
+ # Raised when a message cannot be normalized for Gmail (e.g. no From/Sender/Reply-To).
16
+ class SkipMessageError(ValueError):
17
+ """Message should be skipped for import (e.g. missing From)."""
18
+ pass
19
+
15
20
  from google.oauth2.credentials import Credentials
16
21
  from google_auth_oauthlib.flow import InstalledAppFlow
17
22
  from google.auth.transport.requests import Request
@@ -53,20 +58,27 @@ def get_gmail_service(credentials_path: str | Path, token_path: str | Path):
53
58
  def _normalize_from_header(raw: bytes) -> bytes:
54
59
  """
55
60
  Ensure the message has exactly one From header. Gmail import requires it.
56
- Some ISP messages have none or multiple From headers and would otherwise get 400.
61
+ - Multiple From: keep the first.
62
+ - No From: use Sender or Reply-To if present; otherwise raise SkipMessageError
63
+ so the message is skipped (never inject a fake address).
57
64
  """
58
65
  try:
59
66
  msg = BytesParser(policy=policy.default).parsebytes(raw)
60
67
  from_vals = msg.get_all("From") or []
61
68
  if len(from_vals) == 0:
62
- msg["From"] = "unknown@unknown.local"
63
- logger.debug("Message had no From header; added placeholder")
69
+ fallback = (msg.get("Sender") or msg.get("Reply-To") or "").strip()
70
+ if not fallback:
71
+ raise SkipMessageError("Message has no From, Sender, or Reply-To header")
72
+ msg["From"] = fallback
73
+ logger.debug("Message had no From header; using %s", fallback[:50])
64
74
  elif len(from_vals) > 1:
65
75
  msg["From"] = from_vals[0]
66
76
  logger.debug("Message had %s From headers; kept first", len(from_vals))
67
77
  else:
68
78
  return raw
69
79
  return msg.as_bytes()
80
+ except SkipMessageError:
81
+ raise
70
82
  except Exception: # noqa: BLE001
71
83
  return raw
72
84
 
@@ -11,6 +11,7 @@ from typing import Any
11
11
 
12
12
  from .config import load_config
13
13
  from .gmail_client import (
14
+ SkipMessageError,
14
15
  _parse_message_id_from_raw,
15
16
  get_gmail_service,
16
17
  get_inbox_label_id,
@@ -166,6 +167,9 @@ def run_once(config_path: str | None = None, dry_run: bool = False) -> dict[str,
166
167
  state.set_last_processed_uid(mailbox, uid_validity, msg.uid)
167
168
  imported += 1
168
169
  logger.info("Imported uid=%s -> Gmail id=%s", msg.uid, gmail_id)
170
+ except SkipMessageError as e:
171
+ logger.warning("Skipping uid=%s (no From/Sender/Reply-To): %s", msg.uid, e)
172
+ continue
169
173
  except Exception as e:
170
174
  logger.exception("Gmail import failed for uid=%s: %s", msg.uid, e)
171
175
  # Do not delete from ISP; do not advance last_uid. Next run will retry.
@@ -350,6 +354,9 @@ def run_copy_all(
350
354
  state.set_last_processed_uid(mailbox, uid_validity, msg.uid)
351
355
  imported += 1
352
356
  logger.info("Copy-all imported uid=%s -> Gmail id=%s", msg.uid, gmail_id)
357
+ except SkipMessageError as e:
358
+ logger.warning("Skipping uid=%s (no From/Sender/Reply-To): %s", msg.uid, e)
359
+ continue
353
360
  except Exception as e:
354
361
  logger.exception("Gmail import failed for uid=%s: %s", msg.uid, e)
355
362
  continue
@@ -32,6 +32,9 @@ from .ui_auth import create_ui_auth, load_ui_auth, verify_ui_auth
32
32
 
33
33
  logger = logging.getLogger(__name__)
34
34
 
35
+ # Prevents multiple "Copy all" runs from overlapping (manual button only).
36
+ _copy_all_lock = threading.Lock()
37
+
35
38
 
36
39
  def _poller_loop(stop_event: threading.Event) -> None:
37
40
  """Background thread: every poll_interval_minutes run a fetch when config exists.
@@ -655,11 +658,12 @@ def api_fetch_copy_all(request: Request, body: CopyAllBody) -> dict[str, Any]:
655
658
  setup_logging()
656
659
  install_log_buffer()
657
660
  try:
658
- result = run_copy_all(
659
- config_path=str(_get_config_path()),
660
- delete_after_import=body.delete_after,
661
- dry_run=False,
662
- )
661
+ with _copy_all_lock:
662
+ result = run_copy_all(
663
+ config_path=str(_get_config_path()),
664
+ delete_after_import=body.delete_after,
665
+ dry_run=False,
666
+ )
663
667
  return result
664
668
  except FileNotFoundError as e:
665
669
  raise HTTPException(status_code=404, detail=str(e))
File without changes
File without changes
File without changes