self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2026-05-22 10:15:19 +02:00
Code Issues Releases Activity

Set commandline option instead of rc option for invisible.

Browse Source
This commit is contained in:
Alexander Graf
2026-05-11 12:12:23 +02:00
parent a66125a9a9
commit b1ee858149
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
optional/fetchmail/fetchmail.py
+5 -5
View File
@@ -19,7 +19,7 @@ fetchmail -N \
--idfile /data/fetchids --uidl \ --idfile /data/fetchids --uidl \
--pidfile /dev/shm/fetchmail.pid \ --pidfile /dev/shm/fetchmail.pid \
--sslcertck --sslcertpath /etc/ssl/certs \ --sslcertck --sslcertpath /etc/ssl/certs \
-f {} {} -f {}
""" """
@@ -51,11 +51,12 @@ def escape_rc_string(arg):
return "".join("\\x%2x" % ord(char) for char in arg) return "".join("\\x%2x" % ord(char) for char in arg)
def fetchmail(fetchmailrc): def fetchmail(fetchmailrc, invisible):
with tempfile.NamedTemporaryFile() as handler: with tempfile.NamedTemporaryFile() as handler:
handler.write(fetchmailrc.encode("utf8")) handler.write(fetchmailrc.encode("utf8"))
handler.flush() handler.flush()
command = FETCHMAIL.format(shlex.quote(handler.name)) invisible_flag = "--invisible " if invisible else ""
command = FETCHMAIL.format(invisible_flag, shlex.quote(handler.name))
output = subprocess.check_output(command, shell=True) output = subprocess.check_output(command, shell=True)
return output return output
@@ -69,7 +70,6 @@ def run(debug):
if "FETCHMAIL_OPTIONS" in os.environ: options += f'{ os.environ["FETCHMAIL_OPTIONS"]}' if "FETCHMAIL_OPTIONS" in os.environ: options += f'{ os.environ["FETCHMAIL_OPTIONS"]}'
options += " ssl" if fetch["tls"] else " sslproto \'\'" options += " ssl" if fetch["tls"] else " sslproto \'\'"
options += " keep" if fetch["keep"] else " fetchall" options += " keep" if fetch["keep"] else " fetchall"
options += " invisible" if fetch["invisible"] else ""
folders = f"folders {",".join(f'"{imaputf7encode(item).replace('"',r"\34")}"' for item in fetch["folders"]) or '"INBOX"'}" folders = f"folders {",".join(f'"{imaputf7encode(item).replace('"',r"\34")}"' for item in fetch["folders"]) or '"INBOX"'}"
fetchmailrc += RC_LINE.format( fetchmailrc += RC_LINE.format(
user_email=escape_rc_string(fetch["user_email"]), user_email=escape_rc_string(fetch["user_email"]),
@@ -86,7 +86,7 @@ def run(debug):
if debug: if debug:
print(fetchmailrc) print(fetchmailrc)
try: try:
print(fetchmail(fetchmailrc)) print(fetchmail(fetchmailrc, fetch["invisible"]))
error_message = "" error_message = ""
except subprocess.CalledProcessError as error: except subprocess.CalledProcessError as error:
error_message = error.output.decode("utf8") error_message = error.output.decode("utf8")