2 Commits

Author SHA1 Message Date
227a83d1f0 feat(app): update nginx image source 2026-04-20 00:18:51 +03:00
8874f5c04f build(scripts): update build and publish scripts 2026-04-17 20:08:29 +03:00
4 changed files with 38 additions and 32 deletions

View File

@@ -1,21 +1,20 @@
PROJECT=puzzlez PROJECT=puzzlez
VERSION=$(grep -m 1 'version' ./package.json | grep -oP '"version"\s*:\s*"\K\d+\.\d+.\d+')
SDK_PATH=$HOME/sdk SDK_PATH=$HOME/sdk
PUBLISH_PATH=$HOME/public/$PROJECT PUBLISH_PATH=$HOME/public/$PROJECT
BUILD_PATH=./build BUILD_PATH=./build
TARGET_PATH=./target TARGET_PATH=./target
KEY_STORE=<keystore.jks> KEY_STORE=<keystore.jks>
KEY_PASS=<passphrase> KEY_PASS=<passphrase>
# publish
REPO=https://git.shmyga.ru/api/packages/InfernalGames REPO=https://git.shmyga.ru/api/packages/InfernalGames
PUBLISH_USER=<username> PUBLISH_USER=<username>
PUBLISH_PASSWORD=<passphrase> PUBLISH_PASSWORD=<passphrase>
# docker
DOCKER_REPO=git.shmyga.ru DOCKER_REPO=git.shmyga.ru
DOCKER_GROUP=infernalgames DOCKER_GROUP=infernalgames
DOCKER_ROOT="$DOCKER_REPO/$DOCKER_GROUP" DOCKER_ROOT="$DOCKER_REPO/$DOCKER_GROUP"
VERSION=$(grep -m 1 'version' ./package.json | grep -oP '"version"\s*:\s*"\K\d+\.\d+.\d+') DOCKER_PROJECTS="$PROJECT-web:web"
DOCKER_PROJECTS=( DOCKER_ARGS="PROJECT_NAME=$PROJECT"
"$PROJECT-web:web"
)
DOCKER_ARGS=(
"PROJECT_NAME=$PROJECT"
)

View File

@@ -1,7 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
cd "$(dirname $(dirname "$0"))" || exit cd "$(dirname $(dirname "$0"))" || exit
source .env source .env
mkdir -p "$SDK_PATH" "$PUBLISH_PATH" "$BUILD_PATH" "$TARGET_PATH" "src-gen" mkdir -p "$SDK_PATH" "$PUBLISH_PATH" "$BUILD_PATH" "$TARGET_PATH" "src-gen"
docker compose run --rm --user $(id -u):$(id -g) --build --remove-orphans builder docker compose run --rm --user $(id -u):$(id -g) --build --remove-orphans builder
./scripts/docker-action

View File

@@ -3,8 +3,6 @@ set -e
cd "$(dirname $(dirname "$0"))" || exit cd "$(dirname $(dirname "$0"))" || exit
source .env source .env
VERSION=$(grep -m 1 'version' ./package.json | grep -oP '"version"\s*:\s*"\K\d+\.\d+\.\d+')
PACKAGES=( PACKAGES=(
"android/${PROJECT}_${VERSION}.apk" "android/${PROJECT}_${VERSION}.apk"
"debian/${PROJECT}_${VERSION}_all.deb" "debian/${PROJECT}_${VERSION}_all.deb"
@@ -33,3 +31,5 @@ do
fi fi
fi fi
done done
DOCKER_ACTION=publish ./scripts/docker-action

View File

@@ -25,6 +25,7 @@ class NginxImageSource implements ImageSource {
public var id(default, never):String = "nginx"; public var id(default, never):String = "nginx";
private var baseUrl:String; private var baseUrl:String;
private var cache:Map<String, Promise<NginxResponse>> = new Map();
public function new(baseUrl:String) { public function new(baseUrl:String) {
this.baseUrl = baseUrl; this.baseUrl = baseUrl;
@@ -36,8 +37,11 @@ class NginxImageSource implements ImageSource {
public function getPage(page:Page):Promise<DataPage<ImageId>> { public function getPage(page:Page):Promise<DataPage<ImageId>> {
var category = page.filter.get("category"); var category = page.filter.get("category");
return new JsonLoader<NginxResponse>().GET(category != null ? this.baseUrl + category + "/" : this.baseUrl) var url = category != null ? this.baseUrl + category + "/" : this.baseUrl;
.then((response:NginxResponse) -> { if (!this.cache.exists(url)) {
this.cache.set(url, new JsonLoader<NginxResponse>().GET(url));
}
return this.cache.get(url).then((response:NginxResponse) -> {
var data:Array<ImageId> = []; var data:Array<ImageId> = [];
for (item in response) { for (item in response) {
if (item.type == NginxResponseItemType.FILE) { if (item.type == NginxResponseItemType.FILE) {
@@ -45,6 +49,7 @@ class NginxImageSource implements ImageSource {
data.push(new ImageId().setSource(id).setId(itemId)); data.push(new ImageId().setSource(id).setId(itemId));
} }
} }
data = data.slice(page.index * page.count, (page.index + 1) * page.count);
return { return {
page: page, page: page,
data: data, data: data,
@@ -55,12 +60,12 @@ class NginxImageSource implements ImageSource {
public function load(id:String, thumb:Bool = false):Promise<ImageValue> { public function load(id:String, thumb:Bool = false):Promise<ImageValue> {
var url = this.baseUrl + StringTools.replace(id, "@", "/"); var url = this.baseUrl + StringTools.replace(id, "@", "/");
if (thumb) { // TODO: default size by screen width?
var width = thumb ? 360 : 1920;
var parts = url.split("."); var parts = url.split(".");
var index = parts.length - 2; var index = parts.length - 2;
parts[index] = parts[index] + "-thumbnail"; parts[index] = parts[index] + '-w${width}';
url = parts.join("."); url = parts.join(".");
}
return Promise.promise(ImageValue.URL(url)); return Promise.promise(ImageValue.URL(url));
} }