github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-08 14:10:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1295 from samwiseg00/feature-add-timestamp-discord

Browse source 
Add timestamps for rich metadata info on discord
This commit is contained in:
JonnyWong16 2018-05-27 14:47:53 -07:00 • committed by GitHub
commit 10add90451
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plexpy/helpers.py
View file

@ -209,6 +209,9 @@ def now():
now = datetime.datetime.now()
return now.strftime("%Y-%m-%d %H:%M:%S")
def utc_now_iso():
utcnow = datetime.datetime.utcnow()
return utcnow.isoformat()
def human_duration(s, sig='dhms'):
@ -950,7 +953,7 @@ def parse_condition_logic_string(s, num_cond=0):
"""
valid_tokens = re.compile(r'(\(|\)|and|or)')
conditions_pattern = re.compile(r'{\d+}')
tokens = [x.strip() for x in re.split(valid_tokens, s.lower()) if x.strip()]
stack = [[]]
@ -961,7 +964,7 @@ def parse_condition_logic_string(s, num_cond=0):
close_bracket_next = False
nest_and = 0
nest_nest_and = 0
for i, x in enumerate(tokens):
if open_bracket_next and x == '(':
stack[-1].append([])
@ -972,7 +975,7 @@ def parse_condition_logic_string(s, num_cond=0):
close_bracket_next = False
if nest_and:
nest_nest_and += 1
elif close_bracket_next and x == ')':
stack.pop()
if not stack:
@ -1001,7 +1004,7 @@ def parse_condition_logic_string(s, num_cond=0):
if nest_and > nest_nest_and:
stack.pop()
nest_and -= 1
elif bool_next and x == 'and' and i < len(tokens)-1:
stack[-1].append([])
stack.append(stack[-1][-1])
@ -1012,7 +1015,7 @@ def parse_condition_logic_string(s, num_cond=0):
open_bracket_next = True
close_bracket_next = False
nest_and += 1
elif bool_next and x == 'or' and i < len(tokens)-1:
stack[-1].append(x)
cond_next = True