Skip to content

speedup downloading #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BruddaCode wants to merge 2 commits into
base: main
Choose a base branch
from
Open

speedup downloading #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45e1e55
speedup downloading
BruddaCode Jun 16, 2024
2d95e5a
change from using tarfile to subprocess
BruddaCode Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 48 additions & 21 deletions SourceStream/file/download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,54 @@

from ..vendor.SplashPyUtils import logger

import requests
import asyncio
import aiohttp
import time
import os

def download_tool(package):
package_name = package["package"]
package_version = package["version"]
package_version_split = package["version"].split(".")

package_url = SourceStream.YAML_SOURCES[package_name]["url"].replace("{VERSION}", package_version)
package_url = package_url.replace("{VERSION_SEPARATE_UNDERSCORE}", package_version.replace(".", "_"))

if(len(package_version_split) >= 1): package_url = package_url.replace("{VERSION_MAJOR}", package_version_split[0])
if(len(package_version_split) >= 2): package_url = package_url.replace("{VERSION_MINOR}", package_version_split[1])
if(len(package_version_split) >= 3): package_url = package_url.replace("{VERSION_REVISION}", package_version_split[2])
if(len(package_version_split) >= 4): package_url = package_url.replace("{VERSION_BUILD}", package_version_split[3])

package_filename = os.path.basename(package_url)
package_path = os.path.join(SourceStream.DIR_INPUT, package_filename)

if not os.path.exists(package_path):
r = requests.get(package_url)
open(package_path, 'wb').write(r.content)
logger.log.ok(f"Downloaded package \x1b[1;37m{package_name}({package_version})\x1b[0m Successfully.")
async def download_tool(packages):

package_list = []

for package in packages:
package_name = package["package"]
package_version = package["version"]
package_version_split = package["version"].split(".")

package_url = SourceStream.YAML_SOURCES[package_name]["url"].replace("{VERSION}", package_version)
package_url = package_url.replace("{VERSION_SEPARATE_UNDERSCORE}", package_version.replace(".", "_"))

if(len(package_version_split) >= 1): package_url = package_url.replace("{VERSION_MAJOR}", package_version_split[0])
if(len(package_version_split) >= 2): package_url = package_url.replace("{VERSION_MINOR}", package_version_split[1])
if(len(package_version_split) >= 3): package_url = package_url.replace("{VERSION_REVISION}", package_version_split[2])
if(len(package_version_split) >= 4): package_url = package_url.replace("{VERSION_BUILD}", package_version_split[3])

package_filename = os.path.basename(package_url)
package_path = os.path.join(SourceStream.DIR_INPUT, package_filename)

if not os.path.exists(package_path):
package_list.append({"name": package_name, "version": package_version, "url": package_url, "path": package_path})
else:
logger.log.ok(f"Package \x1b[1;37m{package_name}({package_version})\x1b[0m already downloaded.")

async with aiohttp.ClientSession() as session:
tasks = []
for package in package_list:
tasks.append(download_package(session, package))

await asyncio.gather(*tasks)

async def download_package(session, package):
async with session.get(package["url"]) as response:
if response.status == 200:
with open(package["path"], 'wb') as f_handle:
while True:
chunk = await response.content.read(1024)
if not chunk:
break
f_handle.write(chunk)
logger.log.ok(f"Downloaded package \x1b[1;37m{package['name']}({package['version']})\x1b[0m Successfully.")
else:
logger.log.fail(f"Failed to download package \x1b[1;37m{package['name']}({package['version']})\x1b[0m.")
logger.log.fail(f"Status code: {response.status}")

42 changes: 20 additions & 22 deletions SourceStream/file/repack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
from ..vendor.SplashPyUtils import logger

import shutil
import tarfile
# import tarfile
import os
import subprocess

def repack_tool(packages):
package_name = packages["package"]
Expand All @@ -17,12 +18,7 @@ def repack_tool(packages):

