s.probst/webapp-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull request #28: make username optional when replacing the signature

Browse Source 
Merge in KSC/webapp-tools from fix-signature to master

* commit '001f3cd1456c16a82890bff48db3f48fd4867dcc':
  make username optional when replacing the signature
This commit is contained in:
Martijn Alberts 2021-01-28 14:33:23 +01:00
commit 4d37f44e32
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
webapp_admin/webapp_admin.py
View File

@ -64,7 +64,7 @@ def opt_args(print_help=None):
group = OptionGroup(parser, "Signature", "") group = OptionGroup(parser, "Signature", "")
group.add_option("--backup-signature", dest="backup_signature", action="store_true", help="Backup signature") group.add_option("--backup-signature", dest="backup_signature", action="store_true", help="Backup signature")
group.add_option("--restore-signature", dest="restore_signature", action="store", help="Restore signature (need file name)") group.add_option("--restore-signature", dest="restore_signature", action="store", help="Restore signature (need file name)")
group.add_option("--replace-signature", dest="replace_signature", action="store", help="Replace existing signature, file layout must be: username_signature-name_signatureid.html") group.add_option("--replace-signature", dest="replace_signature", action="store", help="Replace existing signature, file layout must be: username_signature-name_signatureid.html or signature-name_signatureid.html ")
group.add_option("--default-signature", dest="default_signature", action="store_true", help="Set signature as default one") group.add_option("--default-signature", dest="default_signature", action="store_true", help="Set signature as default one")
parser.add_option_group(group) parser.add_option_group(group)
@ -317,16 +317,31 @@ Restore signature into the users store
def restore_signature(user, filename, replace=None, default=None): def restore_signature(user, filename, replace=None, default=None):
restorefile = filename restorefile = filename
filename_split = filename.split('_')
if len(filename_split) == 2:
signaturename = filename_split[0].replace('-',' ')
if replace:
signatureid = filename_split[1].split('.')[0]
elif len(filename_split) == 3:
signaturename = filename_split[1].replace('-',' ')
if replace:
signatureid = filename_split[2].split('.')[0]
else:
if replace:
print('File format is not supported')
sys.exit(1)
with open(restorefile, 'r') as sigfile: with open(restorefile, 'r') as sigfile:
signaturehtml = sigfile.read() signaturehtml = sigfile.read()
if replace: if replace:
signatureid = filename.split('_')[2].split('.')[0]
action = 'Replacing' action = 'Replacing'
else: else:
signaturename = filename.split('.')[0]
signatureid = int(time.time()) signatureid = int(time.time())
action = 'Adding' action = 'Adding'
signaturename = filename.split('_')[1].replace('-',' ')
signaturecontent = dict( signaturecontent = dict(
{u'name': signaturename, u'content': signaturehtml, u'isHTML': True}) {u'name': signaturename, u'content': signaturehtml, u'isHTML': True})
settings = read_settings(user) settings = read_settings(user)