diff options
author | davidovski <git@davidovski.xyz> | 2021-11-17 12:20:12 +0000 |
---|---|---|
committer | davidovski <git@davidovski.xyz> | 2021-11-17 12:20:12 +0000 |
commit | 0ff24f5611f8a30f01ae08d866b5276c020a8665 (patch) | |
tree | 8c0a67e5f11e5622d9a46df2b7a1bd08cb66eddb /src/verbs | |
parent | 0313176c9fe35fcca0f53b99ce1e636af0bc9e4e (diff) |
added server pinging to determine best mirror to use
Diffstat (limited to 'src/verbs')
-rw-r--r-- | src/verbs/install.py | 21 | ||||
-rw-r--r-- | src/verbs/sync.py | 34 |
2 files changed, 52 insertions, 3 deletions
diff --git a/src/verbs/install.py b/src/verbs/install.py index 5883c51..f29142c 100644 --- a/src/verbs/install.py +++ b/src/verbs/install.py @@ -20,7 +20,6 @@ def find_package(query, repos, packages_dir): return checksum, sources, requested_repo return None, [], None - def retrieve_package_info(sources, checksum, package_name, verbose=False, skip_verification=False): for source,url in sources.items(): @@ -40,6 +39,25 @@ def retrieve_package_info(sources, checksum, package_name, print(colors.RED + f"No matching hashes found" + colors.RESET) return {} +def retrieve_package(sources, checksum, package_name, + verbose=False, skip_verification=False): + for source,url in sources.items(): + package_info_url = util.add_path(url, package_name + ".xipkg.info") + status, response = util.curl(package_info_url) + + if status == 200: + info = parse_package_info(response) + if info["CHECKSUM"] == checksum or skip_verification: + return info + else: + if verbose: + print(colors.RED + + f"Checksum verification failed for {package_name} in {source}" + + colors.RESET) + if verbose: + print(colors.RED + f"No matching hashes found" + colors.RESET) + return {} + def parse_package_info(packageinfo): info = {} @@ -49,7 +67,6 @@ def parse_package_info(packageinfo): info[split[0]] = "=".join(split[1:]) return info - def install(args, options, config): sources = config["sources"] repos = config["repos"] diff --git a/src/verbs/sync.py b/src/verbs/sync.py index 443a698..e9cc7b3 100644 --- a/src/verbs/sync.py +++ b/src/verbs/sync.py @@ -86,12 +86,44 @@ def import_key(source, url, verbose=False): elif verbose: print(colors.BG_RED + f"" + colors.RESET) + +def test_source(source, url): + start = time.time() + util.curl(util.add_path(url, "index.html")) + duration = time.time() - start + return int(duration * 1000) + +def test_sources(sources, file_path, test_count=10): + if test_count > 0: + pings = {} + checked = 0 + for source,url in sources.items(): + total = 0 + for i in range(test_count): + total += test_source(source, url) + util.loading_bar(checked, len(sources) * test_count, f"Pinging Sources") + checked += 1 + pings[source] = total / test_count if total > 0 else 0 + + + sorted(pings, reverse=True) + + with open(file_path, "w") as file: + for source,ping in pings.items(): + file.write(f"{source} {ping}\n") + + util.loading_bar(checked, len(sources) * test_count, f"Pinged Sources") + print() + + def sync(args, options, config): sources = config["sources"] repos = config["repos"] v = options["v"] + test_sources(sources, config["dir"]["sources"], test_count=int(config["pings"])) + for repo in repos: packages = sync_packages(repo, sources, verbose=v) @@ -103,7 +135,7 @@ def sync(args, options, config): num_packages = len(validated) util.loading_bar(num_packages, num_packages, f"Synced {repo}") print(colors.RESET) - + #total = len(sources) #completed = 0 |