Compare commits

..
Author SHA1 Message Date
waozi 476e38ca41 Release Arcade 0.7.86 with the latest game releases 2026-10-27 00:26:50 +00:00
waozi 0b07d0d374 Follow published game source after recording release metadata 2026-10-26 20:56:33 -03:00
waozi 48d2216394 Record synchronized Shovey chests and current game releases 2026-10-26 20:42:19 -03:00
waozi bd5f4a4ccb Disable Dew funding in Google Play builds 2026-10-26 16:54:18 -03:00
waozi 9d050ff20b Include verified live legacy reward recovery in the shared host 2026-10-26 14:36:10 -03:00
waozi 6e835a5dad Ship legacy Shovey reward migration in the shared game host 2026-10-26 14:29:42 -03:00
waozi 4592ce5d95 Acknowledge Pip before testing native gameplay 2026-10-26 14:01:13 -03:00
waozi 1889eff0b7 Use the published game controls and reward dialog updates 2026-10-26 13:55:39 -03:00
waozi e4c52c82fe Merge the published Arcade release with title screen improvements 2026-10-26 13:53:43 -03:00
waozi 3fa55eb32f Show full-colour startup previews before original title art 2026-10-26 13:15:07 -03:00
waozi 11fce1e7db Keep original colours and resolution in game title screens 2026-10-26 12:58:20 -03:00
waozi 3616bce66d Release Arcade 0.7.82 with the latest game releases 2026-10-26 08:57:17 +00:00
waozi de3144d420 Match the Editor release ledger to its locked Apfelwurm package 2026-10-26 04:40:56 -03:00
waozi 34768b446a Keep the Editor release on the published Kryon revision 2026-10-26 04:24:19 -03:00
waozi 465a962f58 Release Arcade 0.7.81 with the updated Shovey Editor 2026-10-26 04:16:46 -03:00
waozi addc24b60c Release Arcade 0.7.80 with complete game pictures and reopenable chests 2026-10-26 02:45:49 -03:00
waozi 46113fc833 Release Arcade 0.7.79 with small phone covers
Pins Apps with the phone cover grid and trusts its controller; the UI test
expects all three covers in one row of small cards on a phone.
2026-10-26 02:26:48 -03:00
waozi 34cc6c7481 Draw covers while their art downloads and wait for shared-code games to open
Pins Kryon and Apps with the pending-art fix. A game opened by name waits
for its background verification, which shared-code games now use. The
receipt names the art bundle; the UI test counts only game downloads and
answers Apfelwurm's controls question.
2026-10-26 01:06:42 -03:00
waozi 401181824c Supply Arcade's own controller from a typed host asset
collection_host.zi now imports the hosted app types its controller
callback returns, so the desktop and browser hosts build again.
2026-10-26 00:48:57 -03:00
waozi 0770c94f84 Release Arcade 0.7.78 as a launcher under one megabyte
The published Arcade carries only its catalog: hosts supply the shared Apps
controller, and the games' covers and previews download once as a separate
art bundle beside the games. Covers show only the art. Pins the shared-code
toolchain, the Apps host that supports both, and Shovey's thin Editor;
Arcade now needs host interface 35. Release builds print and keep their
candidate so its exact bytes can be checked before publishing.
2026-10-26 00:33:45 -03:00
waozi df26351d07 Show only the art on Arcade's covers
A game's size stays in its download dialog; the covers no longer repeat it.
2026-10-26 00:23:43 -03:00
46 changed files with 649 additions and 123 deletions

No files matched your search

