Skip to content

Commit 59bd934

Browse files
Add exit code and aliases
1 parent 5c66283 commit 59bd934

File tree

1 file changed

+24
-4
lines changed

1 file changed

+24
-4
lines changed

fcut.lua

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,13 @@ local config = tables.createArgumentTable(arg, {
8585
helpPath = 'help',
8686
configPath = 'config',
8787
emptyPath = 'config',
88-
schema = CONFIG_SCHEMA
88+
schema = CONFIG_SCHEMA,
89+
aliases = {
90+
h = 'help',
91+
ll = 'loglevel',
92+
p = 'project',
93+
s = 'source',
94+
},
8995
});
9096

9197
-- Apply configured log level
@@ -209,9 +215,11 @@ local function enqueueCommand(args, id, outputFile)
209215
end
210216

211217
local function endExport(exportContext, webSocket, exitCode)
212-
exportContext.exitCode = exitCode
213-
webSocket:close()
214-
Map.deleteValues(exportContexts, exportContext)
218+
return webSocket:sendTextMessage('\n -- exit code '..tostring(exitCode)..' ------\n\n'):finally(function()
219+
logger:info('end export')
220+
Map.deleteValues(exportContexts, exportContext)
221+
return webSocket:close()
222+
end)
215223
end
216224

217225
local function startExportCommand(exportContext, webSocket, index)
@@ -331,6 +339,17 @@ local httpContexts = {
331339
exportContexts[exportId] = nil
332340
end
333341
end,
342+
['getExport?method=POST'] = function(exchange)
343+
local exportId = exchange:getRequest():getBody()
344+
local exportContext = exportContexts[exportId]
345+
if exportContext then
346+
return {
347+
commands = exportContext.commands,
348+
}
349+
end
350+
HttpExchange.notFound(exchange, 'Export not found')
351+
return false
352+
end,
334353
['export(requestJson)?method=POST&Content-Type=application/json'] = function(exchange, parameters)
335354
local commands = ffmpeg:createCommands(parameters.filename, parameters.parts, parameters.options or {}, parameters.seekDelayMs)
336355
local exportId = strings.formatInteger(system.currentTimeMillis(), 64)
@@ -356,6 +375,7 @@ local httpContexts = {
356375
end
357376
table.insert(header, '')
358377
webSocket:sendTextMessage(table.concat(header, '\n'))
378+
logger:info('start export %s', exportId)
359379
startExportCommand(exportContext, webSocket, 1)
360380
end
361381
}),

0 commit comments

Comments
 (0)