Dynamic overrides

EsportsCapsuleFarmer/Match.py

@@ -7,32 +7,13 @@
 from EsportsCapsuleFarmer.Providers.Twitch import Twitch
 
 class Match:
-    # Force Twitch player
-    OVERRIDES = {
-        "https://lolesports.com/live/lck_challengers_league":"https://lolesports.com/live/lck_challengers_league/lckcl",
-        "https://lolesports.com/live/lpl":"https://lolesports.com/live/lpl/lpl",
-        "https://lolesports.com/live/lck":"https://lolesports.com/live/lck/lck",
-        "https://lolesports.com/live/lec":"https://lolesports.com/live/lec/lec",
-        "https://lolesports.com/live/lcs":"https://lolesports.com/live/lcs/lcs",
-        "https://lolesports.com/live/lco":"https://lolesports.com/live/lco/lco",
-        "https://lolesports.com/live/cblol_academy":"https://lolesports.com/live/cblol_academy/cblol",
-        "https://lolesports.com/live/cblol":"https://lolesports.com/live/cblol/cblol",
-        "https://lolesports.com/live/lla":"https://lolesports.com/live/lla/lla",
-        "https://lolesports.com/live/ljl-japan/ljl":"https://lolesports.com/live/ljl-japan/riotgamesjp",
-        "https://lolesports.com/live/ljl-japan":"https://lolesports.com/live/ljl-japan/riotgamesjp",
-        "https://lolesports.com/live/turkiye-sampiyonluk-ligi":"https://lolesports.com/live/turkiye-sampiyonluk-ligi/riotgamesturkish",
-        "https://lolesports.com/live/cblol-brazil":"https://lolesports.com/live/cblol-brazil/cblol",
-        "https://lolesports.com/live/pcs/lXLbvl3T_lc":"https://lolesports.com/live/pcs/lolpacific",
-        "https://lolesports.com/live/ljl_academy/ljl":"https://lolesports.com/live/ljl_academy/riotgamesjp",
-        "https://lolesports.com/live/european-masters":"https://lolesports.com/live/european-masters/EUMasters",
-        "https://lolesports.com/live/worlds":"https://lolesports.com/live/worlds/riotgames",
-    }
 
-    def __init__(self, log, driver) -> None:
+    def __init__(self, log, driver, overrides) -> None:
         self.log = log
         self.driver = driver
         self.rewards = Rewards(log=log, driver=driver)
         self.twitch = Twitch(driver=driver)
+        self.overrides = overrides
 
         self.currentWindows = {}
         self.originalWindow = self.driver.current_window_handle
@@ -91,8 +72,9 @@ def openNewMatches(self, liveMatches):
             self.driver.switch_to.new_window('tab')
             time.sleep(2)
             self.currentWindows[match] = self.driver.current_window_handle
-            if match in self.OVERRIDES:
-                url = self.OVERRIDES[match]
+            override = self.overrides.getOverride(match)
+            if override:
+                url = override
                 self.log.info(f"Overriding {match} to {url}")
             else:
                 url = match

EsportsCapsuleFarmer/Overrides.py

@@ -0,0 +1,17 @@
+import requests as req
+
+class Overrides:
+    def __init__(self, log, customOverrides = {}) -> None:
+        self.customOverrides = customOverrides
+        self.downloadedOverrides = {}
+        self.downloadOverrides()
+
+    def downloadOverrides(self):
+        overridesResponse = req.get("https://raw.githubusercontent.com/LeagueOfPoro/EsportsCapsuleFarmer/master/overrides.json", headers={'Cache-Control': 'no-cache'})
+        self.downloadedOverrides = overridesResponse.json()
+
+    def getOverride(self, url):
+        override = self.customOverrides.get(url, '')
+        if not override:
+            override = self.downloadedOverrides.get(url, '')
+        return override

EsportsCapsuleFarmer/Setup/Config.py

@@ -10,9 +10,10 @@ def __init__(self, log, args) -> None:
         self.password = "NoPasswordInConfig" # None
         self.browser = args.browser
         self.delay = args.delay
+        self.customOverrides = {}
 
     def getArgs(self):
-        return self.hasAutoLogin, self.isHeadless, self.username, self.password, self.browser, self.delay
+        return self.hasAutoLogin, self.isHeadless, self.username, self.password, self.browser, self.delay, self.customOverrides
 
     def getAutoLogin(self):
         return self.hasAutoLogin
@@ -50,6 +51,9 @@ def readConfig(self):
                 self.browser = config["browser"]
             if "delay" in config:
                 self.delay = int(config["delay"])