+2
View File
@@ -29,6 +29,8 @@ jobs:
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
with:
path: waozixyz/arcade
- name: Check release following
run: python3 tests/game_updates_test.py
- name: Pin the latest game releases
id: pin
env:
+17
View File
@@ -69,7 +69,24 @@ jobs:
make collection
python3 tests/collection_test.py
python3 tests/publisher_test.py
# The candidate's digest, so a local check can compare the exact bytes.
sha256sum build/node-apps/arcade.zx
echo "$EXPECTED_SHA256 build/node-apps/arcade.zx" | sha256sum --check --strict
# When the digest is not the expected one, keep the candidate for a local
# check; nothing is published.
- name: Keep the unpublished candidate
if: failure()
uses: actions/upload-artifact@v4
with:
name: arcade-candidate
path: |
waozixyz/arcade/build/node-apps/arcade.zx
waozixyz/arcade/build/node-apps/arcade.json
waozixyz/arcade/build/node-apps/arcade.games.tar
waozixyz/arcade/build/games/wurm.zx
waozixyz/arcade/build/apps-ui/apps.zx
if-no-files-found: ignore
retention-days: 1
- name: Publish the checked catalog and game archive
env:
GH_TOKEN: ${{ github.token }}
+1
View File
@@ -75,6 +75,7 @@ jobs:
- name: Build the browser edition
run: |
python3 scripts/build-entity.py
python3 scripts/build-apps.py --output build/apps-ui
python3 scripts/build-web.py --bundle build/published/arcade.zx \
--controller-sha256 "$(cat build/published/apps-controller.sha256)" \
--version '${{ steps.published.outputs.version }}'
+46
View File
@@ -1,5 +1,51 @@
# Arcade changelog
## 0.7.86
- Shovey 0.6.154: Keep opened chests open across restarts and account sync; show the blue Dew diamond only while their reward is unclaimed.
- Shovey 0.6.154: Show an empty open chest after its Dew is claimed.
- Shovey 0.6.154: Use corrected campaign boards after an update, including level 29 when an older campaign was cached offline.
## 0.7.85
- Shovey keeps opened and claimed chests synchronized, with a blue diamond only for an unclaimed reward.
- Shovey uses corrected boards after an update instead of an older cached campaign.
- Apfelwurm shows level previews only after they are unlocked.
## 0.7.84
- Complete automatic reward recovery for older Shovey saves.
## 0.7.83
- Preserve earned Shovey reward eligibility when upgrading older synced saves.
## 0.7.82
- Apfelwurm 0.1.6: Try again after game over starts the furthest unlocked level with three lives and a fresh score.
- Apfelwurm 0.1.6: Choose level from the title to browse all five landscapes, preview each board and replay any unlocked level. Future levels remain locked until you reach them.
- Apfelwurm 0.1.6: Use Escape to pause or go back in the browser without stopping the game.
## 0.7.81
- Update Shovey to the approved campaign and solve puzzles using wooden crates as water bridges.
- Shovey Editor recognizes device unlocks, returns to the title, accepts right-click movement and shows a clearer object palette.
## 0.7.80
- Keep games covered until their first board is ready and keep complete pictures visible while animation sprites load.
- Shovey’s secret chest reopens for unclaimed Dew and shows an empty chest after a confirmed claim.
## 0.7.79
- On phones the library shows small covers, two or three in a row.
## 0.7.78
- Download Arcade itself in under one megabyte: it lists the games, and their covers and each game arrive separately when you need them.
- Covers show only the game art; the download dialog shows the size.
- Shovey Editor downloads as a small add-on that reuses Shovey’s game.
## 0.7.77
- Apfelwurm 0.1.4: Press Play and go straight into the game: no stage or level select. Play every level in order through all five landscapes, earning lives as your score grows; a game over starts again from level 1.
+5
View File
@@ -54,15 +54,18 @@ run: all
./build/arcade
test: all
python3 tests/game_updates_test.py
$(ZIRAN) fmt --check src/*.zi apps/chess/*.zi tests/chess_engine_behavior.zi tests/chess_app_behavior.zi
python3 tests/chess_locale_test.py
INBE_SOURCE='$(INBE_SOURCE)' python3 tests/catalog_test.py
python3 tests/publisher_test.py
python3 tests/apps_controller_test.py
python3 tests/startup_art_test.py
./build/arcade --list
sh tests/chess_engine_zi_test.sh '$(ZIRAN)'
sh tests/chess_app_test.sh '$(ZIRAN)'
python3 tests/sound_test.py
sh tests/collection_loading_test.sh
chess-engine-test:
sh tests/chess_engine_zi_test.sh '$(ZIRAN)'
@@ -110,6 +113,7 @@ install-arcade: collection build/entity.zx build/arcade
install -m 0755 build/arcade '$(LIB_DIR)/arcade.new'
mv -f '$(LIB_DIR)/arcade.new' '$(LIB_DIR)/arcade'
install -m 0644 build/entity.zx build/arcade.zx build/arcade.json '$(LIB_DIR)/'
install -m 0644 '$(APPS_BUNDLE)' '$(LIB_DIR)/apps.zx'
ln -sfn '$(LIB_DIR)/arcade' '$(BIN_DIR)/arcade'
install -m 0644 packaging/xyz.waozi.arcade.desktop '$(DATA_DIR)/applications/'
@@ -122,6 +126,7 @@ install: all install-arcade
install -m 0755 build/shovey '$(LIB_DIR)/shovey.new'
mv -f '$(LIB_DIR)/shovey.new' '$(LIB_DIR)/shovey'
install -m 0644 build/entity.zx build/arcade.zx build/arcade.json build/shovey.zx build/shovey.json '$(LIB_DIR)/'
install -m 0644 '$(APPS_BUNDLE)' '$(LIB_DIR)/apps.zx'
ln -sfn '$(LIB_DIR)/arcade' '$(BIN_DIR)/arcade'
ln -sfn '$(LIB_DIR)/shovey' '$(BIN_DIR)/shovey'
mkdir -p '$(DATA_DIR)/icons/hicolor/256x256/apps'
+3 -1
View File
@@ -6,12 +6,14 @@ title-screen covers from the shared Apps controller. Click a cover to open
an installed game or download it first. There are no separate launch buttons.
Standalone Shovey opens on its own cover carousel;
swipe, use the arrows or scroll the wheel to choose, then press Play/Open.
Its desktop startup first draws a small full-colour title preview, then uses
the original artwork when the collection is ready.
Chess is temporarily disabled in Arcade; its code and
existing saved games remain available for a later return.
Each edition has a separate save and earned unlocks. Unlocked puzzles show
their whole board; locked puzzles keep their lock until earned.
Arcade carries only its catalog and covers first, as small copies of each game's art in `assets/arcade/library/` (`python3 scripts/library-art.py` refreshes them when a game's art changes; the build stops until it does). Each game
The published Arcade carries only its catalog, well under one megabyte. Its host supplies the shared Apps controller (Inner Breeze its own, standalone Arcade the `apps.zx` installed beside it), and the covers and previews download once as one separate art bundle. Title screens and logos keep their original resolution and full colours; only library previews use small copies. The art lives in `assets/arcade/library/` (`python3 scripts/library-art.py` refreshes it when a game's art changes; the build stops until it does). Inner Breeze needs host interface 35 for it. Each game
downloads when opened, with its existing identity and saved progress. This
catalog requires Inner Breeze host API 34. Downloaded games work offline;
standalone Shovey keeps its complete offline collection. Apfelwurm comes from
+1 -1
View File
@@ -1 +1 @@
0.7.77
0.7.86
+1 -1
View File
@@ -1 +1 @@
5490a8e61f5fa218e813b6e3d78bece6198d2ed935c42fc77b7d5e4aeed9bfe3
a81eb5b14d2066925d19c3fd922865af40c90673cf54fb11bd7f9bf89a29cb98
+9 -9
View File
@@ -13,8 +13,8 @@
"shovey": {
"id": "arcade.shovey",
"title": "Shovey",
"version": "0.6.148",
"sequence": 156,
"version": "0.6.154",
"sequence": 162,
"host_api": 12
},
"shovey-island": {
@@ -27,22 +27,22 @@
"shovey-editor": {
"id": "arcade.shovey-editor",
"title": "Shovey Editor",
"version": "0.2.140",
"sequence": 142,
"version": "0.2.144",
"sequence": 146,
"host_api": 12
},
"arcade": {
"id": "inbe.arcade",
"title": "Arcade",
"version": "0.7.77",
"sequence": 156,
"host_api": 33
"version": "0.7.86",
"sequence": 165,
"host_api": 36
},
"wurm": {
"id": "xyz.waozi.wurm",
"title": "Apfelwurm",
"version": "0.1.4",
"sequence": 3,
"version": "0.1.8",
"sequence": 6,
"host_api": 12
}
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 368 KiB

After

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 376 KiB

After

Width:  |  Height:  |  Size: 1.8 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 345 KiB

After

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 516 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 332 KiB

After

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 561 KiB

After

Width:  |  Height:  |  Size: 2.6 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 497 KiB

After

Width:  |  Height:  |  Size: 2.9 MiB

+3
View File
@@ -50,6 +50,9 @@ Unknown languages fall back to the game's English text.
Arcade and Inbe still provide separate local/account storage. Sharing one
game implementation does not silently merge or migrate their saved games.
Host API 36 adds read-only records explicitly exported to verified direct
dependencies. Shovey exports its local campaign so Editor can display device
unlocks alongside account progress without uploading device-only progress.
## Updates and publication gate
+2 -1
View File
@@ -47,7 +47,8 @@ android {
'-DZIRAN_DIR=' + ziranDir,
'-DRAYLIB_DIR=' + raylibDir,
'-DAPP_CODEGEN=' + appCodegen,
'-DSHOVEY_STANDALONE=' + (standaloneShovey ? 'ON' : 'OFF')
'-DSHOVEY_STANDALONE=' + (standaloneShovey ? 'ON' : 'OFF'),
'-DGOOGLE_PLAY=' + (project.findProperty('app.googlePlay') == 'true' ? 'ON' : 'OFF')
}
}
}
+3
View File
@@ -26,6 +26,9 @@ set(APP_ZIRAN_DEFINES --define ANDROID_BUILD)
if(SHOVEY_STANDALONE)
list(APPEND APP_ZIRAN_DEFINES --define SHOVEY_STANDALONE)
endif()
if(GOOGLE_PLAY)
list(APPEND APP_ZIRAN_DEFINES --define GOOGLE_PLAY)
endif()
if(NOT DEFINED APP_CODEGEN)
set(APP_CODEGEN c99)
endif()
+1
View File
@@ -49,6 +49,7 @@ def main():
LIBOQS_DIR=str(package('liboqs')), MONOCYPHER_DIR=str(package('monocypher')))
command = ['sh', str(ROOT / 'droid/gradlew'), '-p', str(ROOT / 'droid'), '--no-daemon', '--max-workers=2',
'-Papp.product=shovey', '-Papp.abis=' + args.abis,
'-Papp.googlePlay=' + ('true' if args.bundle else 'false'),
'-Pkryon.dir=' + str(package('kryon')), '-Pziran.dir=' + str(package('ziran')),
'-Praylib.dir=' + str(package('raylib') / 'src'),
'-Papp.versionName=' + metadata['version'], '-Papp.versionCode=' + str(release['sequence']),
+46 -12
View File
@@ -22,9 +22,8 @@ def digest(path):
def library_art(root, name, key, source):
"""Arcade's committed small copy of a game's art (scripts/library-art.py).
The library shows art, the games download separately: never pack the
packages' full-size images, and never pack a copy of outdated art."""
"""Arcade's committed library art (scripts/library-art.py): original title
screens and logos, small previews. Never pack a copy of outdated art."""
library = Path(root) / "assets/arcade/library"
sources = json.loads((library / "sources.json").read_text())
copy = f"{name}-{key}"
@@ -86,6 +85,11 @@ def stage(root, controller, expected_controller_digest, output):
bytes=len(bundle_bytes),
preview=f"assets/arcade/previews/{name}.png",
icon=f"assets/arcade/previews/{name}.png")
# A thin add-on links its required games' verified code as libraries.
if app.get('shared_code'):
child['shared_code'] = True
if app.get('shared_records'):
child['shared_records'] = app['shared_records']
if app.get('requires'):
shared = json.loads((root / 'build/games' / (name + '-resources.json')).read_text())
if shared['dependencies'] != app['requires']:
@@ -135,11 +139,14 @@ def stage(root, controller, expected_controller_digest, output):
return catalog, packages[1:]
def stage_downloads(catalog, source, output, games):
"""Keep Arcade's catalog and art together; serve each game separately.
def stage_downloads(catalog, source, output, games, art):
"""Keep only Arcade's catalog; serve each game and the library art separately.
The full staging directory is also used by standalone players, which
keep their bundled games. Validate every game before replacing outputs.
The published Arcade is a launcher: the host supplies the shared Apps
controller, and the games' covers and previews go to ART for one separate
download. The full staging directory is also used by standalone players,
which keep their bundled games, art and controller. Validate every game
before replacing outputs.
"""
payloads = {}
for child in catalog["children"]:
@@ -147,17 +154,38 @@ def stage_downloads(catalog, source, output, games):
if hashlib.sha256(data).hexdigest() != child["sha256"]:
raise ValueError("Game differs from the collection's declared digest")
payloads[child["sha256"]] = data
for directory in (output, games):
for directory in (output, games, art):
if directory.exists():
shutil.rmtree(directory)
shutil.copytree(source, output)
games.mkdir(parents=True)
(output / catalog["harness"]).unlink()
for child in catalog["children"]:
(output / child["bundle"]).unlink()
pictures = [child["preview"]] + [path for key, path in child.get("cover", {}).items()
if key in ("portrait", "landscape", "logo")]
for relative in pictures:
if not (output / relative).exists():
continue
destination = art / relative
destination.parent.mkdir(parents=True, exist_ok=True)
shutil.move(output / relative, destination)
for digest, data in payloads.items():
(games / (digest + ".zx")).write_bytes(data)
def add_art(output, games, art_bundle):
"""Publish the art bundle beside the games and name it in the catalog."""
data = art_bundle.read_bytes()
digest = hashlib.sha256(data).hexdigest()
(games / (digest + ".zx")).write_bytes(data)
path = output / "assets/apps/catalog.json"
catalog = json.loads(path.read_text())
catalog["art"] = dict(sha256=digest, bytes=len(data))
path.write_text(json.dumps(catalog, indent=2) + "\n")
return catalog["art"]
def archive_downloads(games, archive):
"""The release asset contains only the immutable game payloads."""
with tarfile.open(archive, "w") as output:
@@ -217,18 +245,24 @@ def main():
sha256=digest(ROOT / f"build/{name}.zx"), apps_sha256=args.apps_sha256,
children=children, source_mode="project")
(ROOT / f"build/{name}.json").write_text(json.dumps(metadata, indent=2) + "\n")
# Arcade carries the catalog and artwork. Standalone players keep their
# offline games; Arcade downloads exactly the game the person selects.
# Arcade carries only its catalog. Standalone players keep their offline
# games; Arcade downloads the library art once and exactly the game the
# person selects.
node_apps = ROOT / "build/node-apps"
catalog_assets = node_apps / "arcade-catalog"
game_downloads = node_apps / "arcade.games"
stage_downloads(catalog, output, catalog_assets, game_downloads)
art_assets = node_apps / "arcade-art"
stage_downloads(catalog, output, catalog_assets, game_downloads, art_assets)
bundle("art.zi", "art:Main", art_assets / "assets", node_apps / "arcade-art.zx")
art = add_art(catalog_assets, game_downloads, node_apps / "arcade-art.zx")
archive_downloads(game_downloads, node_apps / "arcade.games.tar")
bundle("collection.zi", "collection:Main", catalog_assets / "assets", node_apps / "arcade.zx")
shutil.copyfile(node_apps / "arcade.zx", ROOT / "build/arcade.zx")
# The desktop host supplies its controller from beside the collection.
shutil.copyfile(args.apps_bundle, ROOT / "build/apps.zx")
receipt = dict(id=catalog["id"], version=(ROOT / "VERSION").read_text().strip(),
sha256=digest(ROOT / "build/arcade.zx"),
apps_sha256=args.apps_sha256, children=catalog["children"],
apps_sha256=args.apps_sha256, children=catalog["children"], art=art,
source_mode="project")
(output / "receipt.json").write_text(json.dumps(receipt, indent=2) + "\n")
(ROOT / "build/arcade.json").write_text(json.dumps(receipt, indent=2) + "\n")
+13 -4
View File
@@ -11,6 +11,18 @@ ROOT = Path(__file__).resolve().parents[1]
ZIRAN = str(ROOT / 'scripts/ziran.sh')
def stage_startup_art(source, output):
"""Draw small full-colour images before the collection's originals load."""
from PIL import Image
startup = output / 'startup/shovey'
startup.mkdir(parents=True, exist_ok=True)
for name, edge in [('title-portrait.png', 640), ('title-landscape.png', 640), ('logo.png', 512)]:
with Image.open(source / 'assets/shovey' / name) as original:
image = original.convert('RGBA' if 'A' in original.getbands() else 'RGB')
image.thumbnail((edge, edge), Image.Resampling.LANCZOS)
image.save(startup / name, optimize=True)
def main():
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--output', type=Path)
@@ -59,10 +71,7 @@ def main():
if args.standalone_shovey:
from PIL import Image
source = Path(subprocess.check_output([ZIRAN, 'pkg', 'path', 'shovey', *lock], cwd=ROOT, text=True).strip())
startup = output.parent / 'startup/shovey'
startup.mkdir(parents=True, exist_ok=True)
for name in ('title-portrait.png', 'title-landscape.png', 'logo.png'):
shutil.copyfile(source / 'assets/shovey' / name, startup / name)
stage_startup_art(source, output.parent)
Image.open(source / 'assets/branding/shovey-icon.png').resize((256, 256), Image.Resampling.LANCZOS).save(output.parent / 'shovey-icon.png')
print(('Shovey' if args.standalone_shovey else 'Arcade') + ' native build passed')
+9 -1
View File
@@ -4,7 +4,8 @@
The page runs a collection, by default this checkout's build/node-apps/arcade.zx;
the website passes the published one Inner Breeze downloads. Arcade's own host
is compiled to WebAssembly with the account Profile. The receipt names the
collection's digest and the Apps library it trusts.
collection's digest and the Apps library it trusts. Arcade's own copy of that
library goes beside it for collections that do not pack one.
"""
import argparse
import hashlib
@@ -30,6 +31,7 @@ def main():
parser.add_argument('--controller-sha256', default=(ROOT / 'apps-controller.sha256').read_text().strip())
parser.add_argument('--version', default=(ROOT / 'VERSION').read_text().strip())
parser.add_argument('--profile', type=Path, default=ROOT / 'build/entity.zx')
parser.add_argument('--controller', type=Path, default=ROOT / 'build/apps-ui/apps.zx')
parser.add_argument('--output', type=Path, default=ROOT / 'build/web-site')
args = parser.parse_args()
bundle = args.bundle.resolve()
@@ -50,6 +52,12 @@ def main():
for name in ('runtime.js', 'runtime.wasm', 'runtime.data'):
shutil.copyfile(work / name, output / name)
(output / 'arcade.json').write_text(json.dumps(receipt, indent=2) + '\n')
# Only the library the receipt trusts; the host refuses any other.
controller = args.controller.read_bytes() if args.controller.is_file() else b''
if hashlib.sha256(controller).hexdigest() == args.controller_sha256:
(output / 'apps.zx').write_bytes(controller)
else:
print('No matching Apps controller beside the collection; it must pack its own')
print(f'Arcade {args.version} for the browser in {output}')
+2 -4
View File
@@ -68,7 +68,6 @@ def pin():
if write_lock(lock) != lock_path.read_text():
raise SystemExit('ziran.lock is not in the layout ziran lock writes')
names = json.loads((ROOT / 'games.json').read_text())['packages']
ledger = json.loads((ROOT / 'apps/versions.json').read_text())['node_apps']
updates = []
for name in names:
old_id = lock['root']['dependencies'][name]
@@ -78,9 +77,8 @@ def pin():
commit = gh('api', f'repos/{repo}/commits/{tag}', '--jq', '.sha')
if commit == entry['commit']:
continue
# A later tag of the version Arcade already ships is not a new release.
if name in ledger and ledger[name]['version'] == tag.removeprefix('v'):
continue
# Release metadata can be recorded before the game is published.
# The pinned source must still advance to that release's commit.
# Never move back: the release must contain the pinned commit.
status = gh('api', f'repos/{repo}/compare/{entry["commit"]}...{commit}', '--jq', '.status')
if status != 'ahead':
+7 -1
View File
@@ -9,7 +9,7 @@ import re
from pathlib import Path
import subprocess
APP_KEYS = {'manifest', 'cover', 'enabled', 'requires', 'shared_code', 'library_entries'}
APP_KEYS = {'manifest', 'cover', 'enabled', 'requires', 'shared_code', 'library_entries', 'shared_records'}
COVER_KEYS = {'portrait', 'landscape', 'logo', 'caption', 'action'}
@@ -50,6 +50,11 @@ def declared_packages(root, ziran=None, lock_flags=()):
shared_code = app.get('shared_code', False)
if type(shared_code) is not bool or (shared_code and not requires):
raise ValueError(f'{name}: shared code needs declared dependencies')
shared_records = app.get('shared_records', [])
if not isinstance(shared_records, list) or len(shared_records) > 8 or any(
not isinstance(item, str) or not re.fullmatch(r'[A-Za-z0-9_.-]{1,63}', item) or
item in ('.', '..') for item in shared_records) or len(set(shared_records)) != len(shared_records):
raise ValueError(f'{name}: invalid shared records')
library_entries = app.get('library_entries', [])
if not isinstance(library_entries, list) or len(library_entries) > 64 or \
any(not isinstance(item, str) or len(item) > 253 or
@@ -59,6 +64,7 @@ def declared_packages(root, ziran=None, lock_flags=()):
apps.append(dict(package=name, source=source, manifest=manifest,
descriptor=json.loads(manifest.read_text()),
cover=app.get('cover'), requires=requires, shared_code=shared_code,
shared_records=shared_records,
library_entries=library_entries, enabled=app.get('enabled', True)))
packages.append(dict(name=name, source=source, id=declaration['id'],
title=declaration['title'], apps=apps))
+9 -9
View File
@@ -1,10 +1,9 @@
#!/usr/bin/env python3
"""Make Arcade's small copies of each game's cover and preview art.
"""Stage each game's original title art and small library previews.
Game packages keep their full-size art for their own players and stores.
Arcade only shows that art in its library, so it packs copies sized for the
screen with a 256-colour palette: about a fifth of the bytes, with no visible
change. Arcade stays a small launcher; the games download separately.
Title screens and logos retain their original bytes, resolution, colours and
transparency. Only small library previews are resized and palette limited.
Arcade downloads the art separately from its small launcher.
The copies and sources.json, which records the SHA-256 of the art each copy
was made from, are committed. The collection build uses them as they are,
@@ -20,15 +19,16 @@ from game_packages import declared_packages
ROOT = Path(__file__).resolve().parents[1]
LIBRARY = ROOT / 'assets/arcade/library'
# Longest side: covers fill the library's screen, logos sit on them and
# previews are small tiles and icons.
LONGEST = {'portrait': 1280, 'landscape': 1280, 'logo': 800, 'preview': 480}
# Previews are small tiles and icons; full-screen artwork keeps its source.
PREVIEW_LONGEST = 480
def small_copy(data, key):
if key != 'preview':
return data
image = Image.open(io.BytesIO(data))
image.load()
scale = min(1.0, LONGEST[key] / max(image.size))
scale = min(1.0, PREVIEW_LONGEST / max(image.size))
if scale < 1.0:
size = (round(image.width * scale), round(image.height * scale))
image = image.convert('RGBA' if 'A' in image.getbands() else 'RGB').resize(size, Image.Resampling.LANCZOS)
+15 -6
View File
@@ -56,12 +56,21 @@
onAbort: failed,
onExit: function (code) { if (code !== 0) failed(); }
};
// The build receipt names the collection's digest and its trusted Apps library.
fetch('arcade.json', { cache: 'no-cache' }).then(function (response) {
if (!response.ok) throw new Error(response.status);
return response.text();
}).then(function (receipt) {
Module.arcadeReceipt = receipt;
// The build receipt names the collection's digest and its trusted Apps
// library; Arcade's own copy of that library goes in beside it.
Promise.all([
fetch('arcade.json', { cache: 'no-cache' }).then(function (response) {
if (!response.ok) throw new Error(response.status);
return response.text();
}),
fetch('apps.zx').then(function (response) {
return response.ok ? response.arrayBuffer() : null;
})
]).then(function (loaded) {
Module.arcadeReceipt = loaded[0];
if (loaded[1]) {
Module.preRun = [function () { FS.writeFile('/apps.zx', new Uint8Array(loaded[1])); }];
}
var script = document.createElement('script');
script.src = 'runtime.js';
script.onerror = failed;
+3
View File
@@ -19,6 +19,9 @@ ARCADE_BACK_KEY :: 4
arcade_state: s32;
ArcadeStart :: () -> bool {
// Later animation pictures load asynchronously too. Keep the last
// complete frame visible while a new sprite is being decoded.
RaylibCompletePictureFrames(true)
// Android before 10 cannot name its system font; the APK carries the
// same font as the Windows build, so text never falls back to raylib's
// bitmap font.
+4
View File
@@ -0,0 +1,4 @@
// Arcade's library art: the games' covers, logos and previews, downloaded
// beside the games. The Apps host only reads its assets; it never runs.
#program_export
Main :: () -> s32 { return 0 }
+71 -3
View File
@@ -21,6 +21,7 @@
#import "kryon/button_widget"
#import "kryon/button_props"
#import "kryon/hosted_values"
#import "kryon/hosted_app"
#import "kryon/widget_host"
#import "kryon/app_files"
#import "kryon/app_protocol"
@@ -43,6 +44,9 @@ Codec :: #import "apps/node_codec";
#import "entity/entity_records"
#import "entity/entity_dew"
#import "kryon/widget_palette"
#import "kryon/image_raster"
#import "kryon/loading_indicator"
#import, file "collection_loading.zi";
#import "shovey/shovey_theme"
ProfileIcon :: #import "mingcute/mingcute_regular_user_4";
DewIcon :: #import "mingcute/mingcute_filled_drop";
@@ -78,6 +82,8 @@ collection_shared_codec: Codec.WidgetAppSharedCodec;
collection_item_codec: Codec.WidgetAppSharedItemCodec;
collection_invitation_codec: Codec.WidgetAppInvitationCodec;
collection_ready: bool;
collection_loading: CollectionLoading;
collection_pictures_missing: bool;
collection_leave_to_library: bool;
// Whether games download new levels when they come out: asked once on the
// covers and passed to the games as arcade.updates. -1 unread, 0 off, 1 on,
@@ -275,14 +281,15 @@ CollectionCall :: (context: *void, node: *AppNode, module: *u8, function: *u8,
}
CollectionAssetAllowed :: (path: string) -> bool {
return path == "" || (collection_widget_node != null && AppHostAsset(collection_widget_node, path).found)
return path == "" || (collection_widget_node != null && (AppHostAsset(collection_widget_node, path).found ||
AppHostAssetPending(collection_widget_node, path)))
}
CollectionAssetPath :: (path: string) -> string {
if path == "" { return "" }
if collection_widget_node == null { return "" }
asset := AppHostAsset(collection_widget_node, path)
if !asset.found { return "" }
if !asset.found { collection_pictures_missing = true; return "" }
relative := Join(TextUntilNul(collection_widget_node.entry.sha256[:]), path)
defer { AppFileFree(relative) }
cached := collection_images
@@ -378,6 +385,18 @@ CollectionEffect :: (context: *void, account: string, locator: *AppLocator,
return true
}
// Arcade's own copy of the shared Apps controller. A collection that does not
// pack one uses it; the Apps host accepts it only by the trusted digest.
collection_controller: string;
CollectionController :: (context: *void) -> HostedAsset {
unused context
controller: HostedAsset
controller.data = collection_controller
controller.found = collection_controller.count > 0
return controller
}
CollectionOpen :: (bundle: string, digest: string, harness_digest: string,
data: string, locale: string) -> bool {
if collection_ready { return false }
@@ -390,7 +409,8 @@ CollectionOpen :: (bundle: string, digest: string, harness_digest: string,
.widgets = CollectionWidgets, .save = CollectionSave, .state = CollectionState,
.effect = CollectionEffect,
.bundle = CollectionBundle, .download = CollectionDownload, .fetch = CollectionFetch,
.presentation = AppPresentation.{.cover_grid = true}}
// Covers show only the art; the download dialog names the size.
.controller = CollectionController, .presentation = AppPresentation.{.cover_grid = true, .hide_sizes = true}}
collection_ready = AppHostStart(*collection_host, bundle, "arcade.local", "inbe.arcade",
"arcade", digest, "local", platform, harness_digest, locale)
if !collection_ready { Report("Arcade: the shared Apps host refused the collection") }
@@ -398,6 +418,11 @@ CollectionOpen :: (bundle: string, digest: string, harness_digest: string,
}
CollectionOpenFiles :: (directory: string, data: string) -> bool {
// The installed controller beside the collection; kept while Arcade runs.
controller_path := Join(directory, "apps.zx")
controller, controller_found := ReadEntireFile(controller_path)
AppFileFree(controller_path)
if controller_found { collection_controller = controller } else { AppFileFree(controller) }
bundle_path := Join(directory, "arcade.zx")
metadata_path := Join(directory, "arcade.json")
defer { AppFileFree(bundle_path); AppFileFree(metadata_path) }
@@ -482,6 +507,7 @@ CollectionClose :: () -> bool {
if !EntityClose() { return false }
if collection_ready && !AppHostStop(*collection_host) { return false }
collection_ready = false
collection_loading = .{}
CollectionDownloadsClose()
CollectionCollect()
VecFree(collection_frame_paths)
@@ -504,9 +530,19 @@ CollectionClose :: () -> bool {
AppFilesClose(*collection_resources)
AppFileFree(collection_resource_root)
collection_resource_root = ""
AppFileFree(collection_controller)
collection_controller = ""
return true
}
CollectionPending :: (request: s64) -> bool {
for index: cast(s64)0..collection_host.tree.pending.count - 1 {
pending := collection_host.tree.pending[index]
if pending.reply.request == request { return !pending.complete }
}
return false
}
CollectionOpenGame :: (id: string) -> bool {
root := AppTreeNode(*collection_host.tree, collection_host.tree.active)
if root == null || !root.collection { Report("Arcade: no collection is open to start "); Report(id); Report("\n"); return false }
@@ -526,6 +562,12 @@ CollectionOpenGame :: (id: string) -> bool {
return false
}
if !AppTreeDrain(*collection_host.tree) { Report("Arcade: the apps host stopped while starting "); Report(id); Report("\n"); return false }
// Games that share code are verified in the background; wait for it.
started := MonotonicMilliseconds()
while CollectionPending(queued.request) && MonotonicMilliseconds() - started < 60000 {
unused SleepMilliseconds(5)
if !AppTreeDrain(*collection_host.tree) { Report("Arcade: the apps host stopped while starting "); Report(id); Report("\n"); return false }
}
for index: cast(s64)0..collection_host.tree.pending.count - 1 {
reply := collection_host.tree.pending[index].reply
if reply.request == queued.request && reply.status == APPS_REJECTED {
@@ -607,6 +649,10 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
if entity_visible { return EntityFrame(session, viewport, key, modifiers) }
runtime := AppHostActiveRuntime(*collection_host)
if runtime == null { Report("Arcade: no app is running\n"); return false }
opening := !runtime.node.collection && (!collection_loading.shown ||
collection_loading.slot != collection_host.tree.active.slot ||
collection_loading.generation != collection_host.tree.active.generation)
if opening { key = 0 }
nested := runtime.node.parent.generation != 0 && !runtime.node.collection
// An app opened from its cover fills the screen with its own navigation.
// Other apps get a bar with Back and their title; the library and that
@@ -643,6 +689,7 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
.scale = 1.0, .font = 16, .now = now}
}
WidgetHostBegin(session, CollectionAssetAllowed, CollectionAssetPath)
collection_pictures_missing = false
drawn := AppHostRun(*collection_host, APP_FRAME)
WidgetHostEnd()
if !drawn {
@@ -654,6 +701,27 @@ CollectionFrame :: (session: Session, viewport: Rectangle, key: s32, modifiers:
unused AppHostBack(*collection_host)
return true
}
if opening {
pictures_ready := !collection_pictures_missing
// Query every path, including those first requested by this frame's
// TileMap. Android decodes them asynchronously on its render thread.
for path: collection_frame_paths {
if AssetWidth(path) < 0 { pictures_ready = false }
}
if CollectionNeedsCover(*collection_loading, collection_host.tree.active.slot,
collection_host.tree.active.generation, pictures_ready) {
collection_toolbar_visible = false
Box(session, BoxProps.{.key = cast(u64)49400, .bounds = viewport,
.fill = ColorFromPacked(ifx entity_shovey then ShoveyPalette().background else AppCoversPalette().background)})
unused Button(session, ButtonProps.{.key = cast(u64)49401, .id = 49401,
.bounds = viewport, .invisible = true})
LoadingIndicator(session, LoadingIndicatorProps.{.key = cast(u64)49402,
.bounds = viewport, .now = now, .scale = 1.5})
return true
}
} else if runtime.node.collection {
collection_loading = .{}
}
if asking {
unused WidgetPaletteUse(session, ifx entity_shovey then ShoveyPalette() else AppCoversPalette())
CollectionUpdatesQuestion(session, viewport)
+21
View File
@@ -0,0 +1,21 @@
// A newly opened game stays covered until two complete picture frames have
// composed. Images can be requested after the first apparently ready frame.
CollectionLoading :: struct {
generation: s64
slot: s64
ready_frame: bool
shown: bool
}
CollectionNeedsCover :: (state: *CollectionLoading, slot: s64, generation: s64,
pictures_ready: bool) -> bool {
if state.slot != slot || state.generation != generation {
state.* = CollectionLoading.{.slot = slot, .generation = generation}
return true
}
if state.shown { return false }
if !pictures_ready { state.ready_frame = false; return true }
if !state.ready_frame { state.ready_frame = true; return true }
state.shown = true
return false
}
+2
View File
@@ -18,6 +18,8 @@
sdl :: #system_library "SDL2";
SetTitle :: (window: *void, title: *u8) #foreign sdl "SDL_SetWindowTitle";
// First show small RGB/RGBA previews. The collection replaces them with its
// original artwork when ready, using the same layout and coloured logo.
DrawStartup :: (session: Session, directory: string, standalone: bool = true) -> bool {
if !PollDesktop() || WindowTakeCloseRequestHost() { return false }
BeginDesktopFrame()
+3
View File
@@ -43,6 +43,9 @@ EntityShoveyTokens :: () {
EntityOpen :: (bytes: string, data: string, shovey: bool = false) -> bool {
entity_shovey = shovey
#if #defined(GOOGLE_PLAY) {
EntityHostAllowFunding(false)
}
if shovey { EntityShoveyTokens() }
root := Join(data, "entity")
defer { EntityFree(root) }
+3
View File
@@ -75,6 +75,9 @@ main :: () -> s32 {
profile, profile_found := ReadEntireFile("/entity.zx")
defer { AppFileFree(bytes) }
receipt := ArcadeReceipt()
// The page writes Arcade's own Apps controller beside the collection.
controller, controller_found := ReadEntireFile("/apps.zx")
if controller_found { collection_controller = controller } else { AppFileFree(controller) }
if !found || !profile_found || receipt == "" || !CollectionOpenBytes(bytes, receipt, data) { return 1 }
if !EntityOpen(profile, data) { unused CollectionClose(); return 1 }
session := SessionOpen()
+21
View File
@@ -0,0 +1,21 @@
#import, file "../src/collection_loading.zi";
#program_export
Check :: () -> s32 {
state: CollectionLoading
if !CollectionNeedsCover(*state, 1, 1, true) { return 1 }
if !CollectionNeedsCover(*state, 1, 1, true) { return 2 }
// A later request invalidates the apparently ready frame.
if !CollectionNeedsCover(*state, 1, 1, false) { return 3 }
if !CollectionNeedsCover(*state, 1, 1, false) { return 4 }
if !CollectionNeedsCover(*state, 1, 1, true) { return 5 }
if CollectionNeedsCover(*state, 1, 1, true) { return 6 }
// Gameplay never returns to its opening cover for an animation sprite.
if CollectionNeedsCover(*state, 1, 1, false) { return 7 }
// A new game or a reopened slot gets its own loading stage.
if !CollectionNeedsCover(*state, 2, 1, true) { return 8 }
if !CollectionNeedsCover(*state, 2, 1, true) { return 9 }
if CollectionNeedsCover(*state, 2, 1, true) { return 10 }
if !CollectionNeedsCover(*state, 2, 2, true) { return 11 }
return 42
}
+10
View File
@@ -0,0 +1,10 @@
#!/bin/sh
set -eu
root=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd)
cd "$root"
mkdir -p build/collection-loading-test
./scripts/ziran.sh bundle --project --root "$root" \
--entry collection_loading_behavior:Check \
-o build/collection-loading-test/test.zx tests/collection_loading_behavior.zi
test "$(./scripts/ziran.sh run build/collection-loading-test/test.zx)" = 42
echo 'Local collection loading test: late image requests, consecutive ready frames and navigation'
+47 -12
View File
@@ -15,6 +15,9 @@ sys.path.insert(0, str(ROOT / "scripts"))
spec = importlib.util.spec_from_file_location("build_collection", ROOT / "scripts/build-collection.py")
builder = importlib.util.module_from_spec(spec)
spec.loader.exec_module(builder)
art_spec = importlib.util.spec_from_file_location("library_art", ROOT / "scripts/library-art.py")
artist = importlib.util.module_from_spec(art_spec)
art_spec.loader.exec_module(artist)
class CollectionTests(unittest.TestCase):
@@ -88,6 +91,22 @@ class CollectionTests(unittest.TestCase):
with self.assertRaisesRegex(ValueError, "wurm-portrait art changed"):
self.stage()
def test_title_screens_keep_original_resolution_colours_and_transparency(self):
catalog, packages = builder.stage(self.root, self.controller, self.controller_digest, self.output)
children = {child['id']: child for child in catalog['children']}
for package in packages:
for app in package['apps']:
if not app['enabled'] or not app['cover']:
continue
child = children[app['descriptor']['id']]
for key in ('portrait', 'landscape', 'logo'):
if key not in app['cover']:
continue
original = (app['source'] / app['cover'][key]).read_bytes()
with self.subTest(app=child['id'], image=key):
self.assertEqual(artist.small_copy(original, key), original)
self.assertEqual((self.output / child['cover'][key]).read_bytes(), original)
def test_editor_download_reuses_verified_shovey_assets(self):
catalog = self.stage()
children = {child['id']: child for child in catalog['children']}
@@ -124,29 +143,45 @@ class CollectionTests(unittest.TestCase):
catalog = self.stage()
small = self.root / "small"
games = self.root / "arcade.games"
builder.stage_downloads(catalog, self.output, small, games)
builder.stage_downloads(catalog, self.output, small, games, self.root / "art")
art = self.root / "art"
self.assertEqual((small / "assets/apps/catalog.json").read_bytes(),
(self.output / "assets/apps/catalog.json").read_bytes())
self.assertEqual((small / catalog["harness"]).read_bytes(), self.controller.read_bytes())
# The published launcher packs neither the host's controller nor art.
self.assertFalse((small / catalog["harness"]).exists())
self.assertTrue((self.output / catalog["harness"]).is_file(), "Standalone players keep the controller")
for child in catalog["children"]:
full = self.output / child["bundle"]
self.assertTrue(full.is_file(), "Standalone players retain the game")
self.assertFalse((small / child["bundle"]).exists())
self.assertEqual((games / (child["sha256"] + ".zx")).read_bytes(), full.read_bytes())
self.assertEqual((small / child["preview"]).read_bytes(),
(self.output / child["preview"]).read_bytes())
for key in child["cover"].keys() & {"portrait", "landscape", "logo"}:
relative = child["cover"][key]
self.assertEqual((small / relative).read_bytes(), (self.output / relative).read_bytes())
pictures = [child["preview"]] + [child["cover"][key] for key in child["cover"].keys() & {"portrait", "landscape", "logo"}]
for relative in pictures:
self.assertFalse((small / relative).exists())
self.assertEqual((art / relative).read_bytes(), (self.output / relative).read_bytes())
packed = sum(path.stat().st_size for path in small.rglob("*") if path.is_file())
self.assertLess(packed, 1024 * 1024, "Arcade itself stays under one megabyte")
def test_art_bundle_is_published_and_named_by_the_catalog(self):
catalog = self.stage()
small = self.root / "small"
games = self.root / "arcade.games"
builder.stage_downloads(catalog, self.output, small, games, self.root / "art")
art_bundle = self.root / "art.zx"
art_bundle.write_bytes(b"ZX\0\0art fixture")
art = builder.add_art(small, games, art_bundle)
self.assertEqual(art, dict(sha256=builder.digest(art_bundle), bytes=art_bundle.stat().st_size))
self.assertEqual((games / (art["sha256"] + ".zx")).read_bytes(), art_bundle.read_bytes())
self.assertEqual(json.loads((small / "assets/apps/catalog.json").read_text())["art"], art)
def test_changed_download_preserves_previous_outputs(self):
catalog = self.stage()
small = self.root / "small"
games = self.root / "arcade.games"
builder.stage_downloads(catalog, self.output, small, games)
builder.stage_downloads(catalog, self.output, small, games, self.root / "art")
(self.output / catalog["children"][0]["bundle"]).write_bytes(b"changed game")
with self.assertRaisesRegex(ValueError, "declared digest"):
builder.stage_downloads(catalog, self.output, small, games)
builder.stage_downloads(catalog, self.output, small, games, self.root / "art")
self.assertTrue((small / "assets/apps/catalog.json").exists())
self.assertTrue((games / (catalog["children"][0]["sha256"] + ".zx")).exists())
@@ -154,7 +189,7 @@ class CollectionTests(unittest.TestCase):
catalog = self.stage()
small = self.root / "small"
games = self.root / "arcade.games"
builder.stage_downloads(catalog, self.output, small, games)
builder.stage_downloads(catalog, self.output, small, games, self.root / "art")
archive = self.root / "arcade.games.tar"
builder.archive_downloads(games, archive)
with tarfile.open(archive) as content:
@@ -168,12 +203,12 @@ class CollectionTests(unittest.TestCase):
catalog = self.stage()
small = self.root / "small"
games = self.root / "arcade.games"
builder.stage_downloads(catalog, self.output, small, games)
builder.stage_downloads(catalog, self.output, small, games, self.root / "art")
catalog["children"] = []
# Build a fresh full stage as a real removed registration does.
(self.root / "games.json").write_text(json.dumps({"packages": []}))
catalog = self.stage()
builder.stage_downloads(catalog, self.output, small, games)
builder.stage_downloads(catalog, self.output, small, games, self.root / "art")
self.assertEqual(list(games.iterdir()), [])
self.assertFalse((small / "assets/arcade/games/shovey.zx").exists())
+30 -17
View File
@@ -51,12 +51,14 @@ def package_server(root):
def do_GET(self):
digest = self.path.removeprefix('/api/v2/packages/inbe.arcade/').removesuffix('.zx')
state['requests'].append(digest)
if state['offline'] or digest not in by_digest:
# Every published file: the games and the library art.
published = root / 'build/node-apps/arcade.games' / (digest + '.zx')
if state['offline'] or not published.is_file():
self.send_error(503)
return
entry = by_digest[digest]
data = (root / 'build/node-apps/arcade.games' / (digest + '.zx')).read_bytes()
if (state['corrupt_wurm'] and entry['expected_id'] == 'wurm') or (state['corrupt_shovey'] and entry['expected_id'] == 'shovey'):
entry = by_digest.get(digest, {})
data = published.read_bytes()
if (state['corrupt_wurm'] and entry.get('expected_id') == 'wurm') or (state['corrupt_shovey'] and entry.get('expected_id') == 'shovey'):
data = data[:-1] + bytes([data[-1] ^ 1])
self.send_response(200)
self.send_header('Content-Length', str(len(data)))
@@ -83,6 +85,8 @@ def main():
root = Path(__file__).resolve().parents[1]
entries = json.loads((root / 'build/arcade.json').read_text())['children']
by_name = {entry['expected_id']: entry for entry in entries}
# The library art downloads with Arcade; games only after consent.
games = {entry['sha256'] for entry in entries}
def size_text(size):
return f"{(size * 10 + 500000) // 1000000 / 10:.1f} MB"
sizes = {name: size_text(entry['bytes']) for name, entry in by_name.items()}
@@ -127,7 +131,7 @@ def main():
assert int(subprocess.check_output(["xdotool", "getwindowpid", window], text=True, timeout=10)) == child.pid
subprocess.run(["import", "-window", window, str(output / (name + ".png"))], check=True, timeout=10)
def grid(child, name):
def grid(child, name, phone=False):
driver.wait_idle(frames=20)
driver.wait(label="Arcade", role="text")
assert not driver.find(label="Chess"), "Chess is temporarily disabled"
@@ -137,14 +141,21 @@ def main():
editor_card = driver.wait(label="Shovey Editor", role="button")
assert classic_card['y'] == editor_card['y'], "Apps must share a grid row"
assert classic_card['x'] != editor_card['x']
assert classic_card['width'] >= 200 and classic_card['height'] >= 350
if phone:
# Phones show small covers, two or three a row.
wurm_card = driver.wait(label='Apfelwurm', role='button')
assert wurm_card['y'] == classic_card['y'], 'A phone row holds all three covers'
assert 100 <= classic_card['width'] < 200, 'Phone covers must be small cards'
else:
assert classic_card['width'] >= 200 and classic_card['height'] >= 350
assert not driver.find(label='Play', role='button')
assert not driver.find(label='Open', role='button')
for label in ('Shovey', 'Shovey Editor', 'Apfelwurm'):
assert not driver.find(label=label, role='text'), 'Title artwork must not repeat its name underneath'
driver.wait(label='Apfelwurm', role='button', visible=False)
smallest = (100, 140) if phone else (180, 200)
covers = [node for node in driver.find(role='image', visible=True)
if node['width'] >= 180 and node['height'] >= 200]
if node['width'] >= smallest[0] and node['height'] >= smallest[1]]
assert len(covers) >= 2, "Apps must use large title-screen artwork"
capture(child, name)
with Image.open(output / (name + ".png")) as image:
@@ -168,7 +179,7 @@ def main():
driver.wait(label='Download size: ' + total, role='text')
capture(child, 'editor-download-plan')
driver.press(label='Cancel', role='button')
assert server['requests'] == [], 'Dependency consent must precede every download'
assert not games & set(server['requests']), 'Dependency consent must precede every download'
driver.press(label='Shovey Editor', role='button')
server['corrupt_shovey'] = True
primary_download()
@@ -180,7 +191,7 @@ def main():
capture(child, 'editor-shared-assets')
assert server['requests'].count(by_name['shovey']['sha256']) == 2
assert server['requests'].count(by_name['shovey-editor']['sha256']) == 1
assert len(server['requests']) == 3, 'Retry must reuse the already downloaded editor'
assert len([digest for digest in server['requests'] if digest in games]) == 3, 'Retry must reuse the already downloaded editor'
assert by_name['shovey-editor']['bytes'] < by_name['shovey']['bytes'], 'The editor must carry only its additions'
server['requests'].clear()
# Disabling an entry must leave a person's older Chess save untouched.
@@ -204,21 +215,22 @@ def main():
answer_library_question(driver)
window = subprocess.check_output(['xdotool', 'search', '--onlyvisible', '--pid', str(child.pid)], text=True).splitlines()[0]
subprocess.run(['xdotool', 'windowsize', window, '480', '820'], check=True)
grid(child, "apps-portrait")
assert server['requests'] == [], 'Covers must not predownload games'
grid(child, "apps-portrait", phone=True)
assert not games & set(server['requests']), "Covers must not predownload games"
# Covers show only the art; the download dialog names the size.
cover_sizes = dict(sizes, **{'shovey-editor': size_text(by_name['shovey']['bytes'] + by_name['shovey-editor']['bytes'])})
for text in cover_sizes.values():
driver.wait(label=text, role='text', visible=False)
assert not driver.find(label=text, role='text'), "Covers must not show download sizes"
driver.press(label='Profile', role='button')
driver.wait(label='Account', role='text')
capture(child, 'arcade-profile')
driver.press(label="Back", role="button")
driver.wait(label='Shovey', role='button')
assert not list((profile / 'resources/downloads').glob('*.zx'))
assert not [path for path in (profile / 'resources/downloads').glob('*.zx') if path.stem in games]
driver.press(label="Shovey", role="button")
driver.wait(label='Cancel', role='button')
driver.press(label='Cancel', role='button')
assert server['requests'] == [], 'Cancel must download nothing'
assert not games & set(server['requests']), 'Cancel must download nothing'
driver.press(label="Shovey", role="button")
primary_download()
driver.wait(label=f"Level 1 / {classic}")
@@ -275,15 +287,16 @@ def main():
assert not driver.find(label='Pause', role='button'), 'Unverified bytes must never run'
server['corrupt_wurm'] = False
primary_download('Try again')
driver.wait(label='Play', role='button', timeout=60)
capture(child, 'wurm-title')
driver.press(label='Play', role='button')
# The cover is its title: Apfelwurm asks once how to move, then plays.
driver.wait(label='How do you want to move?', role='text', timeout=60)
driver.press(label='Swipe', role='button')
driver.wait(label='Pause', role='button')
capture(child, 'wurm-playing')
driver.press(label='Pause', role='button')
driver.wait(label='Resume', role='button')
driver.press(label='Back to title', role='button')
driver.wait(label='Play', role='button')
capture(child, 'wurm-title')
driver.press(label='Back', role='button')
driver.wait(label='Shovey', role='button')
for entry in json.loads((root / 'build/arcade.json').read_text())['children']:
+6 -2
View File
@@ -18,7 +18,7 @@ class GameResourcesTest(unittest.TestCase):
(root / 'games.json').write_text(json.dumps({'packages': []}))
(root / 'catalog.json').write_text(json.dumps({'id': 'editor', 'name': 'editor'}))
app = {'manifest': 'catalog.json', 'requires': ['game'], 'shared_code': True,
'library_entries': ['engine:Step']}
'library_entries': ['engine:Step'], 'shared_records': ['local.campaign']}
def declare(value):
(root / 'apps.json').write_text(json.dumps(
@@ -28,9 +28,13 @@ class GameResourcesTest(unittest.TestCase):
parsed = declare(app)
self.assertTrue(parsed['shared_code'])
self.assertEqual(parsed['library_entries'], ['engine:Step'])
self.assertEqual(parsed['shared_records'], ['local.campaign'])
for invalid in [app | {'requires': []}, app | {'shared_code': 1},
app | {'library_entries': ['engine:../Step']},
app | {'library_entries': ['engine:Step', 'engine:Step']}]:
app | {'library_entries': ['engine:Step', 'engine:Step']},
app | {'shared_records': ['../campaign']},
app | {'shared_records': ['local.campaign', 'local.campaign']},
app | {'shared_records': ['..']}, app | {'shared_records': 'campaign'}]:
with self.subTest(invalid=invalid), self.assertRaises(ValueError):
declare(invalid)
+60
View File
@@ -0,0 +1,60 @@
"""Release metadata must not prevent Arcade from following the actual game source."""
import importlib.util
import json
from pathlib import Path
import tempfile
import unittest
from unittest.mock import patch
ROOT = Path(__file__).resolve().parents[1]
spec = importlib.util.spec_from_file_location('follow_game_releases', ROOT / 'scripts/follow-game-releases.py')
follower = importlib.util.module_from_spec(spec)
spec.loader.exec_module(follower)
class GameUpdates(unittest.TestCase):
def follow(self, comparison, same_commit=False):
with tempfile.TemporaryDirectory(prefix='arcade-release-metadata-') as temporary:
root = Path(temporary)
(root / 'apps').mkdir()
old = '1' * 40
new = old if same_commit else '2' * 40
url = 'https://github.com/waozixyz/wurm.git'
identifier = follower.package_id(url, old)
lock = {'format': 1, 'toolchain': {}, 'root': {'dependencies': {'wurm': identifier}},
'packages': [{'id': identifier, 'name': 'Apfelwurm', 'url': url,
'commit': old, 'ref': 'master', 'dependencies': {}}]}
(root / 'ziran.lock').write_text(follower.write_lock(lock))
(root / 'games.json').write_text(json.dumps({'packages': ['wurm']}))
# This is the normal release order: metadata first, game release next.
(root / 'apps/versions.json').write_text(json.dumps({'node_apps': {'wurm': {'version': '0.1.8'}}}))
def gh(*arguments):
if arguments[0] == 'release':
return 'v0.1.8'
return comparison if '/compare/' in arguments[1] else new
updates = root / 'updates.json'
with patch.object(follower, 'ROOT', root), patch.object(follower, 'UPDATES', updates), patch.object(follower, 'gh', gh):
follower.pin()
return json.loads((root / 'ziran.lock').read_text()), json.loads(updates.read_text()), old, new
def test_metadata_already_names_the_release(self):
lock, updates, old, new = self.follow('ahead')
self.assertEqual(lock['packages'][0]['commit'], new)
self.assertEqual(lock['root']['dependencies']['wurm'], lock['packages'][0]['id'])
self.assertEqual(len(updates), 1)
def test_same_source_is_unchanged(self):
lock, updates, old, new = self.follow('identical', same_commit=True)
self.assertEqual(lock['packages'][0]['commit'], old)
self.assertEqual(updates, [])
def test_older_release_never_moves_the_pin_back(self):
lock, updates, old, new = self.follow('behind')
self.assertEqual(lock['packages'][0]['commit'], old)
self.assertEqual(updates, [])
if __name__ == '__main__':
unittest.main()
+3
View File
@@ -230,6 +230,9 @@ def main():
resize_owned_window(child, 480, 820)
driver.press(label='Swipe and tap')
driver.wait_gone(label='How do you want to move?', role='text')
driver.wait(label='Got it', role='button')
driver.press(label='Got it', role='button')
driver.wait_gone(label='Got it', role='button')
assert (profile / 'games/arcade.shovey-player/records/controls').read_text() == 'off'
assert not driver.find(label='Continue', role='button'), 'Classic must open straight on a level'
assert driver.find(label='Shovey', role='image', visible=True), 'Shovey must be drawn as a picture'
+3
View File
@@ -117,6 +117,9 @@ def main():
answer_level_updates(driver)
driver.press(label='Swipe and tap')
driver.wait_gone(label='How do you want to move?', role='text')
driver.wait(label='Got it', role='button')
driver.press(label='Got it', role='button')
driver.wait_gone(label='Got it', role='button')
# Entering play may save the untouched campaign; a fresh profile may
# have no record until the first move.
deadline = time.monotonic() + 10
+51
View File
@@ -0,0 +1,51 @@
"""Startup previews keep full colour and alpha while the originals stay intact."""
import importlib.util
from pathlib import Path
import tempfile
import unittest
from PIL import Image
ROOT = Path(__file__).resolve().parents[1]
spec = importlib.util.spec_from_file_location('build_desktop', ROOT / 'scripts/build-desktop.py')
desktop = importlib.util.module_from_spec(spec)
spec.loader.exec_module(desktop)
class StartupArtTests(unittest.TestCase):
def test_previews_keep_colour_alpha_and_aspect_ratio(self):
work = ROOT / 'build/scratch'
work.mkdir(parents=True, exist_ok=True)
with tempfile.TemporaryDirectory(prefix='startup-art-', dir=work) as temporary:
root = Path(temporary)
source = root / 'source/assets/shovey'
source.mkdir(parents=True)
# A continuous RGB gradient needs more than a 256-colour palette.
gradient = Image.new('RGB', (900, 1200))
gradient.putdata([(x % 256, y % 256, (x + y) % 256)
for y in range(1200) for x in range(900)])
gradient.save(source / 'title-portrait.png')
gradient.transpose(Image.Transpose.ROTATE_90).save(source / 'title-landscape.png')
logo = gradient.resize((1200, 400)).convert('RGBA')
alpha = Image.new('L', logo.size, 0)
alpha.paste(255, (100, 50, 1100, 350))
logo.putalpha(alpha)
logo.save(source / 'logo.png')
originals = {path.name: path.read_bytes() for path in source.iterdir()}
output = root / 'output'
desktop.stage_startup_art(root / 'source', output)
expected = {'title-portrait.png': (480, 640),
'title-landscape.png': (640, 480), 'logo.png': (512, 171)}
for name, size in expected.items():
with self.subTest(image=name), Image.open(output / 'startup/shovey' / name) as preview:
self.assertEqual(preview.size, size)
self.assertEqual(preview.mode, 'RGBA' if name == 'logo.png' else 'RGB')
self.assertIsNone(preview.getcolors(256), 'Title previews must not use a 256-colour palette')
if name == 'logo.png':
self.assertEqual(preview.getpixel((0, 0))[3], 0)
self.assertEqual(preview.getpixel((256, 85))[3], 255)
self.assertEqual((source / name).read_bytes(), originals[name])
if __name__ == '__main__':
unittest.main()
+77
View File
@@ -0,0 +1,77 @@
"""Verify coloured startup previews, original covers and title transitions privately."""
import argparse
import json
import os
from pathlib import Path
import subprocess
import sys
import tempfile
from PIL import Image
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--binary', type=Path, required=True)
parser.add_argument('--driver-source', type=Path, required=True)
args = parser.parse_args()
assert int(os.environ['DISPLAY'].split(':')[-1].split('.')[0]) >= 400
assert os.environ['YUE_DESKTOP_RECOVERY'] == '0'
sys.path.insert(0, str(args.driver_source / 'tests'))
from ui_driver import UiDriver
root = Path(__file__).resolve().parents[1]
output = root / 'build/scratch/title-progressive/ui'
output.mkdir(parents=True, exist_ok=True)
binary = args.binary.resolve()
driver = UiDriver(output / 'driver')
with tempfile.TemporaryDirectory(prefix='profile-', dir=output) as temporary:
profile = Path(temporary)
records = profile / 'games/arcade.shovey-player/records'
records.mkdir(parents=True)
(records / 'level-updates').write_text('off')
log_path = output / 'game.log'
with log_path.open('w') as log:
child = subprocess.Popen([str(binary)], cwd=binary.parent,
env=os.environ | driver.environment() |
{'ARCADE_DATA': str(profile), 'ENTITY_DATA': str(profile / 'entity'),
'LANG': 'en_US.UTF-8', 'SDL_AUDIODRIVER': 'dummy'},
stdout=log, stderr=subprocess.STDOUT)
driver.attach(child, log_path)
try:
startup = driver.tree()
assert driver.last['frame'] <= 3, 'Preview must precede collection loading'
images = [node for node in startup if node['kind'] == 'image' and node['label'] == 'Shovey']
assert len(images) == 2, 'Startup must show the artwork and coloured logo together'
for node in images:
assert 'startup/shovey/' in node['detail']
with Image.open(node['detail']) as picture:
assert picture.mode in ('RGB', 'RGBA'), 'Startup art must retain full colour'
assert max(picture.size) <= 640, 'Startup must use a small preview'
(output / 'startup-tree.json').write_text(json.dumps(driver.last, indent=2) + '\n')
driver.wait(label='Play', role='button', timeout=60)
full = [node for node in driver.tree() if node['kind'] == 'image' and
'arcade/covers/shovey-' in node.get('detail', '')]
assert len(full) >= 2
assert any(max(Image.open(node['detail']).size) >= 1200 for node in full), \
'Ready cover must replace the preview with the original artwork'
windows = subprocess.check_output(['xdotool', 'search', '--onlyvisible', '--pid', str(child.pid)], text=True).split()
assert len(windows) == 1
window = windows[0]
assert subprocess.check_output(['xdotool', 'getwindowpid', window], text=True).strip() == str(child.pid)
subprocess.run(['xdotool', 'windowmove', window, '0', '0'], check=True)
subprocess.run(['import', '-window', window, str(output / 'classic-ready.png')], check=True)
driver.key('right')
subprocess.run(['import', '-window', window, str(output / 'logo-fading.png')], check=True)
driver.wait(label='Editor', role='text')
driver.wait(label='Open', role='button')
driver.wait_idle(frames=5)
subprocess.run(['import', '-window', window, str(output / 'editor-ready.png')], check=True)
driver.key('left')
driver.wait(label='Classic', role='text')
driver.wait(label='Play', role='button')
assert child.poll() is None
finally:
if child.poll() is None:
child.terminate()
child.wait(timeout=10)
print('Local title UI test: full-colour previews precede original covers; Classic/Editor transitions work')
+39 -39
View File
@@ -2,9 +2,9 @@
"format": 1,
"packages": [
{
"commit": "ce01eafebd60cf0f729154fa6c735a37cd907d2d",
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "p668d6e1e4a4cf2bb"},
"id": "p00c3077d466cc4cc",
"commit": "dc1cfe389905c63c0bb453727d06d72afc1fa0b0",
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "p39132f61dd28d78f"},
"id": "p00b93f1ddcd2802f",
"name": "Apps",
"ref": "master",
"url": "https://github.com/waozixyz/apps.git"
@@ -28,7 +28,7 @@
},
{
"commit": "1cb9df183089a77c8a16448a556186f30b261a98",
"dependencies": {"kryon": "p668d6e1e4a4cf2bb"},
"dependencies": {"kryon": "p39132f61dd28d78f"},
"id": "p1b13dda539ed2a39",
"name": "Kss",
"ref": "master",
@@ -36,7 +36,7 @@
},
{
"commit": "bad2caaa84ef3eae61e40c99bf572d2b060d0ca2",
"dependencies": {"kryon": "p668d6e1e4a4cf2bb"},
"dependencies": {"kryon": "p39132f61dd28d78f"},
"id": "p20eb23d3e6db3711",
"name": "Game2D",
"ref": "master",
@@ -51,22 +51,6 @@
"source": true,
"url": "https://github.com/sqlite/sqlite.git"
},
{
"commit": "be74b13fd9b991e63a96360e8f13d781cece964e",
"dependencies": {"daochi_client": "p9972fcdd2d5ba999", "kryon": "p668d6e1e4a4cf2bb", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"id": "p2b0009b9bbaa09de",
"name": "Entity",
"ref": "master",
"url": "https://github.com/waozixyz/entity.git"
},
{
"commit": "b20836cf38d0e70247439c882b70d951efdff11c",
"dependencies": {"raylib": "p5a77c9c35110e925"},
"id": "p668d6e1e4a4cf2bb",
"name": "kryon",
"ref": "master",
"url": "https://github.com/kryonlabs/kryon.git"
},
{
"commit": "eb2b201a2da3bfc6fefd7ff2d8e476e3cb9e5bcb",
"dependencies": {},
@@ -76,9 +60,17 @@
"source": true,
"url": "https://github.com/curl/curl.git"
},
{
"commit": "68f2e8d30b8d2f28b29c1d8875193b33bea44ead",
"dependencies": {"raylib": "p5a77c9c35110e925"},
"id": "p39132f61dd28d78f",
"name": "kryon",
"ref": "master",
"url": "https://github.com/kryonlabs/kryon.git"
},
{
"commit": "2f6f1f57d7de742ef7ebc01159c2315acf793d5b",
"dependencies": {"apps": "p00c3077d466cc4cc", "crypto": "pc23fbf455e97614d", "curl": "p2f75403ea4cb61e4", "daochi_client": "p9972fcdd2d5ba999", "game2d": "p20eb23d3e6db3711", "kryon": "p668d6e1e4a4cf2bb", "kss": "p1b13dda539ed2a39", "liboqs": "p4b0a50b49959e674", "mingcute": "pe1027b9d16704793", "monocypher": "p809b4d31a48625a3", "oqs": "p7098ac9cd92f7e5f", "plot": "pab5377a2950368a2", "qrcode": "p0dfa70137405b096", "rini": "p09fa77e94b0dfc6c", "self": "pa4da0de6c3c44e61", "sqlite": "p219661bf4be659ed"},
"dependencies": {"apps": "p00b93f1ddcd2802f", "crypto": "pc23fbf455e97614d", "curl": "p2f75403ea4cb61e4", "daochi_client": "p9972fcdd2d5ba999", "game2d": "p20eb23d3e6db3711", "kryon": "p39132f61dd28d78f", "kss": "p1b13dda539ed2a39", "liboqs": "p4b0a50b49959e674", "mingcute": "pe1027b9d16704793", "monocypher": "p809b4d31a48625a3", "oqs": "p7098ac9cd92f7e5f", "plot": "pab5377a2950368a2", "qrcode": "p0dfa70137405b096", "rini": "p09fa77e94b0dfc6c", "self": "pa4da0de6c3c44e61", "sqlite": "p219661bf4be659ed"},
"id": "p48228a6b7e2920d3",
"name": "Inbe",
"ref": "master",
@@ -127,9 +119,17 @@
"ref": "master",
"url": "https://github.com/ziranlang/daochi-client.git"
},
{
"commit": "ead42286d2fe16cd46768e4d3d6a5fad26d1c831",
"dependencies": {"daochi_client": "p9972fcdd2d5ba999", "kryon": "p39132f61dd28d78f", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"id": "p9ea7a59dcc9f75a2",
"name": "Entity",
"ref": "master",
"url": "https://github.com/waozixyz/entity.git"
},
{
"commit": "357a71d1ee2c7c9526c2af18793ea8628c505034",
"dependencies": {"daochi_client": "p9972fcdd2d5ba999", "kryon": "p668d6e1e4a4cf2bb", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"dependencies": {"daochi_client": "p9972fcdd2d5ba999", "kryon": "p39132f61dd28d78f", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"id": "pa4da0de6c3c44e61",
"name": "Self",
"ref": "master",
@@ -137,20 +137,12 @@
},
{
"commit": "3f888653b6b97010163d824c4cc72476be3214f3",
"dependencies": {"kryon": "p668d6e1e4a4cf2bb"},
"dependencies": {"kryon": "p39132f61dd28d78f"},
"id": "pab5377a2950368a2",
"name": "plot",
"ref": "master",
"url": "https://github.com/kryonlabs/plot.git"
},
{
"commit": "481ec2a6cdee05680bd809d3436134ef670db6ce",
"dependencies": {"apps": "p00c3077d466cc4cc", "kryon": "p668d6e1e4a4cf2bb", "mingcute": "pe1027b9d16704793"},
"id": "p4b52e2fb4081447c",
"name": "Apfelwurm",
"ref": "master",
"url": "https://github.com/waozixyz/wurm.git"
},
{
"commit": "944826f70779a6b6cd53f6b06a75b36f4d8a2558",
"dependencies": {},
@@ -159,6 +151,14 @@
"ref": "master",
"url": "https://github.com/ziranlang/crypto.git"
},
{
"commit": "90a3e7d9b1b9ef6a7f5eab7aff55eba3353e604e",
"dependencies": {"apps": "p00b93f1ddcd2802f", "entity": "p9ea7a59dcc9f75a2", "kryon": "p39132f61dd28d78f", "mingcute": "pe1027b9d16704793"},
"id": "p08f35f0240dbbdff",
"name": "Shovey",
"ref": "master",
"url": "https://github.com/waozixyz/shovey.git"
},
{
"commit": "9cc6872f75447c3a24c16764f9829d0f58751cb0",
"dependencies": {},
@@ -168,20 +168,20 @@
"url": "https://github.com/kryonlabs/mingcute.git"
},
{
"commit": "2c05b39693a6d8a697f5b111f9d438092b4f186a",
"dependencies": {"apps": "p00c3077d466cc4cc", "entity": "p2b0009b9bbaa09de", "kryon": "p668d6e1e4a4cf2bb", "mingcute": "pe1027b9d16704793"},
"id": "ped09a2b79138be62",
"name": "Shovey",
"commit": "76e95cd951ddc82d9a507f5e43f6b72fc597bc96",
"dependencies": {"apps": "p00b93f1ddcd2802f", "kryon": "p39132f61dd28d78f", "mingcute": "pe1027b9d16704793"},
"id": "pceb767df382e3cc7",
"name": "Apfelwurm",
"ref": "master",
"url": "https://github.com/waozixyz/shovey.git"
"url": "https://github.com/waozixyz/wurm.git"
}
],
"root": {
"dependencies": {"apps": "p00c3077d466cc4cc", "entity": "p2b0009b9bbaa09de", "inbe": "p48228a6b7e2920d3", "kryon": "p668d6e1e4a4cf2bb", "mingcute": "pe1027b9d16704793", "shovey": "ped09a2b79138be62", "wurm": "p4b52e2fb4081447c"},
"dependencies": {"apps": "p00b93f1ddcd2802f", "entity": "p9ea7a59dcc9f75a2", "inbe": "p48228a6b7e2920d3", "kryon": "p39132f61dd28d78f", "mingcute": "pe1027b9d16704793", "shovey": "p08f35f0240dbbdff", "wurm": "pceb767df382e3cc7"},
"name": "Arcade"
},
"toolchain": {
"commit": "21c6a681c9ba684bbe069004fd971748cc5c7dc0",
"commit": "5efa24f818485cf265bdd5c066a4e2150175ac0e",
"ref": "master",
"url": "https://github.com/ziranlang/ziran.git"
}