mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Less indentation

main
Bob Mottram 2020-06-02 10:05:55 +01:00
parent 36381b9fcf
commit 20a24edaa8
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
inbox.py
View File

@ -2233,14 +2233,15 @@ def clearQueueItems(baseDir: str, queue: []) -> None:
for subdir, dirs, files in os.walk(baseDir + '/accounts'): for subdir, dirs, files in os.walk(baseDir + '/accounts'):
for account in dirs: for account in dirs:
queueDir = baseDir + '/accounts/' + account + '/queue' queueDir = baseDir + '/accounts/' + account + '/queue'
if os.path.isdir(queueDir): if not os.path.isdir(queueDir):
for queuesubdir, queuedirs, queuefiles in os.walk(queueDir): continue
for qfile in queuefiles: for queuesubdir, queuedirs, queuefiles in os.walk(queueDir):
try: for qfile in queuefiles:
os.remove(os.path.join(queueDir, qfile)) try:
ctr += 1 os.remove(os.path.join(queueDir, qfile))
except BaseException: ctr += 1
pass except BaseException:
pass
if ctr > 0: if ctr > 0:
print('Removed ' + str(ctr) + ' inbox queue items') print('Removed ' + str(ctr) + ' inbox queue items')
@ -2252,10 +2253,11 @@ def restoreQueueItems(baseDir: str, queue: []) -> None:
for subdir, dirs, files in os.walk(baseDir + '/accounts'): for subdir, dirs, files in os.walk(baseDir + '/accounts'):
for account in dirs: for account in dirs:
queueDir = baseDir + '/accounts/' + account + '/queue' queueDir = baseDir + '/accounts/' + account + '/queue'
if os.path.isdir(queueDir): if not os.path.isdir(queueDir):
for queuesubdir, queuedirs, queuefiles in os.walk(queueDir): continue
for qfile in queuefiles: for queuesubdir, queuedirs, queuefiles in os.walk(queueDir):
queue.append(os.path.join(queueDir, qfile)) for qfile in queuefiles:
queue.append(os.path.join(queueDir, qfile))
if len(queue) > 0: if len(queue) > 0:
print('Restored ' + str(len(queue)) + ' inbox queue items') print('Restored ' + str(len(queue)) + ' inbox queue items')