v2.0.6

Author: ucarno

README.md

@@ -124,6 +124,12 @@ Thanks to everyone for using this bot, contributing, leaving feedback and
 helping other people in [our Discord](https://discord.gg/kkq2XY4cJM)!
 
 ## Update History
+### v2.0.6
+_Thanks [1Gzy](https://github.com/1Gzy) for implementation idea!_
+* Fixes [this](https://github.com/ucarno/ow-league-tokens/issues/85) issue by not relying on live embed url.
+* Added experimental schedule mode based on [this](https://overwatchleague.com/en-us/schedule) schedule from OWL website.
+This option will fall back to checking stream status using new method if something goes wrong.
+
 ### v2.0.5
 * Added option to shut down PC after stream (requires root on Linux)
 * Fixed macOS certificate setup

src/app.py

@@ -14,7 +14,7 @@
     OWL_CHANNEL_ID, PATH_PROFILES, OWC_CHANNEL_ID, YOUTUBE_AUTH_PASS_RE, STREAM_CHECK_FREQUENCY, NEW_TAB_URL, \
     DISCORD_URL, ISSUES_URL
 from utils import log_error, log_info, log_debug, get_active_stream, is_debug, check_for_new_version, set_debug, \
-    make_debug_file, get_console_message, set_nowait, wait_before_finish, kill_headless_chromes, shut_down_pc, get_relative_time
+    make_debug_file, get_console_message, set_nowait, wait_before_finish, kill_headless_chromes, shut_down_pc, get_seconds_till_next_match
 
 error = lambda msg: log_error(f'Bot', msg)
 info = lambda msg: log_info(f'Bot', msg)
@@ -200,10 +200,10 @@ def start_chrome(config: dict):
             else:
                 driver_info(driver, '&rAuthentication check failed. '
                                     '&mPlease log in to your Google account. If you don\'t see Google\'s login screen, '
-                                    'then go to https://gmail.com/ and log in there and then go to '
-                                    'https://youtube.com/. You have 5000 seconds for this.\n'
-                                    '&rIf you still can\'t log in, then sync your Google Chrome profile '
-                                    'using profile button located in upper right corner of a browser.')
+                                    'then sync your Google Chrome profile using profile button located in upper right '
+                                    'corner of a browser and go manually to https://www.youtube.com/ '
+                                    'Please leave your browser open for a couple of minutes after logging in to make '
+                                    'sure your session persists. You have 5000 seconds for that.\n')
 
                 WebDriverWait(driver, 5000).until(EC.url_matches(YOUTUBE_AUTH_PASS_RE))
                 driver.get(NEW_TAB_URL)
@@ -224,6 +224,7 @@ def start_chrome(config: dict):
     live_url = None
     live_src = None
     checks_until_reload = 3
+    sleep_schedule = 0
 
     while True:
         skip_owc_check = False
@@ -239,9 +240,10 @@ def start_chrome(config: dict):
                 debug('&gOWL stream is online!')
                 current_url, current_src = url, 'OWL'
                 skip_owc_check = True
-            elif config['time_delta']:
-                delta = get_relative_time()
-                info('time until next live stream' + delta)
+            elif config['schedule']:
+                seconds = get_seconds_till_next_match()
+                if seconds and seconds > 30 * 60:
+                    sleep_schedule = seconds - 30 * 60
 
         if config['enable_owc'] and not skip_owc_check:
             url = get_active_stream(OWC_CHANNEL_ID)
@@ -297,6 +299,11 @@ def start_chrome(config: dict):
                 info('Nothing changed, stream still &rOffline&y!')
 
         live_url, live_src = current_url, current_src
+        if sleep_schedule:
+            info(f'Bot is going to sleep for {sleep_schedule} due to schedule.')
+            sleep(sleep_schedule)
+            sleep_schedule = 0
+
         sleep(STREAM_CHECK_FREQUENCY)
 
 

src/constants.py

@@ -3,10 +3,11 @@
 from colorama import Fore
 
 
-CURRENT_VERSION = '2.0.5'
+CURRENT_VERSION = '2.0.6'
 UPDATE_DOWNLOAD_URL = 'https://github.com/ucarno/ow-league-tokens/releases/latest'
 DISCORD_URL = 'https://discord.gg/kkq2XY4cJM'
 ISSUES_URL = 'https://github.com/ucarno/ow-league-tokens/issues'
+FAKE_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36'
 
 DEBUG_ENVIRON = 'OW_LEAGUE_TOKENS_DEBUG'
 NOWAIT_ENVIRON = 'OW_LEAGUE_TOKENS_NOWAIT'

src/menu.py

@@ -119,12 +119,12 @@ def menu():
                 view_profiles
             ),
             (
-                f'Switch headless mode {"&g[enabled]" if config["headless"] else "&r[disabled]"} &m(experimental!)',
+                f'Switch headless mode {"&g[enabled]" if config["headless"] else "&r[disabled]"}',
                 lambda c: switch_setting(c, 'headless')
             ),
             (
-                f'Switch time delta mode {"&g[enabled]" if config["time_delta"] else "&r[disabled]"}',
-                lambda c: switch_setting(c, 'time_delta')
+                f'Switch schedule mode {"&g[enabled]" if config["schedule"] else "&r[disabled]"} &m(experimental!)',
+                lambda c: switch_setting(c, 'schedule')
             ),
             (
                 f'Switch debug mode {"&g[enabled]" if config["debug"] else "&r[disabled]"}',

src/utils.py

@@ -13,7 +13,7 @@
 
 from constants import TMPL_LIVE_STREAM_EMBED_URL, COLORS, TMPL_LIVE_STREAM_URL, VERSION_CHECK_URL, PATH_DEBUG, \
     CURRENT_VERSION, VERSION_ENVIRON, DEBUG_ENVIRON, PATH_CONFIG, UPDATE_DOWNLOAD_URL, NOWAIT_ENVIRON, \
-    DEFAULT_CHROMIUM_FLAGS, PATH_STATS, SCHEDULE_URL
+    DEFAULT_CHROMIUM_FLAGS, PATH_STATS, SCHEDULE_URL, FAKE_USER_AGENT
 
 
 def get_version(version: str) -> tuple:
@@ -36,6 +36,7 @@ def get_default_config() -> dict:
         'shut_down': False,
         'debug': False,
         'time_delta': False,
+        'schedule': False,
         'chromium_binary': None,
         'chromium_flags': DEFAULT_CHROMIUM_FLAGS,
     }
@@ -57,6 +58,9 @@ def load_config() -> dict:
 
             # v2.0.5
             'shut_down',
+
+            # v2.0.6
+            'schedule',
         ):
             if new_flag not in content:
                 update_config = True
@@ -144,29 +148,69 @@ def kill_headless_chromes(binary_path: str | None = None):
             log_debug(src, f'Failed killing Chrome process(es): {str(e)}')
 
 
+def make_get_request(url: str):
+    return requests.get(url, headers={'User-Agent': FAKE_USER_AGENT}, timeout=10)
+
+
 def get_active_stream(channel_id: str) -> str | None:
     """Returns stream url if a channel with specified channel_id has active stream"""
     src = 'LiveCheck'
 
     try:
-        response = requests.get('https://www.youtube.com/channel/%s' % channel_id, timeout=10).text
-        if "hqdefault_live.jpg" in response:
+        response = make_get_request('https://www.youtube.com/channel/%s' % channel_id).text
+        with open('response_sample.html', 'w+', encoding='utf-8') as f:
+            f.write(response)
+            f.close()
+        if 'hqdefault_live.jpg' in response:
             video_id = re.search(r'vi/(.*?)/hqdefault_live.jpg', response).group(1)
             return TMPL_LIVE_STREAM_URL % video_id
-    except requests.RequestException as e:
+    except Exception as e:
         log_error(src, f'&rLive stream check failed: {str(e)}')
-        tb = traceback.format_exc()
-        make_debug_file('failed-getting-active-stream', tb)
+        make_debug_file('failed-getting-active-stream', traceback.format_exc())
         return
 
-def get_relative_time():    
-    resSCH = requests.get(SCHEDULE_URL,  timeout=10).text
-    JSONSCH = json.loads(re.search(r'statusText":"Watch Online","date":(.*?),"competitors":', resSCH).group(1))
-    unix_time =(JSONSCH['startDate']) 
-    dt = datetime.fromtimestamp(unix_time/1000, timezone.utc)
-    now = datetime.now(timezone.utc)
-    delta_time = dt - now
-    return str(delta_time - timedelta(microseconds=delta_time.microseconds))
+
+def get_seconds_till_next_match() -> float | None:
+    src = 'Schedule'
+
+    try:
+        # getting page json
+        schedule_html = requests.get(SCHEDULE_URL,  timeout=10).text
+        next_data = (
+            schedule_html
+            .split('<script id="__NEXT_DATA__" type="application/json">')[1]
+            .split('</script>')[0].strip()
+        )
+        schedule_json = json.loads(next_data)
+
+        # getting matches
+        blocks = schedule_json['props']['pageProps']['blocks']
+        matches: list = []
+        for block in blocks:
+            if 'owlHeader' in block.keys():
+                matches = block['owlHeader']['scoreStripList']['scoreStrip']['matches']
+                break
+
+        if not matches:
+            raise Exception('Could not get matches.')
+
+        pending_matches = list(filter(lambda match: match.get('status') == 'PENDING', matches))
+        pending_matches.sort(key=lambda match: match['date']['startDate'])
+
+        if not pending_matches:
+            raise Exception(f"No matches with status 'PENDING'.")
+
+        timestamp_ms = pending_matches[0]['date']['startDate']
+        delta = datetime.fromtimestamp(timestamp_ms / 1000, timezone.utc) - datetime.now(timezone.utc)
+        total_seconds = delta.total_seconds()
+
+        log_info(src, f'Closest match will be played in {delta}.')
+
+        return total_seconds
+    except Exception as e:
+        log_error(src, f'&rSchedule check failed: {str(e)}. Falling back to regular checks.')
+        make_debug_file('failed-getting-schedule', traceback.format_exc())
+
 
 def check_for_new_version():
     log_src = 'Version'

version.txt

@@ -1 +1 @@
-2.0.5
+2.0.6