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

Snake case

merge-requests/30/head
Bob Mottram 2021-12-26 18:01:02 +00:00
parent ad28291208
commit b4142e9de4
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shares.py
View File

@ -23,7 +23,7 @@ from session import postJson
from session import postImage from session import postImage
from session import createSession from session import createSession
from utils import has_object_stringType from utils import has_object_stringType
from utils import dateStringToSeconds from utils import date_string_to_seconds
from utils import date_seconds_to_string from utils import date_seconds_to_string
from utils import get_config_param from utils import get_config_param
from utils import get_full_domain from utils import get_full_domain
@ -1787,10 +1787,10 @@ def _dfcToSharesFormat(catalogJson: {},
if ':' not in item['DFC:hasType']: if ':' not in item['DFC:hasType']:
continue continue
startTimeSec = dateStringToSeconds(item['DFC:startDate']) startTimeSec = date_string_to_seconds(item['DFC:startDate'])
if not startTimeSec: if not startTimeSec:
continue continue
expiryTimeSec = dateStringToSeconds(item['DFC:expiryDate']) expiryTimeSec = date_string_to_seconds(item['DFC:expiryDate'])
if not expiryTimeSec: if not expiryTimeSec:
continue continue
if expiryTimeSec < curr_time: if expiryTimeSec < curr_time:

4
tests.py
View File

@ -63,7 +63,7 @@ from utils import get_category_types
from utils import get_supported_languages from utils import get_supported_languages
from utils import setConfigParam from utils import setConfigParam
from utils import is_group_actor from utils import is_group_actor
from utils import dateStringToSeconds from utils import date_string_to_seconds
from utils import date_seconds_to_string from utils import date_seconds_to_string
from utils import validPassword from utils import validPassword
from utils import userAgentDomain from utils import userAgentDomain
@ -5674,7 +5674,7 @@ def _testAuthorizeSharedItems():
def _testDateConversions() -> None: def _testDateConversions() -> None:
print('testDateConversions') print('testDateConversions')
dateStr = "2021-05-16T14:37:41Z" dateStr = "2021-05-16T14:37:41Z"
dateSec = dateStringToSeconds(dateStr) dateSec = date_string_to_seconds(dateStr)
dateStr2 = date_seconds_to_string(dateSec) dateStr2 = date_seconds_to_string(dateSec)
assert dateStr == dateStr2 assert dateStr == dateStr2

11
utils.py
View File

@ -2969,16 +2969,17 @@ def isfloat(value):
return False return False
def dateStringToSeconds(dateStr: str) -> int: def date_string_to_seconds(date_str: str) -> int:
"""Converts a date string (eg "published") into seconds since epoch """Converts a date string (eg "published") into seconds since epoch
""" """
try: try:
expiryTime = \ expiry_time = \
datetime.datetime.strptime(dateStr, '%Y-%m-%dT%H:%M:%SZ') datetime.datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%SZ')
except BaseException: except BaseException:
print('EX: dateStringToSeconds unable to parse date ' + str(dateStr)) print('EX: date_string_to_seconds unable to parse date ' +
str(date_str))
return None return None
return int(datetime.datetime.timestamp(expiryTime)) return int(datetime.datetime.timestamp(expiry_time))
def date_seconds_to_string(date_sec: int) -> str: def date_seconds_to_string(date_sec: int) -> str: