Merge pull request 'feat: add support of zip source archives' (#168) from sisungo/semios-packages:zipsupport into master
Reviewed-on: #168
This commit was merged in pull request #168.
This commit is contained in:
+42
-10
@@ -4,6 +4,7 @@ import sys
|
|||||||
import tarfile
|
import tarfile
|
||||||
import urllib.parse
|
import urllib.parse
|
||||||
import urllib.request
|
import urllib.request
|
||||||
|
import zipfile
|
||||||
|
|
||||||
|
|
||||||
def filename(url):
|
def filename(url):
|
||||||
@@ -128,6 +129,25 @@ def tar_common_root(tar: tarfile.TarFile) -> str | None:
|
|||||||
return root
|
return root
|
||||||
|
|
||||||
|
|
||||||
|
def zip_common_root(zip_file: zipfile.ZipFile) -> str | None:
|
||||||
|
members = zip_file.infolist()
|
||||||
|
if not members:
|
||||||
|
return None
|
||||||
|
root = None
|
||||||
|
for member in members:
|
||||||
|
path = member.filename.replace('\\', '/').lstrip('./').lstrip('/')
|
||||||
|
if not path:
|
||||||
|
continue
|
||||||
|
this_root = path.split('/')[0]
|
||||||
|
if this_root in ('', '.', '..'):
|
||||||
|
continue
|
||||||
|
if root is None:
|
||||||
|
root = this_root
|
||||||
|
elif this_root != root:
|
||||||
|
return None
|
||||||
|
return root
|
||||||
|
|
||||||
|
|
||||||
def sources_dir_name() -> str:
|
def sources_dir_name() -> str:
|
||||||
with open("./target/sources.tag") as file:
|
with open("./target/sources.tag") as file:
|
||||||
return file.read()
|
return file.read()
|
||||||
@@ -139,16 +159,28 @@ def source_url(url: str):
|
|||||||
download_path = f"./target/{filename(url)}"
|
download_path = f"./target/{filename(url)}"
|
||||||
download(url, download_path)
|
download(url, download_path)
|
||||||
|
|
||||||
with tarfile.open(download_path, "r") as tar:
|
if download_path.endswith(".zip"):
|
||||||
common_root = tar_common_root(tar)
|
with zipfile.ZipFile(download_path, "r") as zip:
|
||||||
extract_dir = "./target"
|
common_root = zip_common_root(zip)
|
||||||
sources_dir = f"./target/{common_root}"
|
else:
|
||||||
if common_root in ["", ".", "None"]:
|
with tarfile.open(download_path, "r") as tar:
|
||||||
extract_dir = "./target/sources"
|
common_root = tar_common_root(tar)
|
||||||
sources_dir = "./target/sources"
|
|
||||||
tar.extractall(extract_dir)
|
extract_dir = "./target"
|
||||||
with open("./target/sources.tag", "wt+") as file:
|
sources_dir = f"./target/{common_root}"
|
||||||
file.write(sources_dir)
|
if common_root in ["", ".", None]:
|
||||||
|
extract_dir = "./target/sources"
|
||||||
|
sources_dir = "./target/sources"
|
||||||
|
|
||||||
|
if download_path.endswith(".zip"):
|
||||||
|
with zipfile.ZipFile(download_path, "r") as zip:
|
||||||
|
zip.extractall(extract_dir)
|
||||||
|
else:
|
||||||
|
with tarfile.open(download_path, "r") as tar:
|
||||||
|
tar.extractall(extract_dir)
|
||||||
|
|
||||||
|
with open("./target/sources.tag", "wt+") as file:
|
||||||
|
file.write(sources_dir)
|
||||||
|
|
||||||
|
|
||||||
def _git_repo_name(url: str) -> str:
|
def _git_repo_name(url: str) -> str:
|
||||||
|
|||||||
@@ -119,6 +119,7 @@ def cmd_build_package(package: str):
|
|||||||
"version": pkgver,
|
"version": pkgver,
|
||||||
"arch": pkgarch,
|
"arch": pkgarch,
|
||||||
"description": pkginfo[lib.make._key_description],
|
"description": pkginfo[lib.make._key_description],
|
||||||
|
"maintainers": pkginfo[lib.make._key_maintainers],
|
||||||
"dependencies": pkginfo[lib.make._key_dependencies],
|
"dependencies": pkginfo[lib.make._key_dependencies],
|
||||||
"provides": pkginfo[lib.make._key_provides],
|
"provides": pkginfo[lib.make._key_provides],
|
||||||
"recommendations": pkginfo[lib.make._key_recommendations],
|
"recommendations": pkginfo[lib.make._key_recommendations],
|
||||||
|
|||||||
Reference in New Issue
Block a user