gamelet-cli 0.7.12 → 0.7.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/package.json.twig +3 -3
- package/assets/tsconfig.json.twig +1 -1
- package/build/package.json +67 -67
- package/build/src/gamelet/download.js +773 -737
- package/build/src/gamelet/merges.js +181 -179
- package/build/src/gamelet/prepare.js +276 -277
- package/build/src/gamelet/upload.js +280 -279
- package/build/src/index.js +86 -86
- package/build/src/server/Constant.js +9 -9
- package/build/src/server/entities/Client.js +78 -78
- package/build/src/server/entities/ClientOwner.js +67 -67
- package/build/src/server/entities/ClientProject.js +84 -84
- package/build/src/server/entities/Gameroom.js +89 -89
- package/build/src/server/entities/GameroomBase.js +276 -276
- package/build/src/server/entities/Gamezone.js +73 -73
- package/build/src/server/entities/ListFilter.js +193 -193
- package/build/src/server/entities/Monitor.js +94 -94
- package/build/src/server/entities/Player.js +140 -140
- package/build/src/server/managers/ApiManager.js +75 -75
- package/build/src/server/managers/ClientManager.js +64 -64
- package/build/src/server/managers/Database.js +627 -627
- package/build/src/server/managers/GameroomManager.js +392 -392
- package/build/src/server/managers/ManagerBase.js +17 -17
- package/build/src/server/managers/MonitorManager.js +73 -73
- package/build/src/server/managers/PlayerManager.js +108 -108
- package/build/src/server/managers/SocketManager.js +60 -60
- package/build/src/server/managers/UserManager.js +58 -58
- package/build/src/server/messages/Message.js +143 -143
- package/build/src/server/server.js +112 -113
- package/build/src/server/services/ServiceBase.js +25 -25
- package/build/src/server/services/clientService.js +23 -23
- package/build/src/server/services/gameroomService.js +121 -121
- package/build/src/server/services/gltserver.service.js +23 -23
- package/build/src/server/services/playerService.js +32 -32
- package/build/src/server/startServer.js +32 -33
- package/build/src/server/types/BadgeStatus.js +25 -25
- package/build/src/server/types/OrderType.js +38 -38
- package/build/src/server/types/SubmitType.js +24 -24
- package/build/src/server/types/TimeRange.js +26 -26
- package/build/src/server/utils/ArrayUtil.js +126 -126
- package/build/src/server/utils/IntUtil.js +9 -9
- package/build/src/server/utils/ObjectUtil.js +191 -191
- package/build/src/server/utils/StringUtil.js +37 -37
- package/build/src/utils/cli.js +53 -53
- package/build/src/utils/file.js +350 -337
- package/build/src/utils/init.js +57 -42
- package/build/src/utils/log.js +18 -17
- package/build/src/utils/net.js +43 -39
- package/package.json +2 -2
|
@@ -1,279 +1,280 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.upload = void 0;
|
|
7
|
-
const file_1 = require("../utils/file");
|
|
8
|
-
const net_1 = require("../utils/net");
|
|
9
|
-
const merges_1 = require("./merges");
|
|
10
|
-
const cli_progress_1 = __importDefault(require("cli-progress"));
|
|
11
|
-
const inquirer_1 = __importDefault(require("inquirer"));
|
|
12
|
-
const isbinaryfile_1 = require("isbinaryfile");
|
|
13
|
-
const tempFolder = '/.temp';
|
|
14
|
-
|
|
15
|
-
if (debug) {
|
|
16
|
-
console.log('debug = true');
|
|
17
|
-
}
|
|
18
|
-
let srcFolder = `${folder}/src`;
|
|
19
|
-
net_1.apiSetToken(token);
|
|
20
|
-
file_1.setFileCacheFolder(folder);
|
|
21
|
-
if (!file_1.fileExists(srcFolder)) {
|
|
22
|
-
return Promise.reject(`${srcFolder} does not exist`);
|
|
23
|
-
}
|
|
24
|
-
let zipFilename = folder + tempFolder + '/sources.zip';
|
|
25
|
-
return Promise.resolve()
|
|
26
|
-
.then(() => validateToken(projectCode, token))
|
|
27
|
-
.then(() => validateGitCommit(folder))
|
|
28
|
-
.then(() => checkSourcesMerged(zipFilename, projectCode, folder, token))
|
|
29
|
-
.then(basezip => createUploadQueue(projectCode, basezip, folder))
|
|
30
|
-
.then(queue => processUploadQueue(projectCode, queue, folder))
|
|
31
|
-
.then(queue => queue.length && downloadBase(zipFilename, projectCode, folder, token))
|
|
32
|
-
.then(() => file_1.rmdir(`${folder}${tempFolder}`).catch(_e => { }))
|
|
33
|
-
.then(() => {
|
|
34
|
-
console.log();
|
|
35
|
-
console.log('done');
|
|
36
|
-
})
|
|
37
|
-
.catch(err => {
|
|
38
|
-
console.log();
|
|
39
|
-
console.error(err);
|
|
40
|
-
})
|
|
41
|
-
.then(() => console.log());
|
|
42
|
-
};
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
.then(() => file_1.
|
|
95
|
-
.then(
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
}
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
sourcesProcessing.
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
progressBar.
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
sourcesProcessing.
|
|
170
|
-
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
let
|
|
176
|
-
let
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
let
|
|
182
|
-
let
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
console.log('
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
}
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
sourcesProcessing.
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
sourcesProcessing.
|
|
265
|
-
|
|
266
|
-
}
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
}
|
|
279
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/gamelet/upload.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.upload = void 0;
|
|
7
|
+
const file_1 = require("../utils/file");
|
|
8
|
+
const net_1 = require("../utils/net");
|
|
9
|
+
const merges_1 = require("./merges");
|
|
10
|
+
const cli_progress_1 = __importDefault(require("cli-progress"));
|
|
11
|
+
const inquirer_1 = __importDefault(require("inquirer"));
|
|
12
|
+
const isbinaryfile_1 = require("isbinaryfile");
|
|
13
|
+
const tempFolder = '/.temp';
|
|
14
|
+
const upload = ({ projectCode, folder, token, debug }) => {
|
|
15
|
+
if (debug) {
|
|
16
|
+
console.log('debug = true');
|
|
17
|
+
}
|
|
18
|
+
let srcFolder = `${folder}/src`;
|
|
19
|
+
(0, net_1.apiSetToken)(token);
|
|
20
|
+
(0, file_1.setFileCacheFolder)(folder);
|
|
21
|
+
if (!(0, file_1.fileExists)(srcFolder)) {
|
|
22
|
+
return Promise.reject(`${srcFolder} does not exist`);
|
|
23
|
+
}
|
|
24
|
+
let zipFilename = folder + tempFolder + '/sources.zip';
|
|
25
|
+
return Promise.resolve()
|
|
26
|
+
.then(() => validateToken(projectCode, token))
|
|
27
|
+
.then(() => validateGitCommit(folder))
|
|
28
|
+
.then(() => checkSourcesMerged(zipFilename, projectCode, folder, token))
|
|
29
|
+
.then(basezip => createUploadQueue(projectCode, basezip, folder))
|
|
30
|
+
.then(queue => processUploadQueue(projectCode, queue, folder))
|
|
31
|
+
.then(queue => queue.length && downloadBase(zipFilename, projectCode, folder, token))
|
|
32
|
+
.then(() => (0, file_1.rmdir)(`${folder}${tempFolder}`).catch(_e => { }))
|
|
33
|
+
.then(() => {
|
|
34
|
+
console.log();
|
|
35
|
+
console.log('done');
|
|
36
|
+
})
|
|
37
|
+
.catch(err => {
|
|
38
|
+
console.log();
|
|
39
|
+
console.error(err);
|
|
40
|
+
})
|
|
41
|
+
.then(() => console.log());
|
|
42
|
+
};
|
|
43
|
+
exports.upload = upload;
|
|
44
|
+
function validateGitCommit(folder) {
|
|
45
|
+
return (0, file_1.isGitCommitted)(folder)
|
|
46
|
+
.then(committed => {
|
|
47
|
+
if (!committed) {
|
|
48
|
+
return Promise.reject('Please commit your current sources first.');
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
return Promise.resolve();
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
function validateToken(projectCode, _token) {
|
|
56
|
+
return (0, net_1.apiGet)(`/validate/local_dev_token/${projectCode}/edit`)
|
|
57
|
+
.catch(_e => {
|
|
58
|
+
console.error('Only the current Project Editor can do the upload');
|
|
59
|
+
throw _e;
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
function downloadBase(zipFilename, projectCode, folder, token) {
|
|
63
|
+
let basezip = `${folder}/.cg/sources.base`;
|
|
64
|
+
console.log(`update sources base ...`);
|
|
65
|
+
return Promise.resolve()
|
|
66
|
+
.then(() => {
|
|
67
|
+
if (!(0, file_1.fileExists)(zipFilename)) {
|
|
68
|
+
let progressBar = new cli_progress_1.default.SingleBar({}, cli_progress_1.default.Presets.shades_classic);
|
|
69
|
+
return (0, file_1.downloadFile)((0, net_1.cgUrl)(`/download/${projectCode}?token=${token}`), zipFilename, progressBar, { noCache: true })
|
|
70
|
+
.then(() => progressBar && progressBar.stop());
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
return Promise.resolve();
|
|
74
|
+
}
|
|
75
|
+
})
|
|
76
|
+
.then(() => (0, file_1.moveFile)(zipFilename, basezip));
|
|
77
|
+
}
|
|
78
|
+
let sourcesProcessing;
|
|
79
|
+
function checkSourcesMerged(zipFilename, projectCode, folder, token) {
|
|
80
|
+
let progressBar = new cli_progress_1.default.SingleBar({}, cli_progress_1.default.Presets.shades_classic);
|
|
81
|
+
sourcesProcessing = [];
|
|
82
|
+
let basezip = `${folder}/.cg/sources.base`;
|
|
83
|
+
if (!(0, file_1.fileExists)(basezip)) {
|
|
84
|
+
return Promise.reject('Cannot merge: source base missing.');
|
|
85
|
+
}
|
|
86
|
+
console.log(`prepare updates: download remote sources ...`);
|
|
87
|
+
return (0, file_1.downloadFile)((0, net_1.cgUrl)(`/download/${projectCode}?token=${token}`), zipFilename, progressBar, { noCache: true })
|
|
88
|
+
.then(() => {
|
|
89
|
+
progressBar.stop();
|
|
90
|
+
return (0, file_1.getFileZip)(zipFilename);
|
|
91
|
+
})
|
|
92
|
+
.then(jszip => {
|
|
93
|
+
return Promise.resolve()
|
|
94
|
+
.then(() => (0, file_1.rmdir)(`${folder}${tempFolder}`).catch(_e => { }))
|
|
95
|
+
.then(() => (0, file_1.getFileZip)(basezip))
|
|
96
|
+
.then(basezip => {
|
|
97
|
+
let saveSrcFiles = [];
|
|
98
|
+
sourcesProcessing = [];
|
|
99
|
+
console.log(`prepare updates: diff remote sources ...`);
|
|
100
|
+
for (let filename in jszip.files) {
|
|
101
|
+
if (filename.startsWith('src/')) {
|
|
102
|
+
saveSrcFiles.push(checkSourceMerged(jszip.file(filename), basezip.file(filename), folder));
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
return Promise.all(saveSrcFiles)
|
|
106
|
+
.then(results => {
|
|
107
|
+
if (results.find(result => !result)) {
|
|
108
|
+
return Promise.reject(`Please do a merge before upload.\nRun the command "gamelet merge"`);
|
|
109
|
+
}
|
|
110
|
+
return basezip;
|
|
111
|
+
});
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
function checkSourceMerged(file, base, folder) {
|
|
116
|
+
if (sourcesProcessing.length > 19) {
|
|
117
|
+
return (0, file_1.wait)(30).then(() => checkSourceMerged(file, base, folder));
|
|
118
|
+
}
|
|
119
|
+
sourcesProcessing.push(file);
|
|
120
|
+
return (0, merges_1.isSourceMerged)(file.name, file, base, folder)
|
|
121
|
+
.then(result => {
|
|
122
|
+
let index = sourcesProcessing.indexOf(file);
|
|
123
|
+
sourcesProcessing.splice(index, 1);
|
|
124
|
+
return result;
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
function processUploadQueue(projectCode, queue, _folder) {
|
|
128
|
+
if (!queue.length) {
|
|
129
|
+
console.log('nothing to upload');
|
|
130
|
+
return Promise.resolve(queue);
|
|
131
|
+
}
|
|
132
|
+
return inquirer_1.default.prompt([
|
|
133
|
+
{
|
|
134
|
+
type: 'confirm',
|
|
135
|
+
name: 'confirm',
|
|
136
|
+
message: `${queue.length} item(s) to upload to "${projectCode}", Continue?`,
|
|
137
|
+
}
|
|
138
|
+
])
|
|
139
|
+
.then(result => {
|
|
140
|
+
if (result.confirm) {
|
|
141
|
+
sourcesProcessing = [];
|
|
142
|
+
let progressBar = new cli_progress_1.default.SingleBar({}, cli_progress_1.default.Presets.shades_classic);
|
|
143
|
+
progressBar.start(queue.length, 0);
|
|
144
|
+
return Promise.all(queue.map(item => processUploadQueueItem(projectCode, item, progressBar)))
|
|
145
|
+
.then(() => progressBar.stop());
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
queue.length = 0;
|
|
149
|
+
}
|
|
150
|
+
return Promise.resolve();
|
|
151
|
+
})
|
|
152
|
+
.then(() => queue);
|
|
153
|
+
}
|
|
154
|
+
function processUploadQueueItem(projectCode, queueItem, progressBar) {
|
|
155
|
+
if (sourcesProcessing.length > 5) {
|
|
156
|
+
return (0, file_1.wait)(30).then(() => processUploadQueueItem(projectCode, queueItem, progressBar));
|
|
157
|
+
}
|
|
158
|
+
sourcesProcessing.push(queueItem);
|
|
159
|
+
return Promise.resolve()
|
|
160
|
+
.then(() => {
|
|
161
|
+
return (0, net_1.apiPost)(`/update/source/local_dev/${projectCode}/${queueItem.action}`, {
|
|
162
|
+
path: queueItem.path,
|
|
163
|
+
filename: queueItem.filename,
|
|
164
|
+
content: queueItem.content || '',
|
|
165
|
+
});
|
|
166
|
+
})
|
|
167
|
+
.then(() => {
|
|
168
|
+
progressBar.increment(1);
|
|
169
|
+
let index = sourcesProcessing.indexOf(queueItem);
|
|
170
|
+
sourcesProcessing.splice(index, 1);
|
|
171
|
+
});
|
|
172
|
+
}
|
|
173
|
+
function createUploadQueue(projectCode, basezip, folder) {
|
|
174
|
+
sourcesProcessing = [];
|
|
175
|
+
let srcFolder = `${folder}/src`;
|
|
176
|
+
let queue = [];
|
|
177
|
+
let filesToDelete = {};
|
|
178
|
+
for (let filename in basezip.files) {
|
|
179
|
+
let search = filename.match(/^src\/(.*\/)?([^\/]+)$/);
|
|
180
|
+
if (search) {
|
|
181
|
+
let path = search[1] ? search[1].substr(0, search[1].length - 1) : '';
|
|
182
|
+
let fname = search[2];
|
|
183
|
+
let fullpath = path ? `${path}/${fname}` : fname;
|
|
184
|
+
filesToDelete[fullpath] = {
|
|
185
|
+
path: path,
|
|
186
|
+
filename: fname,
|
|
187
|
+
};
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
console.log('listing files to upload...');
|
|
191
|
+
console.log('===============================');
|
|
192
|
+
return (0, file_1.listFiles)(srcFolder)
|
|
193
|
+
.then(files => {
|
|
194
|
+
return Promise.all(files.map(file => updateSource(projectCode, srcFolder, '', file, basezip, queue, filesToDelete)));
|
|
195
|
+
})
|
|
196
|
+
.then(() => {
|
|
197
|
+
sourcesProcessing = [];
|
|
198
|
+
for (let key in filesToDelete) {
|
|
199
|
+
let queueItem = Object.assign({
|
|
200
|
+
action: 'delete',
|
|
201
|
+
}, filesToDelete[key]);
|
|
202
|
+
queue.push(queueItem);
|
|
203
|
+
console.log(' - (delete) ' + key);
|
|
204
|
+
}
|
|
205
|
+
})
|
|
206
|
+
.then(() => {
|
|
207
|
+
if (queue.length) {
|
|
208
|
+
console.log('-------------------------------');
|
|
209
|
+
}
|
|
210
|
+
return queue;
|
|
211
|
+
});
|
|
212
|
+
}
|
|
213
|
+
function updateSource(projectCode, srcFolder, path, filename, basezip, queue, filesToDelete) {
|
|
214
|
+
if (sourcesProcessing.length > 19) {
|
|
215
|
+
return (0, file_1.wait)(30).then(() => updateSource(projectCode, srcFolder, path, filename, basezip, queue, filesToDelete));
|
|
216
|
+
}
|
|
217
|
+
let fullpathname = path ? `${path}/${filename}` : filename;
|
|
218
|
+
sourcesProcessing.push(fullpathname);
|
|
219
|
+
let localFilepath = `${srcFolder}/${fullpathname}`;
|
|
220
|
+
delete filesToDelete[fullpathname];
|
|
221
|
+
return (0, file_1.fileStat)(localFilepath)
|
|
222
|
+
.then((stats) => {
|
|
223
|
+
if (stats.isDirectory()) {
|
|
224
|
+
return (0, file_1.listFiles)(localFilepath)
|
|
225
|
+
.then(files => {
|
|
226
|
+
let index = sourcesProcessing.indexOf(fullpathname);
|
|
227
|
+
sourcesProcessing.splice(index, 1);
|
|
228
|
+
return Promise.all(files.map(file => {
|
|
229
|
+
return updateSource(projectCode, srcFolder, fullpathname, file, basezip, queue, filesToDelete);
|
|
230
|
+
}));
|
|
231
|
+
});
|
|
232
|
+
}
|
|
233
|
+
else if (stats.isFile()) {
|
|
234
|
+
return (0, isbinaryfile_1.isBinaryFile)(localFilepath)
|
|
235
|
+
.then(isBinary => {
|
|
236
|
+
if (isBinary) {
|
|
237
|
+
return Promise.reject(`${filename} is not a text file.`);
|
|
238
|
+
}
|
|
239
|
+
else {
|
|
240
|
+
return (0, file_1.getFileString)(localFilepath)
|
|
241
|
+
.then(content => {
|
|
242
|
+
return getSourceAction(fullpathname, content, basezip)
|
|
243
|
+
.then(action => {
|
|
244
|
+
if (action) {
|
|
245
|
+
queue.push({
|
|
246
|
+
path: path,
|
|
247
|
+
filename: filename,
|
|
248
|
+
content: content,
|
|
249
|
+
action: action,
|
|
250
|
+
});
|
|
251
|
+
let sign = action == 'create' ? '+' : '>';
|
|
252
|
+
console.log(` ${sign} (${action}) ` + fullpathname);
|
|
253
|
+
}
|
|
254
|
+
});
|
|
255
|
+
});
|
|
256
|
+
}
|
|
257
|
+
});
|
|
258
|
+
}
|
|
259
|
+
else {
|
|
260
|
+
return Promise.resolve();
|
|
261
|
+
}
|
|
262
|
+
})
|
|
263
|
+
.then(() => {
|
|
264
|
+
let index = sourcesProcessing.indexOf(fullpathname);
|
|
265
|
+
sourcesProcessing.splice(index, 1);
|
|
266
|
+
});
|
|
267
|
+
}
|
|
268
|
+
function getSourceAction(sourcePathname, sourceContent, basezip) {
|
|
269
|
+
let baseFile = basezip.file(`src/${sourcePathname}`);
|
|
270
|
+
if (baseFile) {
|
|
271
|
+
return baseFile.async('string')
|
|
272
|
+
.then(baseContent => {
|
|
273
|
+
return sourceContent != baseContent ? 'update' : '';
|
|
274
|
+
});
|
|
275
|
+
}
|
|
276
|
+
else {
|
|
277
|
+
return Promise.resolve('create');
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/gamelet/upload.ts"],"names":[],"mappings":"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"}
|