Skip to content

Commit

Permalink
Merge pull request #13 from s-t-e-v-e-n-k/dedupe-architecture
Browse files Browse the repository at this point in the history
Refactor arch checking into a function
  • Loading branch information
joshuaboniface authored Apr 7, 2024
2 parents 044737d + d576b9e commit b89a12d
Showing 1 changed file with 19 additions and 36 deletions.
55 changes: 19 additions & 36 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,21 @@ def log(message):
exit(1)


# Shared functions
def _determine_arch(build_type, build_arch, build_version):
PACKAGE_ARCH = (
configurations[build_type]["archmaps"][build_arch]["PACKAGE_ARCH"]
if build_arch in configurations[build_type]["archmaps"].keys()
else None
)
if PACKAGE_ARCH is None:
raise ValueError(
f"{build_arch} is not a valid {build_type} {build_version} architecture in {configurations[build_type]['archmaps'].keys()}"
)
else:
return PACKAGE_ARCH


def build_package_deb(
jellyfin_version, build_type, build_arch, build_version, local=False
):
Expand All @@ -60,15 +75,7 @@ def build_package_deb(
raise ValueError(
f"{build_version} is not a valid {build_type} version in {configurations[build_type]['releases'].keys()}"
)
PACKAGE_ARCH = (
configurations[build_type]["archmaps"][build_arch]["PACKAGE_ARCH"]
if build_arch in configurations[build_type]["archmaps"].keys()
else None
)
if PACKAGE_ARCH is None:
raise ValueError(
f"{build_arch} is not a valid {build_type} {build_version} architecture in {configurations[build_type]['archmaps'].keys()}"
)
PACKAGE_ARCH = _determine_arch(build_type, build_arch, build_version)
except Exception as e:
log(f"Invalid/unsupported arguments: {e}")
exit(1)
Expand Down Expand Up @@ -124,15 +131,7 @@ def build_linux(
log("")

try:
PACKAGE_ARCH = (
configurations[build_type]["archmaps"][build_arch]["PACKAGE_ARCH"]
if build_arch in configurations[build_type]["archmaps"].keys()
else None
)
if PACKAGE_ARCH is None:
raise ValueError(
f"{build_arch} is not a valid {build_type} {build_version} architecture in {configurations[build_type]['archmaps'].keys()}"
)
PACKAGE_ARCH = _determine_arch(build_type, build_arch, _build_version)
DOTNET_ARCH = configurations[build_type]["archmaps"][build_arch]["DOTNET_ARCH"]
except Exception as e:
log(f"Invalid/unsupported arguments: {e}")
Expand Down Expand Up @@ -168,15 +167,7 @@ def build_windows(
log("")

try:
PACKAGE_ARCH = (
configurations[build_type]["archmaps"][build_arch]["PACKAGE_ARCH"]
if build_arch in configurations[build_type]["archmaps"].keys()
else None
)
if PACKAGE_ARCH is None:
raise ValueError(
f"{build_arch} is not a valid {build_type} {build_version} architecture in {configurations[build_type]['archmaps'].keys()}"
)
PACKAGE_ARCH = _determine_arch(build_type, build_arch, _build_version)
DOTNET_ARCH = configurations[build_type]["archmaps"][build_arch]["DOTNET_ARCH"]
except Exception as e:
log(f"Invalid/unsupported arguments: {e}")
Expand Down Expand Up @@ -212,15 +203,7 @@ def build_macos(
log("")

try:
PACKAGE_ARCH = (
configurations[build_type]["archmaps"][build_arch]["PACKAGE_ARCH"]
if build_arch in configurations[build_type]["archmaps"].keys()
else None
)
if PACKAGE_ARCH is None:
raise ValueError(
f"{build_arch} is not a valid {build_type} {build_version} architecture in {configurations[build_type]['archmaps'].keys()}"
)
PACKAGE_ARCH = _determine_arch(build_type, build_arch, _build_version)
DOTNET_ARCH = configurations[build_type]["archmaps"][build_arch]["DOTNET_ARCH"]
except Exception as e:
log(f"Invalid/unsupported arguments: {e}")
Expand Down

0 comments on commit b89a12d

Please sign in to comment.