docker/mailu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding fetchmail keep option to .env file

Browse Source
This commit is contained in:
Marc Bertens-Nguyen
2016-11-18 14:27:32 +01:00
parent 9a36cb951d
commit b7a620f931
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.dist
View File

@@ -65,6 +65,8 @@ RELAYHOST=
# Fetchmail delay # Fetchmail delay
FETCHMAIL_DELAY=600 FETCHMAIL_DELAY=600
# Set this to True when you want to keep the mail on remote server as well.
FETCHMAIL_KEEP=False
################################### ###################################
# Developers # Developers

19
fetchmail/fetchmail.py
View File

@@ -44,8 +44,9 @@ def run(connection, cursor, debug):
for line in cursor.fetchall(): for line in cursor.fetchall():
fetchmailrc = "" fetchmailrc = ""
user_email, protocol, host, port, tls, username, password = line user_email, protocol, host, port, tls, username, password = line
options = "options fetchall antispam 501, 504, 550, 553, 554" options = "options antispam 501, 504, 550, 553, 554"
options += " ssl" if tls else "" options += " ssl" if tls else ""
options += " keep" if keep else " fetchall"
fetchmailrc += RC_LINE.format( fetchmailrc += RC_LINE.format(
user_email=escape_rc_string(user_email), user_email=escape_rc_string(user_email),
protocol=protocol, protocol=protocol,
@@ -56,15 +57,21 @@ def run(connection, cursor, debug):
options=options options=options
) )
if debug: if debug:
print(fetchmailrc) print( fetchmailrc )
try: try:
print(fetchmail(fetchmailrc)) print( fetchmail( fetchmailrc ) )
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" )
# No mail is not an error # No mail is not an error
if not error_message.startswith("fetchmail: No mail"): if not error_message.startswith("fetchmail: No mail"):
print(error_message) print( error_message )
user_info = "for %s at %s" % ( user_email, host )
# Number of messages seen is not a error as well
if "messages" in error_message and "(seen " in error_message and \
user_info in error_message:
print( error_message )
finally: finally:
cursor.execute(""" cursor.execute("""
UPDATE fetch SET error=?, last_check=datetime('now') UPDATE fetch SET error=?, last_check=datetime('now')
@@ -76,6 +83,7 @@ def run(connection, cursor, debug):
if __name__ == "__main__": if __name__ == "__main__":
debug = os.environ.get("DEBUG", None) == "True" debug = os.environ.get("DEBUG", None) == "True"
keep = os.environ.get("FETCHMAIL_KEEP", None) == "True"
db_path = os.environ.get("DB_PATH", "/data/main.db") db_path = os.environ.get("DB_PATH", "/data/main.db")
connection = sqlite3.connect(db_path) connection = sqlite3.connect(db_path)
while True: while True:
@@ -83,3 +91,4 @@ if __name__ == "__main__":
run(connection, cursor, debug) run(connection, cursor, debug)
cursor.close() cursor.close()
time.sleep(int(os.environ.get("FETCHMAIL_DELAY", 60))) time.sleep(int(os.environ.get("FETCHMAIL_DELAY", 60)))