+            if "customOverrides" in config:
+                for entry in config["customOverrides"]:
+                    self.customOverrides[entry["from"]] = entry["to"]
         except FileNotFoundError:
             self.log.warning("Configuration file not found. IGNORING...")
         except (yaml.scanner.ScannerError, yaml.parser.ParserError) as e:

EsportsCapsuleFarmer/Setup/VersionManager.py

@@ -12,6 +12,4 @@ def getLatestTag():
         return 0.0
     @staticmethod
     def isLatestVersion(currentVersion):
-        return currentVersion >= VersionManager.getLatestTag()
-
-print(VersionManager.isLatestVersion(3.8))
+        return currentVersion >= VersionManager.getLatestTag()

EsportsCapsuleFarmer/Setup/Webdriver.py

@@ -37,3 +37,4 @@ def addWebdriverOptions(self, options):
             user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.134 Safari/537.36 Edg/103.0.1264.71"
             options.add_argument(f'user-agent={user_agent}')
         return options
+

main.py

@@ -2,6 +2,7 @@
 from selenium.common.exceptions import TimeoutException
 import time
 import argparse
+from EsportsCapsuleFarmer.Overrides import Overrides
 
 # Classes
 from EsportsCapsuleFarmer.Setup.LoginHandler import LoginHandler
@@ -14,7 +15,7 @@
 
 ###################################################
 
-CURRENT_VERSION = 3.6
+CURRENT_VERSION = 3.8
 
 parser = argparse.ArgumentParser(prog='CapsuleFarmer.exe', description='Farm Esports Capsules by watching lolesports.com.')
 parser.add_argument('-b', '--browser', dest="browser", choices=['chrome', 'firefox', 'edge'], default="chrome",
@@ -34,7 +35,8 @@
 # Mutes preexisting loggers like selenium_driver_updater
 log = Logger().createLogger()
 config = Config(log=log, args=args).readConfig()
-hasAutoLogin, isHeadless, username, password, browser, delay = config.getArgs()
+hasAutoLogin, isHeadless, username, password, browser, delay, customOverrides = config.getArgs()
+overrides = Overrides(log, customOverrides)
 
 if not VersionManager.isLatestVersion(CURRENT_VERSION):
     log.warning("NEW VERSION AVAILABLE!!! Download it from: https://github.com/LeagueOfPoro/EsportsCapsuleFarmer/releases/latest")
@@ -70,4 +72,4 @@
     time.sleep(5)
 log.debug("Okay, we're in")
 
-Match(log=log, driver=driver).watchForMatches(delay=delay)
+Match(log=log, driver=driver, overrides=overrides).watchForMatches(delay=delay)

overrides.json

@@ -0,0 +1,19 @@
+{
+    "https://lolesports.com/live/lck_challengers_league":"https://lolesports.com/live/lck_challengers_league/lckcl",
+    "https://lolesports.com/live/lpl":"https://lolesports.com/live/lpl/lpl",
+    "https://lolesports.com/live/lck":"https://lolesports.com/live/lck/lck",
+    "https://lolesports.com/live/lec":"https://lolesports.com/live/lec/lec",
+    "https://lolesports.com/live/lcs":"https://lolesports.com/live/lcs/lcs",
+    "https://lolesports.com/live/lco":"https://lolesports.com/live/lco/lco",
+    "https://lolesports.com/live/cblol_academy":"https://lolesports.com/live/cblol_academy/cblol",
+    "https://lolesports.com/live/cblol":"https://lolesports.com/live/cblol/cblol",
+    "https://lolesports.com/live/lla":"https://lolesports.com/live/lla/lla",
+    "https://lolesports.com/live/ljl-japan/ljl":"https://lolesports.com/live/ljl-japan/riotgamesjp",
+    "https://lolesports.com/live/ljl-japan":"https://lolesports.com/live/ljl-japan/riotgamesjp",
+    "https://lolesports.com/live/turkiye-sampiyonluk-ligi":"https://lolesports.com/live/turkiye-sampiyonluk-ligi/riotgamesturkish",
+    "https://lolesports.com/live/cblol-brazil":"https://lolesports.com/live/cblol-brazil/cblol",
+    "https://lolesports.com/live/pcs/lXLbvl3T_lc":"https://lolesports.com/live/pcs/lolpacific",
+    "https://lolesports.com/live/ljl_academy/ljl":"https://lolesports.com/live/ljl_academy/riotgamesjp",
+    "https://lolesports.com/live/european-masters":"https://lolesports.com/live/european-masters/EUMasters",
+    "https://lolesports.com/live/worlds":"https://lolesports.com/live/worlds/riotgames"
+}