Merge pull request #127 from pe2mbs/master

Implement a first version of the fetchmail keep option
master
kaiyou 8 years ago committed by GitHub
commit 508a2a7516

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

1
.gitignore vendored

@ -9,3 +9,4 @@ pip-selfcheck.json
/data
/docker-compose.mac.yml
/docker-compose.yml
/.idea

@ -36,7 +36,7 @@ def fetchmail(fetchmailrc):
return output
def run(connection, cursor, debug):
def run(connection, cursor, keep, debug):
cursor.execute("""
SELECT user_email, protocol, host, port, tls, username, password
FROM fetch
@ -44,8 +44,9 @@ def run(connection, cursor, debug):
for line in cursor.fetchall():
fetchmailrc = ""
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 += " keep" if keep else " fetchall"
fetchmailrc += RC_LINE.format(
user_email=escape_rc_string(user_email),
protocol=protocol,
@ -65,6 +66,12 @@ def run(connection, cursor, debug):
# No mail is not an error
if not error_message.startswith("fetchmail: No mail"):
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:
cursor.execute("""
UPDATE fetch SET error=?, last_check=datetime('now')
@ -76,10 +83,12 @@ def run(connection, cursor, debug):
if __name__ == "__main__":
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")
connection = sqlite3.connect(db_path)
while True:
cursor = connection.cursor()
run(connection, cursor, debug)
run(connection, cursor, keep, debug)
cursor.close()
time.sleep(int(os.environ.get("FETCHMAIL_DELAY", 60)))

Loading…
Cancel
Save