Merge remote-tracking branch 'origin/main'

Yudaotor · May 2, 2023 · 3ccd1b1 · 3ccd1b1
2 parents b7803a3 + 7594217
commit 3ccd1b1
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 21 deletions.
diff --git a/README.EN.md b/README.EN.md
@@ -29,7 +29,8 @@ Telegram: https://t.me/Yudaotor, Discord username: Khalil#7843
 Can you please give me a little star?(*^_^*)⭐  
 
 ## GUI
-![image](https://user-images.githubusercontent.com/87225219/232998520-a71680e5-1124-4bb2-acc8-582c5feb8382.png)
+![image](https://user-images.githubusercontent.com/87225219/235648316-50dea673-9a72-4fca-9917-f89b28ee4ed7.png)
+
 
 ## OS  
 Windows, Linux  
@@ -40,24 +41,28 @@ Temporary operation method：
 python -m pip install -r requirements.txt
 ./run_job.sh 0
 ```
+## Multiple Account  
+Unzip multiple folders, and then each different configuration files.Open all instances to achieve multiple account.
+
 ## Want Use Chromium on ARM64?
 Read This!  -->[Guide](https://github.com/Yudaotor/EsportsHelper/wiki/The-Way-Using-Chromium-on-ARM64)
 ## Features
 1. Automatically opens your browser, proceeds to lolesports.com, checks which leagues are currently playing (VODs will be ignored), enters to watch, turns on the volume and sets the quality of the stream to the lowest. 
 2. Option to set whether program will launch in headless mode or with a visible browser window (Off by default). Headless mode is opening the browser without GUI. (It will not be visible, set to running in the background in order to lower CPU usage).
-3. Option to set which Leagues broadcasts to ignore. (Empty by default). Please note, that there is a logic of the inclusion relationship, for example: if LCK is set to be ignored, LCK_Challengers will also be ignored. (This option is highly recommended, avoid watching all broadcasts and be detected because of that).
+3. Option to set **which Leagues broadcasts to ignore**. (Empty by default). Please note, that there is a logic of the inclusion relationship, for example: if LCK is set to be ignored, LCK_Challengers will also be ignored. (This option is highly recommended, avoid watching all broadcasts and be detected because of that).
 4. Option to set how often the latest information about the broadcast will be checked. (600 seconds by default). Upon checking, it will close ended broadcasts and open new ones.
-5. Drop alerts using Discord webhook. (Not all drops alerts will be shown as LolEsports site can miss notification).
+5. **Drop alerts** using Discord webhook.
 6. Error alerts when an error occurs in the software.
 7. Option to set the maximum run time of program. It will force PC shutdown when the time limit is reached.(only windows will do shutdown)
-8. Option to set multiple hibernation period in which the software will close lolesports site,waiting until the end if period and reopen.(Recommend)
+8. Option to set multiple hibernation period in which the software will close lolesports site,waiting until the end if period and reopen.
 9. Desktop notifications. 
 10. Option to manually add a proxy.
-11. Option of deleting video-player elements in order to save traffic. (Risk currently unknown).
+11. Option of **deleting video-player elements** in order to save traffic. (Risk currently unknown).
 12. You can view the number of drops and the drop information of current session.
 13. Password-free login using local browser cookies.
 14. You can customize the path of Google Chrome installation (Portable version).
-15. Both Simplified Chinese and English are supported
+15. Both **Simplified Chinese**, **Traditional Chinese** and **English** are supported
+16. **Auto sleep mode**, which will close all webpages related to Lolesports when there are no ongoing matches, achieving a true non-24/7.(This option is highly recommended)
 ## Configuation
 Using config.yaml file.
 ```yaml
@@ -70,19 +75,21 @@ Password: "password"  # Riot account password
 
 delay: 600                              # Time interval for each check in seconds (600 seconds by default). Each check time will fluctuate randomly between 0.8 and 1.5 times the time delay you set. 
 headless: False                         # When set to True, the program will run in the background; otherwise it will open a browser window (False by default).  
+nickName: ""                            # nickName, default is username.
 disWatchMatches: ["lck", "lpl", "lcs"]  # Optional, here you can add Leagues you wish to ignore. Please note, names should be in lowercase.    
-language: "en_US"                       # en_US for English.zh_CN for Simplified Chinese.
+language: "en_US"                       # en_US for English.zh_CN for Simplified Chinese,zh_TW for Traditional Chinese.
 runHours: -1                            # Negative value is always running, positive value is running by hours, default -1.
 proxy: ""                               # Proxy address, not required for general users, e.g., "127.0.0.1:7890".
 connectorDropsUrl: ""                   # Discord webhook link.
 platForm: "windows"                     # OS, Windows is set by default. If you want to use the program on Linux, please change the value here.  
-closeStream: "False"                    # Option of deleting video-player elements to save traffic. (Risk currently unknown).
-desktopNotify: "False"                  # Experimental feature to enable Desktop notifications.
-sleepPeriod: ["8-13", ["20-23"]]        # Hibernation period, empty by default, allowed multiple period. The format is "Start hour – End hour". Tabs will be closed and reopened at the end of sleep.
+closeStream: False                      # Option of deleting video-player elements to save traffic. (Risk currently unknown).
+desktopNotify: False                    # Experimental feature to enable Desktop notifications.
+sleepPeriod: ["8-13", "20-23"]          # Hibernation period, empty by default, allowed multiple period. The format is "Start hour – End hour". Tabs will be closed and reopened at the end of sleep.
 ignoreBroadCast: True                   # Option to ignore broadcasts.
 userDataDir: "C:\\Users\\xxxxx\\AppData\\Local\\Google\\Chrome\\User Data"  # Path to Chrome cookie files. 
 chromePath: "X:\\xxxxx\\xx\\Chrome.exe" # Chrome.exe location.
 countDrops: True                        # Option to monitor Drops number.
+autoSleep: False                        # which will close all webpages related to Lolesports when there are no ongoing matches, achieving a true non-24/7.
 
 ```
 

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@
 Discord: Khalil#7843  
 可以给我点个小星星吗(*^_^*)⭐  
 ## 界面
-![image](https://user-images.githubusercontent.com/87225219/228434642-6b7317e5-1c0a-4931-b358-f6e2b304429b.png)
+![image](https://user-images.githubusercontent.com/87225219/235648829-55f4af6d-97f5-4157-a66f-6963d63e44aa.png)
 
 ## 运行平台  
 Windows, Linux  
@@ -34,24 +34,28 @@ python -m pip install -r requirements.txt
 ./run_job.sh 0
 ```
 
+## 关于多开  
+~~压缩包解压多个文件夹,然后各自不同的配置文件多开即可实现(bushi)~~
+
 
 ## 特性
 1. 自动打开浏览器,进入lolesports.com,查询哪些赛区在进行比赛(在放赛前等待的赛区会被忽视,但是可以通过ignoreBroadCast配置从而不忽视),进入观看并设置为最低清晰度(为了节省流量)
 2. 可以自行设置是否选择无头模式(默认关闭)(无头模式即headless,开启后浏览器会不可见,在后台运行,缓解电脑CPU压力)
 3. 可以自行设置不观看哪些赛区的比赛.(默认为空)(注意,此处是包含关系的逻辑,举例:当你设置了lck以后,lck_challengers同样不会观看)(建议设置,避免观看所有比赛从而被检测)
 4. 可以自行设置多久来查询一次比赛最新信息.(默认600秒)(关闭已经结束的比赛和开启新开始的比赛)
-5. 掉落提醒(支持钉钉,Discord,饭碗警告)(不是所有掉落都会被提醒,拳头的锅,有时候网页上不会出现弹窗)
+5. **掉落提醒**(支持钉钉,Discord,饭碗警告)
 6. 软件发生错误时可以发送错误提醒(推送信息类型支持筛选)
 7. 可以设置最长运行时间，到达时间后自动关机(只有windows会自动关机)  
 8. 可以设置多段休眠时间段，在休眠时间段中会关闭观赛网页,待休眠结束后重新打开.
 9. 可以设置桌面提醒
 10. 可以手动添加代理(绝大部分用户无需配置)
-11. 可以设置删除视频流元素(节省流量)(风险未知,有兴趣自行尝试) 
+11. **省流模式**,可以删除视频流元素(节省流量)(风险未知,有兴趣自行尝试) 
 12. 可以查看程序本次运行得到的掉落数以及掉落赛区信息
 13. 可以通过本地浏览器缓存免账密登录
 14. 可以自定义谷歌浏览器的地址(支持绿色版即免安装版)
-15. 可以配置语言,目前支持简体中文和英语
-16. 可以配置是否自动休眠,即当没有比赛时关闭页面,直到比赛重新打开.(推荐设置)(第二次检查时生效)
+15. 可以配置语言,目前支持**简体中文**,**繁体中文**和**英语**
+16. 可以配置是否**自动休眠**,即当没有比赛时关闭页面,直到比赛重新打开.(推荐设置)(第二次检查时生效)
+17. 非自动休眠模式下如检测到距离下场比赛时间较长也会进行以1小时间隔检查.
 
 
 ## 配置信息
@@ -63,20 +67,22 @@ password: "密码"                              # 必填，密码
 ### 选填项
 delay: 600                                    # 每次检查的时间间隔，单位为秒(默认为600秒)(每次检测时间会在你设置的时延0.8-1.5倍之间随机波动)  
 headless: False                               # 设置为True时，程序会在后台运行，否则会打开浏览器窗口(默认为False)  
+language: "zh_CN"                             # 现支持语言"zh_CN","zh_TW","en_US".简体中文,繁体中文,英语.
+nickName: ""                                  # 绰号,为空时默认为username.(增强隐私)  
 disWatchMatches: ["lck", "lpl", "lcs"]        # 不想看的赛区名称，可以在这里添加.(注意,是小写)  
 maxRunHours: -1                               # 负值为一直运行，正值为运行小时, 默认-1
-proxy: "你的代理地址"                          # 代理地址，选填，一般用户不用填。 e.g., "socks://127.0.0.1:20173"
+proxy: "你的代理地址"                          # 代理地址，选填，一般用户不用填。 例子, "socks://127.0.0.1:20173"
 connectorDropsUrl: "你的webhook链接"           # (支持钉钉,Discord,饭碗警告)具体配置方法见此处https://github.com/Yudaotor/EsportsHelper/wiki/%E6%80%8E%E4%B9%88%E9%85%8D%E7%BD%AE%E6%8E%89%E8%90%BD%E6%8F%90%E9%86%92%3F(%E5%8A%9F%E8%83%BD%E5%BE%85%E6%B5%8B%E8%AF%95
 platForm: "windows"                           # 使用平台,默认为Windows,如需使用Linux请在此处进行配置  
 closeStream: "False"                          # 省流模式，默认False，关闭直播间的视频流（未知风险）（有兴趣者自行尝试） 
 desktopNotify: "False"                        # 系统弹窗提示，默认False
-sleepPeriod: ["8-13", "20-23"]                # (推荐)休眠时间段，（默认为空）格式为"开始小时-结束小时",在休眠时间段中会关闭观赛网页,待休眠结束后重新打开。区间为左闭合右开。
+sleepPeriod: ["8-13", "20-23"]                # 休眠时间段，（默认为空）格式为"开始小时-结束小时",在休眠时间段中会关闭观赛网页,待休眠结束后重新打开。区间为左闭合右开。
 ignoreBroadCast: True                         # 设置为False会提前进入直播间，以及将支持某些一直处于转播的赛区直播
 userDataDir: "C:\\Users\\xxxxx\\AppData\\Local\\Google\\Chrome\\User Data"  # 例子,其中xxxxx处改为自己电脑的名字,具体教程见https://github.com/Yudaotor/EsportsHelper/wiki/%E6%80%8E%E4%B9%88%E4%BD%BF%E7%94%A8%E6%9C%AC%E5%9C%B0%E6%B5%8F%E8%A7%88%E5%99%A8%E7%BC%93%E5%AD%98-%E5%85%8D%E8%B4%A6%E5%AF%86%E7%99%BB%E5%BD%95
 chromePath: "X:\\xxxxx\\xx\\Chrome.exe"       # 谷歌浏览器自订路径
 countDrops: True                              # 是否检查掉落数
 notifyType: "all"                             # 推送信息的类型筛选,"all"为所有信息推送,"error"为仅推送报错信息,"drops"为仅推送掉落信息
-autoSleep: False                              # 是否自动休眠,默认False
+autoSleep: False                              # (推荐)是否自动休眠,默认False
 ```
 
 ### 不观看赛区的配置详解:

diff --git a/config.yaml b/config.yaml
@@ -2,5 +2,7 @@ delay: 600                # 每次检查的时间间隔，单位为秒(默认为
 headless: False           # 设置为True时，程序会在后台运行，否则会打开浏览器窗口(默认为False) / # When set to True, the program will run in the background; otherwise it will open a browser window (set False by default)
 username: "账号用户名"     # 必填，账号 / Required field, username
 password: "密码"          # 必填，密码 / Required field, passward
-language: "en_US"         # 语言选择，zh_CN是中文，en_US是英文 / Language selection, zh_CN for Chinese (Simplified), en_US for English
-# 更多配置请参考readme中的配置说明 / Refer to the Readme file for more configuration options
+nickName: ""              # 绰号, 不填即为用户名. / NickName. default is username.
+language: "en_US"         # 语言选择，zh_CN是简体中文，en_US是英文, zh_TW是繁体中文 / Language selection, zh_CN for Chinese (Simplified), en_US for English,zh_TW for Chinese (Traditional)
+autoSleep: False          # 是否自动休眠,即没比赛时自动休眠，有比赛时自动唤醒(默认为False) / Whether to sleep automatically, that is, to sleep automatically when there is no match, and to wake up automatically when there is a match (default is False)
+# 更多配置请参考readme中的配置说明 / Refer to the Readme file for more configuration options.
diff --git a/override.txt b/override.txt
@@ -35,4 +35,4 @@ https://lolesports.com/live/superliga|https://lolesports.com/live/superliga/lvpe
 https://lolesports.com/live/emea_masters|https://lolesports.com/live/emea_masters/emeamasters,
 https://lolesports.com/live/tft_esports|https://lolesports.com/live/tft_esports/teamfighttactics,
 https://lolesports.com/live/lcs_challengers_qualifiers|https://lolesports.com/live/lcs_challengers_qualifiers/challengersleague,
-
+https://lolesports.com/live/msi|https://lolesports.com/live/msi/riotgames,