Merge pull request #6 from offish/v1.2.4

v1.2.4
offish · Dec 2, 2020 · f5303d1 · f5303d1
2 parents e66b9f9 + ddf6e7d
commit f5303d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/express/__init__.py b/express/__init__.py
@@ -2,5 +2,5 @@
 __title__  = 'tf2-express'
 __author__ = 'offish'
 __license__ = 'MIT'
-__version__ = '1.2.3'
+__version__ = '1.2.4'
 
diff --git a/express/logging.py b/express/logging.py
@@ -6,17 +6,12 @@
 init()
 
 
-def log(color, sort, bot: str, text, offer_id = ''):
-    title = f'{f.GREEN}tf2-express | '
-
-    if bot:
-        title = f'{title}[{bot}] '
-
-    if offer_id:
-        text = f'({f.YELLOW}{offer_id}{f.WHITE}) {text}'   
-
+def log(color: int, sort: str, bot: str, text: str, offer_id: str = ''):
+    name = f' {f.GREEN}[{bot}]' if bot else ''
+    text = f'({f.YELLOW}{offer_id}{f.WHITE}) {text}' \
+        if offer_id else text
     time = datetime.now().time().strftime('%H:%M:%S')
-    print(f'{title}{f.WHITE}{time} - {color + sort}{f.WHITE}: {text}{f.WHITE}')
+    print(f'{f.GREEN}tf2-express | {f.WHITE}{time} - {color + sort}{name}{f.WHITE}: {text}{f.WHITE}')
 
 
 class Log: