fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calcurse-caldav: print executed commands in debug mode

Browse Source 
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer 2018-08-25 08:53:21 +02:00
parent 41f4a92fa9
commit 8466717f06
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
contrib/caldav/calcurse-caldav.py
View File

@ -54,7 +54,13 @@ def calcurse_wipe():
print('Removing all local calcurse objects...') print('Removing all local calcurse objects...')
if dry_run: if dry_run:
return return
subprocess.call([calcurse, '-F', '--filter-hash=XXX'])
command = [calcurse, '-F', '--filter-hash=XXX']
if debug:
print('Running command: {}'.format(command))
subprocess.call(command)
def calcurse_import(icaldata): def calcurse_import(icaldata):
@ -71,13 +77,25 @@ def calcurse_import(icaldata):
'--format-todo=%(hash)\\n' '--format-todo=%(hash)\\n'
] ]
if debug:
print('Running command: {}'.format(command))
p = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE) p = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
return p.communicate(icaldata.encode('utf-8'))[0].decode('utf-8').rstrip() return p.communicate(icaldata.encode('utf-8'))[0].decode('utf-8').rstrip()
def calcurse_export(objhash): def calcurse_export(objhash):
p = subprocess.Popen([calcurse, '-x', 'ical', '--export-uid', command = [
'--filter-hash=' + objhash], stdout=subprocess.PIPE) calcurse,
'-x', 'ical',
'--export-uid',
'--filter-hash=' + objhash
]
if debug:
print('Running command: {}'.format(command))
p = subprocess.Popen(command, stdout=subprocess.PIPE)
return p.communicate()[0].decode('utf-8').rstrip() return p.communicate()[0].decode('utf-8').rstrip()
@ -93,16 +111,29 @@ def calcurse_hashset():
'--format-todo=%(hash)\\n' '--format-todo=%(hash)\\n'
] ]
if debug:
print('Running command: {}'.format(command))
p = subprocess.Popen(command, stdout=subprocess.PIPE) p = subprocess.Popen(command, stdout=subprocess.PIPE)
return set(p.communicate()[0].decode('utf-8').rstrip().splitlines()) return set(p.communicate()[0].decode('utf-8').rstrip().splitlines())
def calcurse_remove(objhash): def calcurse_remove(objhash):
subprocess.call([calcurse, '-F', '--filter-hash=!' + objhash]) command = [calcurse, '-F', '--filter-hash=!' + objhash]
if debug:
print('Running command: {}'.format(command))
subprocess.call(command)
def calcurse_version(): def calcurse_version():
p = subprocess.Popen([calcurse, '--version'], stdout=subprocess.PIPE) command = [calcurse, '--version']
if debug:
print('Running command: {}'.format(command))
p = subprocess.Popen(command, stdout=subprocess.PIPE)
m = re.match(r'calcurse ([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9]+)-)?', m = re.match(r'calcurse ([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9]+)-)?',
p.communicate()[0].decode('utf-8')) p.communicate()[0].decode('utf-8'))
if not m: if not m: