commit sha results

Author: KumaTea

src/check_sha.py

@@ -3,7 +3,10 @@
 import requests
 from tqdm import tqdm
 from tools import get_whl_list
-from gen_whl import saved_sha256sums, save_sha256sums
+from gen_whl import get_saved_hash, save_sha
+
+
+saved_hash = get_saved_hash()
 
 
 def get_sha_pkgs():
@@ -19,9 +22,10 @@ def get_sha_pkgs():
 
 
 def sha_check(filename: str, url: str, pbar: tqdm):
-    if saved_sha256sums[filename]['verify']:
+    if saved_hash[filename]['verify']:
+        pbar.write(f'\r{filename} already verified!', end='')
         return True
-    local_sha = saved_sha256sums[filename]['sha']
+    local_sha = saved_hash[filename]['sha']
     remote_sha = url.split('#sha256=')[1]
     assert local_sha == remote_sha, f'{filename} sha256sum not match! local: {local_sha}, remote: {remote_sha}'
 
@@ -36,25 +40,28 @@ def sha_check(filename: str, url: str, pbar: tqdm):
             f'  cdn: {cdn_sha}\n'
         )
     else:
-        saved_sha256sums[filename]['verify'] = True
+        saved_hash[filename]['verify'] = True
+        pbar.write(f'\r{filename} verified!', end='')
 
 
 def remove_obsolete():
     whl_list = get_whl_list()
     all_filenames = [pair[0] for pair in whl_list]
-    for filename in saved_sha256sums.copy():
+    for filename in saved_hash.copy():
         if filename not in all_filenames:
             logging.warning(f'{filename} not found in wheels.html!')
-            saved_sha256sums.pop(filename)
+            saved_hash.pop(filename)
 
 
 def main():
     pkgs = get_sha_pkgs()
     pbar = tqdm(pkgs)
+    pbar.write('Checking sha256sum...')
     for pkg in pbar:
+        pbar.set_description(pkg[0])
         sha_check(pkg[0], pkg[1], pbar)
     remove_obsolete()
-    save_sha256sums()
+    save_sha(saved_hash)
 
 
 if __name__ == '__main__':

src/gen_whl.py

@@ -19,24 +19,24 @@ def get_local_whl_dict(d: list) -> dict:
 local_whl_dict = get_local_whl_dict([LINUX_WHEEL_DIR, WIN_WHEEL_DIR])
 
 
-def get_saved_sha256sums():
+def get_saved_hash():
     if os.path.exists(f'{whl_dir}/data/{sha_file}'):
         with open(f'{whl_dir}/data/{sha_file}', 'r', encoding='utf-8') as json_file:
             return json.load(json_file)
     return {}
 
 
-saved_sha256sums = get_saved_sha256sums()
+saved_hash = get_saved_hash()
 
 
 def get_whl_sha256(name: str):
-    if name in saved_sha256sums:
-        return saved_sha256sums[name]['sha']
+    if name in saved_hash:
+        return saved_hash[name]['sha']
     if name in local_whl_dict:
         path = local_whl_dict[name]
         with open(path, 'rb') as f:
             sha256sum = hashlib.sha256(f.read()).hexdigest()
-        saved_sha256sums[name] = {'sha': sha256sum, 'verify': False}
+        saved_hash[name] = {'sha': sha256sum, 'verify': False}
         return sha256sum
     return None
 
@@ -130,15 +130,16 @@ def gen_html_cdn():
         html_file.write(html.replace('https://github.com/', 'https://gh.kmtea.eu/https://github.com/'))
 
 
-def save_sha256sums():
+def save_sha(sums: dict):
+    sums = dict(sorted(sums.items(), key=lambda x: x[0].lower()))
     with open(f'{whl_dir}/data/{sha_file}', 'w', encoding='utf-8') as json_file:
         # for better git
-        json.dump(saved_sha256sums, json_file, indent=2)
+        json.dump(sums, json_file, indent=2)
 
 
 if __name__ == '__main__':
     if os.name == 'nt':
         gen_html()
-        save_sha256sums()
+        save_sha(saved_hash)
     else:
         gen_html_cdn()

src/tools.py

@@ -6,7 +6,7 @@
 import subprocess
 from config import *
 from tqdm import tqdm
-from gen_whl import saved_sha256sums
+from gen_whl import saved_hash
 from config_ver import PYTHON_TO_PYPY
 
 
@@ -57,7 +57,7 @@ def copy_wheels(dst: str):
         if file not in whl_html:
             new_whl.append((root, file))
         else:
-            if file in saved_sha256sums:
+            if file in saved_hash:
                 logging.warning(f'Skip: \t{file} already exists in saved_sha256sums')
             else:
                 new_whl.append((root, file))