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

Improve removal of shares

main2
Bob Mottram 2019-11-03 10:04:28 +00:00
parent d9b4a77dad
commit f2d652708e
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
shares.py
View File

@ -33,23 +33,34 @@ def removeShare(baseDir: str,nickname: str,domain: str, \
"""Removes a share for a person """Removes a share for a person
""" """
sharesFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/shares.json' sharesFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/shares.json'
if os.path.isfile(sharesFilename): if not os.path.isfile(sharesFilename):
sharesJson=loadJson(sharesFilename) print('ERROR: missing shares.json '+sharesFilename)
return
sharesJson=loadJson(sharesFilename)
if not sharesJson:
print('ERROR: shares.json could not be loaded from '+sharesFilename)
return
itemID=getValidSharedItemID(displayName) itemID=getValidSharedItemID(displayName)
if sharesJson.get(itemID): if sharesJson.get(itemID):
# remove any image for the item # remove any image for the item
itemIDfile=baseDir+'/sharefiles/'+itemID itemIDfile=baseDir+'/sharefiles/'+nickname+'/'+itemID
if sharesJson[itemID]['imageUrl']: if sharesJson[itemID]['imageUrl']:
if sharesJson[itemID]['imageUrl'].endswith('.png'): if sharesJson[itemID]['imageUrl'].endswith('.png'):
os.remove(itemIDfile+'.png') if os.path.isfile(itemIDfile+'.png'):
os.remove(itemIDfile+'.png')
if sharesJson[itemID]['imageUrl'].endswith('.jpg'): if sharesJson[itemID]['imageUrl'].endswith('.jpg'):
os.remove(itemIDfile+'.jpg') if os.path.isfile(itemIDfile+'.jpg'):
os.remove(itemIDfile+'.jpg')
if sharesJson[itemID]['imageUrl'].endswith('.gif'): if sharesJson[itemID]['imageUrl'].endswith('.gif'):
os.remove(itemIDfile+'.gif') if os.path.isfile(itemIDfile+'.gif'):
os.remove(itemIDfile+'.gif')
# remove the item itself # remove the item itself
del sharesJson[itemID] del sharesJson[itemID]
saveJson(sharesJson,sharesFilename) saveJson(sharesJson,sharesFilename)
else:
print('ERROR: share index "'+itemID+'" does not exist in '+sharesFilename)
def addShare(baseDir: str, \ def addShare(baseDir: str, \
httpPrefix: str,nickname: str,domain: str,port: int, \ httpPrefix: str,nickname: str,domain: str,port: int, \