Code test bugfixes

Author: thelabcat

src/rumchat_actor/__init__.py

@@ -146,6 +146,8 @@ def __init__(self, init_message = "Hello, Rumble!", ignore_users = ["TheRumbleBo
 
             first_time = False
 
+        self.chat.clear_mailbox()
+
         #Ignore these users when processing messages
         self.ignore_users = ignore_users
 
@@ -161,25 +163,21 @@ def __init__(self, init_message = "Hello, Rumble!", ignore_users = ["TheRumbleBo
         #Action to be taken when raids occur
         self.__raid_action = print
 
-        #Time that the last message we sent was sent
-        self.last_message_send_time = 0
 
         #Loop condition of the mainloop() and sender_loop() methods
         self.keep_running = True
 
-        #thread to send messages at timed intervals
-        self.sender_thread = threading.Thread(target = self._sender_loop, daemon = True)
-        self.sender_thread.start()
-
         #Send an initialization message to get wether we are moderator or not
-        self.send_message(init_message)
+        _, user = self.__send_message(static.Message.bot_prefix + init_message)
+        assert utils.is_staff(user), \
+            "Actor cannot function without being channel staff"
 
-        #Wait until we get that message
-        while (m := self.chat.get_message()).user.username != self.username:
-            pass
+        #Time that the last message we sent was sent
+        self.last_message_send_time = time.time()
 
-        assert utils.is_staff(m.user), \
-            "Actor cannot function without being channel staff"
+        #thread to send messages at timed intervals
+        self.sender_thread = threading.Thread(target = self._sender_loop, daemon = True)
+        self.sender_thread.start()
 
         #Functions that are to be called on each message,
         #must return False if the message was deleted
@@ -292,7 +290,7 @@ def __send_message(self, text):
 
         self.sent_messages.append(text)
         self.last_message_send_time = time.time()
-        self.chat.send_message(text, channel_id = None) #TODO send as other channels
+        return self.chat.send_message(text, channel_id = None) #TODO send as other channels
 
     @property
     def delete_message(self):

src/rumchat_actor/commands.py

@@ -13,7 +13,6 @@
 import time
 import threading
 from tkinter import filedialog, Tk
-from cocorum.static.Delays import request_timeout as DEFAULT_TIMEOUT
 from moviepy.editor import VideoFileClip, concatenate_videoclips
 from moviepy.video.io.ffmpeg_tools import ffmpeg_extract_subclip
 import pyautogui
@@ -306,7 +305,7 @@ def get_ts_list(self, quality):
         assert self.ts_url_start and self.m3u8_filename, \
             "Must have the TS URL start and the m3u8 filename before this runs"
         m3u8 = requests.get(self.ts_url_start.format(quality = quality) + \
-            self.m3u8_filename, timeout = DEFAULT_TIMEOUT).text
+            self.m3u8_filename, timeout = static.REQUEST_TIMEOUT).text
         return [line for line in m3u8.splitlines() if not line.startswith("#")]
 
     def record_loop(self):
@@ -315,7 +314,7 @@ def record_loop(self):
         #Get the base URL for the wualities listing
         m3u8_qualities_url = static.URI.m3u8_qualities_list.format(stream_id_b36 = self.actor.stream_id_b36)
 
-        m3u8_qualities_raw = requests.get(m3u8_qualities_url, timeout = DEFAULT_TIMEOUT).text
+        m3u8_qualities_raw = requests.get(m3u8_qualities_url, timeout = static.REQUEST_TIMEOUT).text
 
         m3u8_quality_urls_all = [line for line in m3u8_qualities_raw.splitlines() if not line.startswith("#")]
         ts_url_default = m3u8_quality_urls_all[-1]
@@ -366,7 +365,7 @@ def record_loop(self):
             #Save the unsaved TS chunks to temporary files
             for ts_name in new_ts_list:
                 try:
-                    data = requests.get(self.ts_url_start.format(quality = self.use_quality) + ts_name, timeout = DEFAULT_TIMEOUT).content
+                    data = requests.get(self.ts_url_start.format(quality = self.use_quality) + ts_name, timeout = static.REQUEST_TIMEOUT).content
                 except (AttributeError, requests.exceptions.ReadTimeout): #The request failed or has no content
                     print("Failed to save ", ts_name)
                     continue
@@ -395,10 +394,10 @@ def get_quality_info(self):
             for _ in range(static.Clip.Download.speed_test_iter):
                 r1 = None
                 try:
-                    r1 = requests.get(self.ts_url_start.format(quality = quality) + self.m3u8_filename, timeout = DEFAULT_TIMEOUT)
+                    r1 = requests.get(self.ts_url_start.format(quality = quality) + self.m3u8_filename, timeout = static.REQUEST_TIMEOUT)
                 except requests.exceptions.ReadTimeout:
                     print("Timeout for m3u8 playlist download")
-                    download_times.append(DEFAULT_TIMEOUT + 1)
+                    download_times.append(static.REQUEST_TIMEOUT + 1)
                     continue
 
                 if r1.status_code == 404:
@@ -411,10 +410,10 @@ def get_quality_info(self):
                 start_time = time.time()
                 r2 = None
                 try:
-                    r2 = requests.get(self.ts_url_start.format(quality = quality) + ts_chunk_names[-1], timeout = DEFAULT_TIMEOUT)
+                    r2 = requests.get(self.ts_url_start.format(quality = quality) + ts_chunk_names[-1], timeout = static.REQUEST_TIMEOUT)
                 except requests.exceptions.ReadTimeout:
                     print("Timeout for TS chunk download")
-                    download_times.append(DEFAULT_TIMEOUT + 1)
+                    download_times.append(static.REQUEST_TIMEOUT + 1)
                     continue
                 if r2.status_code != 200 or not r2.content:
                     print("TS chunk download unsuccessful:", r2.status_code)
@@ -511,7 +510,7 @@ def form_ts_into_clip(self, filename, use_ts):
             tempfiles = []
             for ts_name in use_ts:
                 try:
-                    data = requests.get(self.ts_url_start.format(quality = self.use_quality) + ts_name, timeout = DEFAULT_TIMEOUT).content
+                    data = requests.get(self.ts_url_start.format(quality = self.use_quality) + ts_name, timeout = static.REQUEST_TIMEOUT).content
                     if not data:
                         raise ValueError
                 except (ValueError, requests.exceptions.ReadTimeout): #The request failed or has no content

src/rumchat_actor/static.py

@@ -5,7 +5,9 @@
 S.D.G.
 """
 
-from cocorum.localvars import RUMBLE_BASE_URL
+from cocorum import static as cstatic
+
+REQUEST_TIMEOUT = cstatic.Delays.request_timeout
 
 class Driver:
     """For the Selenium WebDriver"""
@@ -52,19 +54,20 @@ class Message:
 class URI:
     """Uniform Resource Identifiers"""
 
-    rumble_base = RUMBLE_BASE_URL
+    #Rumble base URL
+    rumble_base = cstatic.URI.rumble_base
 
     #Popout chat url. Format with stream_id_b10
-    chat_popout = RUMBLE_BASE_URL + "/chat/popup/{stream_id_b10}"
+    chat_popout = rumble_base + "/chat/popup/{stream_id_b10}"
 
     #Rumble user URL. Format with username
-    user_page = RUMBLE_BASE_URL + "/user/{username}"
+    user_page = rumble_base + "/user/{username}"
 
     #Rumble channel URL. Format with channel_name
-    channel_page = RUMBLE_BASE_URL + "/c/{channel_name}"
+    channel_page = rumble_base + "/c/{channel_name}"
 
     #URL of upload page at Rumble
-    upload_page = RUMBLE_BASE_URL + "/upload.php"
+    upload_page = rumble_base + "/upload.php"
 
     #M3U8 qualities list URL. Format with base 36 stream ID
     m3u8_qualities_list = "https://rumble.com/live-hls-dvr/{stream_id_b36}/playlist.m3u8"

src/rumchat_actor/utils.py

@@ -6,6 +6,8 @@
 
 import os
 from cocorum.utils import *
+import selenium
+from selenium.webdriver.common.by import By
 from . import static
 
 def is_staff(user):
@@ -20,3 +22,29 @@ def get_safe_filename(clip_save_path, filename, extension = static.Clip.save_ext
         increment += 1
         safe_filename = filename + f"({increment})"
     return safe_filename
+
+def close_premium_banner(driver):
+    """If the premium banner is visible in a driver, close it"""
+    print("Looking to close Premium banner")
+    try:
+        close_button = driver.find_element(
+            By.CSS_SELECTOR,
+            "[data-js='premium-popup__close-button'][aria-label='Close']",
+        )
+        print("Close button found.")
+
+    except selenium.common.exceptions.NoSuchElementException:
+        print("Close button not present, premium banner presumed already closed.")
+        return
+
+    print("Egg timer for premium banner to display")
+    time.sleep(static.Driver.premium_banner_delay)
+
+    try:
+        close_button.click()
+        print("Clicked close button. Egg timer for banner to hide")
+        time.sleep(static.Driver.premium_banner_delay)
+        print("Premium banner closed.")
+    except selenium.common.exceptions.WebDriverException as e:
+        print(e)
+        print("Close button not clickable after wait, premium banner presumed already closed.")