From cb81918aaac0aa73da7342abfb0e7ab88d07284e Mon Sep 17 00:00:00 2001 From: xueweihan <595666367@qq.com> Date: Tue, 22 Nov 2022 13:52:53 +0800 Subject: [PATCH] update --- .github/workflows/GitHub520.yml | 6 +- fetch_ips.py | 60 ++++++++++-------- hosts | 105 ++++++++++---------------------- 3 files changed, 68 insertions(+), 103 deletions(-) diff --git a/.github/workflows/GitHub520.yml b/.github/workflows/GitHub520.yml index ae3417238..8284a90b1 100644 --- a/.github/workflows/GitHub520.yml +++ b/.github/workflows/GitHub520.yml @@ -26,11 +26,7 @@ jobs: run: | sudo python -m pip install --upgrade pip if [ -f requirements.txt ]; then sudo pip install -r requirements.txt; fi - - name: update readme - env: - gitee_token: ${{ secrets.GITEE_TOKEN }} - gitee_gist_id: ${{ secrets.GITEE_GIST_ID }} - gitee_gist_file_name: ${{ secrets.GITEE_GIST_FILE_NAME }} + - name: run script run: | # fetch new ip content and update readme file sudo python fetch_ips.py diff --git a/fetch_ips.py b/fetch_ips.py index 6cb4114c8..e233b6bf9 100644 --- a/fetch_ips.py +++ b/fetch_ips.py @@ -17,26 +17,30 @@ from requests_html import HTMLSession from retry import retry GITHUB_URLS = [ - 'alive.github.com', 'api.github.com', 'assets-cdn.github.com', - 'avatars.githubusercontent.com', 'avatars0.githubusercontent.com', - 'avatars1.githubusercontent.com', 'avatars2.githubusercontent.com', - 'avatars3.githubusercontent.com', 'avatars4.githubusercontent.com', - 'avatars5.githubusercontent.com', 'camo.githubusercontent.com', - 'central.github.com', 'cloud.githubusercontent.com', 'codeload.github.com', - 'collector.github.com', 'desktop.githubusercontent.com', - 'favicons.githubusercontent.com', 'gist.github.com', - 'github-cloud.s3.amazonaws.com', 'github-com.s3.amazonaws.com', - 'github-production-release-asset-2e65be.s3.amazonaws.com', - 'github-production-repository-file-5c1aeb.s3.amazonaws.com', - 'github-production-user-asset-6210df.s3.amazonaws.com', 'github.blog', - 'github.com', 'github.community', 'github.githubassets.com', - 'github.global.ssl.fastly.net', 'github.io', 'github.map.fastly.net', - 'githubstatus.com', 'live.github.com', 'media.githubusercontent.com', - 'objects.githubusercontent.com', 'pipelines.actions.githubusercontent.com', - 'raw.githubusercontent.com', 'user-images.githubusercontent.com', - 'vscode.dev' + 'alive.github.com' ] +# GITHUB_URLS = [ +# 'alive.github.com', 'api.github.com', 'assets-cdn.github.com', +# 'avatars.githubusercontent.com', 'avatars0.githubusercontent.com', +# 'avatars1.githubusercontent.com', 'avatars2.githubusercontent.com', +# 'avatars3.githubusercontent.com', 'avatars4.githubusercontent.com', +# 'avatars5.githubusercontent.com', 'camo.githubusercontent.com', +# 'central.github.com', 'cloud.githubusercontent.com', 'codeload.github.com', +# 'collector.github.com', 'desktop.githubusercontent.com', +# 'favicons.githubusercontent.com', 'gist.github.com', +# 'github-cloud.s3.amazonaws.com', 'github-com.s3.amazonaws.com', +# 'github-production-release-asset-2e65be.s3.amazonaws.com', +# 'github-production-repository-file-5c1aeb.s3.amazonaws.com', +# 'github-production-user-asset-6210df.s3.amazonaws.com', 'github.blog', +# 'github.com', 'github.community', 'github.githubassets.com', +# 'github.global.ssl.fastly.net', 'github.io', 'github.map.fastly.net', +# 'githubstatus.com', 'live.github.com', 'media.githubusercontent.com', +# 'objects.githubusercontent.com', 'pipelines.actions.githubusercontent.com', +# 'raw.githubusercontent.com', 'user-images.githubusercontent.com', +# 'vscode.dev' +# ] + HOSTS_TEMPLATE = """# GitHub520 Host Start {content} @@ -54,13 +58,16 @@ def write_file(hosts_content: str, update_time: str) -> bool: if os.path.exists(output_doc_file_path): with open(output_doc_file_path, "r") as old_readme_fb: old_content = old_readme_fb.read() - old_hosts = old_content.split("```bash")[1].split("```")[0].strip() - old_hosts = old_hosts.split("# Update time:")[0].strip() - hosts_content_hosts = hosts_content.split("# Update time:")[ - 0].strip() - if old_hosts == hosts_content_hosts: - print("host not change") - return False + if old_content: + old_hosts = old_content.split("```bash")[1].split("```")[0].strip() + old_hosts = old_hosts.split("# Update time:")[0].strip() + hosts_content_hosts = hosts_content.split("# Update time:")[ + 0].strip() + if old_hosts == hosts_content_hosts: + print("host not change") + return False + else: + return False with open(template_path, "r") as temp_fb: template_str = temp_fb.read() @@ -123,6 +130,8 @@ def get_ip(session: Any, github_url: str) -> Optional[str]: def main(verbose=False) -> None: + if verbose: + print('Start script.') session = HTMLSession() content = "" content_list = [] @@ -147,6 +156,7 @@ def main(verbose=False) -> None: write_json_file(content_list) if verbose: print(hosts_content) + print('End script.') if __name__ == '__main__': diff --git a/hosts b/hosts index 9941eb5e7..1352d227a 100644 --- a/hosts +++ b/hosts @@ -1,86 +1,45 @@ # GitHub520 Host Start 140.82.114.25 alive.github.com -140.82.114.26 live.github.com -185.199.108.154 github.githubassets.com -140.82.114.22 central.github.com -<<<<<<< HEAD -185.199.108.133 desktop.githubusercontent.com -185.199.108.153 assets-cdn.github.com -185.199.108.133 camo.githubusercontent.com -185.199.108.133 github.map.fastly.net -151.101.1.194 github.global.ssl.fastly.net -140.82.114.3 gist.github.com -185.199.108.153 github.io -140.82.114.4 github.com -192.0.66.2 github.blog 140.82.114.5 api.github.com -185.199.108.133 raw.githubusercontent.com -185.199.108.133 user-images.githubusercontent.com -185.199.108.133 favicons.githubusercontent.com -185.199.108.133 avatars5.githubusercontent.com -185.199.108.133 avatars4.githubusercontent.com -185.199.108.133 avatars3.githubusercontent.com -185.199.108.133 avatars2.githubusercontent.com -185.199.108.133 avatars1.githubusercontent.com -185.199.108.133 avatars0.githubusercontent.com -185.199.108.133 avatars.githubusercontent.com -140.82.113.10 codeload.github.com -52.216.50.209 github-cloud.s3.amazonaws.com -52.217.131.145 github-com.s3.amazonaws.com -3.5.1.132 github-production-release-asset-2e65be.s3.amazonaws.com -3.5.17.197 github-production-user-asset-6210df.s3.amazonaws.com -52.217.140.201 github-production-repository-file-5c1aeb.s3.amazonaws.com -185.199.108.153 githubstatus.com -140.82.114.18 github.community -52.224.38.193 github.dev -140.82.113.22 collector.github.com -13.107.42.16 pipelines.actions.githubusercontent.com -185.199.108.133 media.githubusercontent.com -185.199.108.133 cloud.githubusercontent.com -185.199.108.133 objects.githubusercontent.com -13.107.213.51 vscode.dev - - -# Update time: 2022-11-22T12:05:53+08:00 -======= -185.199.109.133 desktop.githubusercontent.com -185.199.110.153 assets-cdn.github.com +185.199.111.153 assets-cdn.github.com +185.199.109.133 avatars.githubusercontent.com +185.199.109.133 avatars0.githubusercontent.com +185.199.109.133 avatars1.githubusercontent.com +185.199.109.133 avatars2.githubusercontent.com +185.199.109.133 avatars3.githubusercontent.com +185.199.109.133 avatars4.githubusercontent.com +185.199.109.133 avatars5.githubusercontent.com 185.199.109.133 camo.githubusercontent.com -185.199.109.133 github.map.fastly.net -151.101.65.194 github.global.ssl.fastly.net +140.82.114.22 central.github.com +185.199.109.133 cloud.githubusercontent.com +140.82.113.10 codeload.github.com +140.82.113.22 collector.github.com +185.199.109.133 desktop.githubusercontent.com +185.199.109.133 favicons.githubusercontent.com 140.82.114.3 gist.github.com -185.199.110.153 github.io -140.82.114.4 github.com +52.217.232.225 github-cloud.s3.amazonaws.com +52.217.131.145 github-com.s3.amazonaws.com +52.217.137.129 github-production-release-asset-2e65be.s3.amazonaws.com +52.217.140.201 github-production-repository-file-5c1aeb.s3.amazonaws.com +52.217.72.20 github-production-user-asset-6210df.s3.amazonaws.com 192.0.66.2 github.blog -140.82.114.5 api.github.com +140.82.114.4 github.com +140.82.114.18 github.community +185.199.108.154 github.githubassets.com +151.101.65.194 github.global.ssl.fastly.net +185.199.108.153 github.io +185.199.108.133 github.map.fastly.net +185.199.111.153 githubstatus.com +140.82.114.26 live.github.com +185.199.109.133 media.githubusercontent.com +185.199.109.133 objects.githubusercontent.com +13.107.42.16 pipelines.actions.githubusercontent.com 185.199.109.133 raw.githubusercontent.com 185.199.109.133 user-images.githubusercontent.com -185.199.109.133 favicons.githubusercontent.com -185.199.109.133 avatars5.githubusercontent.com -185.199.109.133 avatars4.githubusercontent.com -185.199.109.133 avatars3.githubusercontent.com -185.199.109.133 avatars2.githubusercontent.com -185.199.109.133 avatars1.githubusercontent.com -185.199.109.133 avatars0.githubusercontent.com -185.199.109.133 avatars.githubusercontent.com -140.82.113.10 codeload.github.com -52.217.136.161 github-cloud.s3.amazonaws.com -52.217.131.145 github-com.s3.amazonaws.com -52.216.54.1 github-production-release-asset-2e65be.s3.amazonaws.com -52.217.13.236 github-production-user-asset-6210df.s3.amazonaws.com -52.217.140.201 github-production-repository-file-5c1aeb.s3.amazonaws.com -185.199.111.153 githubstatus.com -140.82.114.18 github.community -140.82.113.22 collector.github.com -13.107.42.16 pipelines.actions.githubusercontent.com -185.199.109.133 media.githubusercontent.com -185.199.109.133 cloud.githubusercontent.com -185.199.109.133 objects.githubusercontent.com -13.107.213.51 vscode.dev +13.107.246.51 vscode.dev -# Update time: 2022-11-22T05:08:07+08:00 ->>>>>>> 2161298a (feat: 增加ip可用性校验，默认择快选取) +# Update time: 2022-11-22T05:46:50+08:00 # Update url: https://raw.hellogithub.com/hosts # Star me: https://github.com/521xueweihan/GitHub520 # GitHub520 Host End