try:
# Extract tar file in the input directory.
with tarfile.open(package_path_input) as f:
if not SourceStream.YAML_SOURCES[package_name]["subdir"]:
os.makedirs(package_path_folder, exist_ok=True)
f.extractall(package_path_folder)
else:
f.extractall(SourceStream.DIR_INPUT)
subprocess.run(["tar", "-xf", package_path_input, "-C", SourceStream.DIR_INPUT], check=True)

# Check if the folder just extracted needs to be renamed.
if isinstance(SourceStream.YAML_SOURCES[package_name]["subdir"], str):
Expand All @@ -33,22 +29,24 @@ def repack_tool(packages):
# Create package directory where repacked tar file will be saved in.
os.makedirs(os.path.join(SourceStream.DIR_OUTPUT, package_name), exist_ok=True)

# Create a list of files and directories to be included in the tar file
tar_items = [package_fullname]

# Check if configuration files exist for these packages
if os.path.exists(os.path.join(SourceStream.DIR_BUILTSCRIPTS, package_name, package_version)):
tar_items.append(os.path.join(SourceStream.DIR_BUILTSCRIPTS, package_name, package_version, "manifest.yml"))

# Check if there are some extra folders included
if os.path.exists(os.path.join(SourceStream.DIR_BUILTSCRIPTS, package_name, package_version, "build")):
tar_items.append(os.path.join(SourceStream.DIR_BUILTSCRIPTS, package_name, package_version, "build"))
if os.path.exists(os.path.join(SourceStream.DIR_BUILTSCRIPTS, package_name, package_version, "patch")):
tar_items.append(os.path.join(SourceStream.DIR_BUILTSCRIPTS, package_name, package_version, "patch"))
else:
logger.log.warn(f"The package {package_name} does not have a manifest.")

# Create tar file
with tarfile.open(os.path.join(SourceStream.DIR_OUTPUT, package_name, f"{package_fullname}.tar.xz"), "w:xz") as tar:
tar.add(os.path.join(SourceStream.DIR_INPUT, package_fullname), arcname=package_fullname)

# Check if configuration files exist for these packages
if os.path.exists(os.path.join(SourceStream.DIR_BUILTSCRIPTS, package_name, package_version)):
tar.add(os.path.join(SourceStream.DIR_BUILTSCRIPTS, package_name, package_version, "manifest.yml"), arcname="manifest.yml")

# Check if there are some extra folders included
if os.path.exists(os.path.join(SourceStream.DIR_BUILTSCRIPTS, package_name, package_version, "build")):
tar.add(os.path.join(SourceStream.DIR_BUILTSCRIPTS, package_name, package_version, "build"), arcname="build")
if os.path.exists(os.path.join(SourceStream.DIR_BUILTSCRIPTS, package_name, package_version, "patch")):
tar.add(os.path.join(SourceStream.DIR_BUILTSCRIPTS, package_name, package_version, "patch"), arcname="patch")

else:
logger.log.warn(f"The package {package_name} does not have a manifest.")
tar_output_path = os.path.join(SourceStream.DIR_OUTPUT, package_name, f"{package_fullname}.tar.xz")
subprocess.run(["tar", "-cJf", tar_output_path, "-C", SourceStream.DIR_INPUT] + tar_items, check=True)

# Cleanup the input folder
shutil.rmtree(package_path_folder)
Expand Down
5 changes: 3 additions & 2 deletions SourceStream/task/tasks/repackPackages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@


import multiprocessing
import asyncio
import shutil
import dload
import sys
Expand Down Expand Up @@ -48,9 +49,9 @@ def run():
tools = SourceStream.PACKAGES

logger.log.info("Starting to download and check packages, this can take a while...")
for tool in tools:
download.download_tool(tool)

asyncio.run(download.download_tool(tools))

logger.log.info("Starting to repack packages, this can take a while...")

# Repack packages with multiprocessing
Expand Down