/now subject command (#39)

* /now subject command on bot
* check if lock is locked before release

Author: rodrigondec

bot/commands/__init__.py

@@ -2,10 +2,12 @@
 from bot.commands.subscription import config_handlers as subscription_handlers
 from bot.commands.callback import config_handlers as callback_handlers
 from bot.commands.exchange import config_handlers as exchange_handlers
+from bot.commands.subject import config_handlers as subject_handlers
 
 handlers = [
     base_handlers,
     subscription_handlers,
     callback_handlers,
-    exchange_handlers
+    exchange_handlers,
+    subject_handlers
 ]

bot/commands/subject.py

@@ -0,0 +1,64 @@
+import logging
+
+from telegram import Update
+from telegram.ext import CommandHandler, CallbackContext
+from mongoengine.errors import DoesNotExist, MultipleObjectsReturned
+
+from bot.core import BotTelegramCore
+from db.subject import Subject
+from db.observer import UserObserver
+from db.update_message import UpdateMessage
+
+
+logging.basicConfig(
+    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
+    level=logging.INFO)
+
+logger = logging.getLogger(__name__)
+
+
+def now(update: Update, context: CallbackContext):
+    chat = update.effective_chat
+    message = update.effective_message
+
+    try:
+        observer = UserObserver.objects.get(chat_id=f"{chat.id}")
+    except DoesNotExist:
+        observer = UserObserver(f"{chat.username}",
+                                f"{chat.id}").save()
+
+    subject_names = context.args
+    subjects = []
+    errors = []
+
+    if subject_names:
+        for name in subject_names:
+            try:
+                subject = Subject.objects.get(name__icontains=name)
+                subjects.append(subject)
+            except DoesNotExist as e:
+                errors.append(f"{name}: {e}")
+            except MultipleObjectsReturned as e:
+                errors.append(f"{e}\n"
+                              f"The value {name} returned more than "
+                              f"one subject. Please be more specific!")
+    else:
+        subjects = Subject.objects.all()
+
+    update_messages = []
+
+    for subject in subjects:
+        update_messages.append(UpdateMessage.get_last_by_subject(subject))
+
+    if errors:
+        error_message = "\n".join(errors)
+        message.reply_text(error_message)
+
+    for msg in update_messages:
+        observer.notify(msg)
+
+
+def config_handlers(instance: BotTelegramCore):
+    logger.info('Setting subject commands...')
+
+    instance.add_handler(CommandHandler("now", now))

db/observer.py

@@ -26,7 +26,7 @@ class ObserverMessage(Document):
     meta = {
         'ordering': ['datetime'],
         'indexes': [
-            {'fields': ['datetime'], 'expireAfterSeconds': 7*24*60*60}
+            {'fields': ['datetime'], 'expireAfterSeconds': 31*24*60*60}
         ]
     }
 

db/ticket.py

@@ -61,6 +61,7 @@ def get_last(cls):
             last_ticket_price = cls._fetch_new_ticket_price()
         finally:
             last_ticket_price.save()
-            cls.lock.release()
+            if cls.lock.locked():
+                cls.lock.release()
 
         return last_ticket_price

update_raspberry.py

@@ -1,28 +1,40 @@
+import logging
 import requests
 import json
 import tarfile
 import subprocess
 
+
+logging.basicConfig(
+    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
+    level=logging.INFO)
+
+logger = logging.getLogger(__name__)
+
 releases_url = "https://api.github.com/repos/dcr-guys/JackBot/releases"
 releases_response = requests.get(releases_url)
 releases_response.data = json.loads(releases_response.content)
 
 latest = releases_response.data[0]
 latest_tarball = requests.get(latest.get('tarball_url'))
 latest_name = latest.get('name')
+logger.info(f"Latest name is {latest_name}!")
 
 base_dir = f"./{latest_name}/"
 tarfile_name = f"{base_dir}{latest_name}.tar.gz"
 
 subprocess.run(["mkdir", base_dir])
 
+logger.info("Creating tar file...")
 with open(tarfile_name, 'wb') as file:
     file.write(latest_tarball.content)
 
+logger.info("Extracting tar file...")
 with tarfile.open(tarfile_name) as tar:
     subfolder_name = tar.firstmember.name
     tar.extractall(base_dir)
 
+logger.info("Rsync files...")
 source_dir = f"{base_dir}/{subfolder_name}/"
 dest_dir = "./"
 subprocess.run(['rsync', '-av', source_dir, dest_dir])