indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Underscore on function name

merge-requests/30/head
Bob Mottram 2021-07-28 17:29:40 +01:00
parent cdb629fd9d
commit dcf3dedd2d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shares.py
View File

@ -81,7 +81,7 @@ def _loadDfcIds(baseDir: str, systemLanguage: str) -> {}:
return dfcIds return dfcIds
def getValidSharedItemID(actor: str, displayName: str) -> str: def _getValidSharedItemID(actor: str, displayName: str) -> str:
"""Removes any invalid characters from the display name to """Removes any invalid characters from the display name to
produce an item ID produce an item ID
""" """
@ -250,7 +250,7 @@ def addShare(baseDir: str,
domainFull = getFullDomain(domain, port) domainFull = getFullDomain(domain, port)
actor = httpPrefix + '://' + domainFull + '/users/' + nickname actor = httpPrefix + '://' + domainFull + '/users/' + nickname
itemID = getValidSharedItemID(actor, displayName) itemID = _getValidSharedItemID(actor, displayName)
dfcId = _getshareDfcId(baseDir, systemLanguage, dfcId = _getshareDfcId(baseDir, systemLanguage,
itemType, itemCategory, translate) itemType, itemCategory, translate)
@ -842,7 +842,7 @@ def sharesCatalogAccountEndpoint(baseDir: str, httpPrefix: str,
expireDate = datetime.datetime.fromtimestamp(item['expire']) expireDate = datetime.datetime.fromtimestamp(item['expire'])
expireDateStr = expireDate.strftime("%Y-%m-%dT%H:%M:%SZ") expireDateStr = expireDate.strftime("%Y-%m-%dT%H:%M:%SZ")
shareId = getValidSharedItemID(owner, item['displayName']) shareId = _getValidSharedItemID(owner, item['displayName'])
if item['dfcId'].startswith('epicyon#'): if item['dfcId'].startswith('epicyon#'):
dfcId = "epicyon:" + item['dfcId'].split('#')[1] dfcId = "epicyon:" + item['dfcId'].split('#')[1]
else: else:
@ -927,7 +927,7 @@ def sharesCatalogEndpoint(baseDir: str, httpPrefix: str,
startDateStr = dateSecondsToString(item['published']) startDateStr = dateSecondsToString(item['published'])
expireDateStr = dateSecondsToString(item['expire']) expireDateStr = dateSecondsToString(item['expire'])
shareId = getValidSharedItemID(owner, item['displayName']) shareId = _getValidSharedItemID(owner, item['displayName'])
if item['dfcId'].startswith('epicyon#'): if item['dfcId'].startswith('epicyon#'):
dfcId = "epicyon:" + item['dfcId'].split('#')[1] dfcId = "epicyon:" + item['dfcId'].split('#')[1]
else: else: