Merge pull request #13 from Hack-The-Travel/develop

Release 0.2.1 - fix uptime

.gitignore

@@ -1,5 +1,6 @@
 # general things to ignore
 *.py[cod]
+.pytest_cache/
 
 conf.py
 

HISTORY.rst

@@ -3,6 +3,12 @@
 Release History
 ===============
 
+0.2.1 (2018-08-26)
+++++++++++++++++++
+**Bugfixes**
+- Fix uptime output format (command /status).
+
+
 0.2.0 (2018-08-26)
 ++++++++++++++++++
 

bot.py

@@ -2,10 +2,12 @@
 import telebot
 import sqlite3
 import time
+import datetime
+from utils import uptime
 from conf import TOKEN, DB_NAME, ADMIN_IDS
 import logging
 
-start_time = time.time()
+bot_start_time = datetime.datetime.utcnow()
 bot = telebot.TeleBot(TOKEN)
 
 
@@ -69,11 +71,10 @@ def command_status(message):
     chat_id = message.chat.id
     if chat_id in ADMIN_IDS:
         chats_number = execute_sql('SELECT count(1) from chat')[0][0]
-        uptime = time.time() - start_time
         bot.send_message(
             chat_id,
             '\n'.join([
-                'up {} days, {:02d}:{:02d}'.format(int(uptime//86400), int(uptime//3600), int((uptime//60)%60)),
+                uptime(bot_start_time, datetime.datetime.utcnow()),
                 'Number of subscriptions: {}'.format(chats_number)
             ])
         )

tests/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from .test_utils import TestUtils

tests/test_utils.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+import pytest
+import datetime
+from utils import uptime
+
+
+now = datetime.datetime.utcnow()
+
+
+class TestUtils():
+    @pytest.mark.parametrize(
+        'start, check, uptime_str', (
+            (now, now + datetime.timedelta(hours=0.5), 'Up 0 hours.'),
+            (now, now + datetime.timedelta(days=1), 'Up 1 day.'),
+            (now, now + datetime.timedelta(days=1, hours=1), 'Up 1 day, 1 hour.'),
+            (now, now + datetime.timedelta(days=1, hours=2), 'Up 1 day, 2 hours.'),
+            (now, now + datetime.timedelta(days=2), 'Up 2 days.'),
+            (now, now + datetime.timedelta(days=2, hours=1), 'Up 2 days, 1 hour.'),
+            (now, now + datetime.timedelta(days=2, hours=2), 'Up 2 days, 2 hours.'),
+        ))
+    def test_runtime(self, start, check, uptime_str):
+        assert uptime(start, check) == uptime_str

utils.py

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+from typing import List
+import datetime
+
+
+def uptime(start: datetime.datetime, check: datetime.datetime) -> str:
+    delta: datetime.timedelta = check - start
+    delta_days: int = delta.days
+    delta_hours: int = delta.seconds // 3600
+    up: List[str] = []
+    if delta_days > 0:
+        up.append('{} day{}'.format(delta_days, '' if delta_days == 1 else 's'))
+    if delta_hours > 0:
+        up.append('{} hour{}'.format(delta_hours, '' if delta_hours == 1 else 's'))
+    if len(up) == 0:
+        return 'Up 0 hours.'
+    return 'Up {}.'.format(', '.join(up))