Manifest format update (#33)
This commit is contained in:
committed by
GitHub
parent
8a0f9ef4e4
commit
4ab2377970
+30
-36
@@ -2,13 +2,20 @@ import json
|
||||
import tarfile
|
||||
import os
|
||||
import tempfile
|
||||
import configparser
|
||||
import sys
|
||||
|
||||
def read_properties_file(path):
|
||||
config = configparser.RawConfigParser()
|
||||
config.read(path)
|
||||
return config
|
||||
properties = {}
|
||||
with open(path, "r") as file:
|
||||
for line in file:
|
||||
stripped = line.strip()
|
||||
if not stripped or stripped.startswith("#"):
|
||||
continue
|
||||
key, sep, value = line.partition("=")
|
||||
if not sep:
|
||||
continue
|
||||
properties[key.strip()] = value.strip()
|
||||
return properties
|
||||
|
||||
def get_manifest(appPath):
|
||||
"""Extract only the file named 'manifest.properties' from the given tar/tar.gz
|
||||
@@ -62,12 +69,12 @@ def get_manifest(appPath):
|
||||
return None
|
||||
|
||||
def get_versioned_file_name(manifest):
|
||||
app_id = manifest["app"]["id"]
|
||||
version_code = manifest["app"]["versionCode"]
|
||||
app_id = manifest["app.id"]
|
||||
version_code = manifest["app.version.code"]
|
||||
return f"{app_id}-{version_code}.app"
|
||||
|
||||
def get_os_version(manifest):
|
||||
sdk = manifest["target"]["sdk"]
|
||||
sdk = manifest["target.sdk"]
|
||||
# Remove trailing hyphen suffix if present
|
||||
if "-" in sdk:
|
||||
return sdk.rsplit("-", 1)[0].strip()
|
||||
@@ -75,38 +82,25 @@ def get_os_version(manifest):
|
||||
return sdk
|
||||
|
||||
def manifest_config_to_flat_json(manifest):
|
||||
"""Convert a ConfigParser manifest into a flat JSON-like dict.
|
||||
"""Convert a flat (V2) manifest dict into a flat JSON-like dict.
|
||||
|
||||
Expected sections/keys (case-insensitive for keys):
|
||||
- [app]
|
||||
id -> appId
|
||||
versionName -> appVersionName
|
||||
versionCode -> appVersionCode (int)
|
||||
name -> appName
|
||||
description -> appDescription (optional; default "")
|
||||
- [target]
|
||||
sdk -> targetSdk
|
||||
platforms -> targetPlatforms (comma-separated list)
|
||||
Expected keys:
|
||||
app.id -> appId
|
||||
app.version.name -> appVersionName
|
||||
app.version.code -> appVersionCode (int)
|
||||
app.name -> appName
|
||||
app.description -> appDescription (optional; default "")
|
||||
target.sdk -> targetSdk
|
||||
target.platforms -> targetPlatforms (comma-separated list)
|
||||
|
||||
Unknown/missing values fall back to sensible defaults per requirements.
|
||||
"""
|
||||
def get_opt(section, option, default=None):
|
||||
if not manifest.has_section(section):
|
||||
return default
|
||||
# try exact option then lowercase (RawConfigParser lowercases by default)
|
||||
if manifest.has_option(section, option):
|
||||
return manifest.get(section, option)
|
||||
low = option.lower()
|
||||
if manifest.has_option(section, low):
|
||||
return manifest.get(section, low)
|
||||
return default
|
||||
|
||||
# Map values
|
||||
app_id = get_opt("app", "id", "")
|
||||
app_version_name = get_opt("app", "versionName", "")
|
||||
app_version_code_raw = get_opt("app", "versionCode", "0")
|
||||
app_name = get_opt("app", "name", "")
|
||||
app_description = get_opt("app", "description", "") or ""
|
||||
app_id = manifest.get("app.id", "")
|
||||
app_version_name = manifest.get("app.version.name", "")
|
||||
app_version_code_raw = manifest.get("app.version.code", "0")
|
||||
app_name = manifest.get("app.name", "")
|
||||
app_description = manifest.get("app.description", "") or ""
|
||||
|
||||
# Coerce version code to int safely
|
||||
try:
|
||||
@@ -114,8 +108,8 @@ def manifest_config_to_flat_json(manifest):
|
||||
except Exception:
|
||||
app_version_code = 0
|
||||
|
||||
target_sdk = get_opt("target", "sdk", "")
|
||||
platforms_raw = get_opt("target", "platforms", "")
|
||||
target_sdk = manifest.get("target.sdk", "")
|
||||
platforms_raw = manifest.get("target.platforms", "")
|
||||
target_platforms = [p.strip() for p in str(platforms_raw).split(",") if p.strip()] if platforms_raw is not None else []
|
||||
|
||||
filename = get_versioned_file_name(manifest)
|
||||
|
||||
Reference in New Issue
Block a user