Git-Mirrors/LXMF
1
0
Fork 0
mirror of https://github.com/markqvist/LXMF.git synced 2025-01-27 06:27:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added external processing of received messages to lxmd

Browse Source
This commit is contained in:
Mark Qvist 2022-10-22 21:07:27 +02:00
parent 2181584f69
commit 1c4928a29b
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
LXMF/Utilities/lxmd.py
View File

@ -29,6 +29,8 @@ import RNS
import LXMF
import argparse
import threading
import subprocess
import shlex
import time
import os
@ -40,6 +42,7 @@ configpath = None
ignoredpath = None
identitypath = None
storagedir = None
lxmdir = None
targetloglevel = None
identity = None
@ -140,16 +143,27 @@ def apply_config():
exit(3)
def lxmf_delivery(lxm):
global active_configuration
RNS.log("Received "+str(lxm), RNS.LOG_DEBUG)
if active_configuration["on_inbound"]:
RNS.log("Calling external program to handle message", RNS.LOG_DEBUG)
else:
RNS.log("No action defined for inbound messages, ignoring", RNS.LOG_EXTREME)
global active_configuration, lxmdir
try:
written_path = lxm.write_to_directory(lxmdir)
RNS.log("Received "+str(lxm)+" written to "+str(written_path), RNS.LOG_DEBUG)
if active_configuration["on_inbound"]:
RNS.log("Calling external program to handle message", RNS.LOG_DEBUG)
command = active_configuration["on_inbound"]
processing_command = command+" \""+written_path+"\""
return_code = subprocess.call(shlex.split(processing_command), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
else:
RNS.log("No action defined for inbound messages, ignoring", RNS.LOG_DEBUG)
except Exception as e:
RNS.log("Error occurred while processing received message "+str(lxm)+". The contained exception was: "+str(e), RNS.LOG_ERROR)
def program_setup(configdir = None, rnsconfigdir = None, run_pn = False, on_inbound = None, verbosity = 0, quietness = 0, service = False):
global configpath, ignoredpath, identitypath, storagedir
global configpath, ignoredpath, identitypath, storagedir, lxmdir
global lxmd_config, active_configuration, targetloglevel
global message_router, lxmf_destination
@ -174,10 +188,14 @@ def program_setup(configdir = None, rnsconfigdir = None, run_pn = False, on_inbo
ignoredpath = configdir+"/ignored"
identitypath = configdir+"/identity"
storagedir = configdir+"/storage"
lxmdir = storagedir+"/messages"
if not os.path.isdir(storagedir):
os.makedirs(storagedir)
if not os.path.isdir(lxmdir):
os.makedirs(lxmdir)
if os.path.isfile(configpath):
try:
lxmd_config = ConfigObj(configpath)