Compare commits
3
Commits
0.6.2
..
5cce41e8fd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5cce41e8fd | ||
|
|
5964d3477b | ||
|
|
86fac8e96c |
+1
-2
@@ -1,5 +1,4 @@
|
||||
DOCKER_REPO=git.shmyga.ru
|
||||
DOCKER_GROUP=infernalgames
|
||||
|
||||
PUBLISH_REPO=git.shmyga.ru
|
||||
PUBLISH_GROUP=InfernalGames
|
||||
PUBLISH_REPO=https://git.shmyga.ru/api/packages/InfernalGames
|
||||
|
||||
-10
@@ -4,14 +4,11 @@ const Config = require("./config.json");
|
||||
const packageInfo = require("./package.json");
|
||||
const { System, Sdk, Haxe, Project } = require("gulp-haxetool");
|
||||
const dateformat = require("dateformat");
|
||||
const argv = require("yargs").argv;
|
||||
const publish = require("./tasks/gulp-publish");
|
||||
const os = require("os");
|
||||
|
||||
const resolvePath = (path) => path.replace("$HOME", os.homedir());
|
||||
|
||||
Project.useRuffle();
|
||||
|
||||
if (packageInfo.haxe) {
|
||||
Haxe.VERSION = packageInfo.haxe;
|
||||
}
|
||||
@@ -69,9 +66,6 @@ const config = new Project.Config({
|
||||
flags: ["proto_debug"],
|
||||
});
|
||||
|
||||
const host = argv.host || "localhost";
|
||||
const port = argv.port || 5000;
|
||||
|
||||
const app = new Project(
|
||||
Project.BuildSystem.OPENFL,
|
||||
[
|
||||
@@ -96,10 +90,6 @@ const app = new Project(
|
||||
width: 1280,
|
||||
height: 768,
|
||||
},
|
||||
macros: [
|
||||
`CompilationOption.set('host','${host}')`,
|
||||
`CompilationOption.set('port',${port})`,
|
||||
],
|
||||
flags: ["app"],
|
||||
}),
|
||||
).bind(module, gulp);
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "puzzlez",
|
||||
"version": "0.6.2",
|
||||
"version": "0.6.1",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "puzzlez",
|
||||
"version": "0.6.2",
|
||||
"version": "0.6.1",
|
||||
"devDependencies": {
|
||||
"dateformat": "^3.0.3",
|
||||
"fs-extra": "^10.1.0",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "puzzlez",
|
||||
"version": "0.6.2",
|
||||
"version": "0.6.1",
|
||||
"scripts": {
|
||||
"build": "gulp",
|
||||
"dev": "gulp app:flash:test"
|
||||
|
||||
@@ -25,7 +25,6 @@ class NginxImageSource implements ImageSource {
|
||||
public var id(default, never):String = "nginx";
|
||||
|
||||
private var baseUrl:String;
|
||||
private var cache:Map<String, Promise<NginxResponse>> = new Map();
|
||||
|
||||
public function new(baseUrl:String) {
|
||||
this.baseUrl = baseUrl;
|
||||
@@ -37,35 +36,31 @@ class NginxImageSource implements ImageSource {
|
||||
|
||||
public function getPage(page:Page):Promise<DataPage<ImageId>> {
|
||||
var category = page.filter.get("category");
|
||||
var url = category != null ? this.baseUrl + category + "/" : this.baseUrl;
|
||||
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> = [];
|
||||
for (item in response) {
|
||||
if (item.type == NginxResponseItemType.FILE) {
|
||||
var itemId = category != null ? category + "@" + item.name : item.name;
|
||||
data.push(new ImageId().setSource(id).setId(itemId));
|
||||
return new JsonLoader<NginxResponse>().GET(category != null ? this.baseUrl + category + "/" : this.baseUrl)
|
||||
.then((response:NginxResponse) -> {
|
||||
var data:Array<ImageId> = [];
|
||||
for (item in response) {
|
||||
if (item.type == NginxResponseItemType.FILE) {
|
||||
var itemId = category != null ? category + "@" + item.name : item.name;
|
||||
data.push(new ImageId().setSource(id).setId(itemId));
|
||||
}
|
||||
}
|
||||
}
|
||||
data = data.slice(page.index * page.count, (page.index + 1) * page.count);
|
||||
return {
|
||||
page: page,
|
||||
data: data,
|
||||
total: response.length,
|
||||
}
|
||||
});
|
||||
return {
|
||||
page: page,
|
||||
data: data,
|
||||
total: response.length,
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public function load(id:String, thumb:Bool = false):Promise<ImageValue> {
|
||||
var url = this.baseUrl + StringTools.replace(id, "@", "/");
|
||||
// TODO: default size by screen width?
|
||||
var width = thumb ? 360 : 1920;
|
||||
var parts = url.split(".");
|
||||
var index = parts.length - 2;
|
||||
parts[index] = parts[index] + '-w${width}';
|
||||
url = parts.join(".");
|
||||
if (thumb) {
|
||||
var parts = url.split(".");
|
||||
var index = parts.length - 2;
|
||||
parts[index] = parts[index] + "-thumbnail";
|
||||
url = parts.join(".");
|
||||
}
|
||||
return Promise.promise(ImageValue.URL(url));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user