Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

luamacro: implement custom events (POC) #244

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

luamacro: implement custom events (POC) #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions plugins/luamacro/api.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ end

mf.GetMacroCopy = utils.GetMacroCopy
mf.EnumScripts = utils.EnumScripts
mf.ProcessEvent = utils.ProcessEvent
--------------------------------------------------------------------------------

Object = {
Expand Down
22 changes: 14 additions & 8 deletions plugins/luamacro/utils.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ local function AddId (trg, src)
end

local function EV_Handler (macros, filename, ...)
if not macros then return end
-- Get current priorities.
local indexes,priorities = {},{}
for i,m in ipairs(macros) do
Expand Down Expand Up @@ -299,6 +300,10 @@ local function export_GetContentData (filename, colnames)
return tOut
end

local function ProcessEvent (group, options, ...) --todo
return EV_Handler(Events[group:lower()], options and options.filename, options, ...)
end

local ExpandKey do -- измеренное время исполнения на ключе "CtrlAltShiftF12" = ??? (Lua); 2.3uS (LuaJIT);
local t={}

Expand Down Expand Up @@ -485,7 +490,8 @@ end
local AddEvent_fields = {"group","action","description","priority","condition","filemask"}
local function AddEvent (srctable, FileName)
local group = type(srctable)=="table" and type(srctable.group)=="string" and srctable.group:lower()
if not (group and Events[group]) then return end
if not group then return end
Events[group] = Events[group] or {}

if type(srctable.action)~="function" then return end

Expand Down Expand Up @@ -724,7 +730,6 @@ local function LoadMacros (unload, paths)

local AreaNames = allAreas and AllAreaNames or SomeAreaNames
for _,name in pairs(AreaNames) do newAreas[name]={} end
for _,name in ipairs(EventGroups) do Events[name]={} end
for k in pairs(package.loaded) do
if initial_modules[k]==nil and not package.nounload[k] then
package.loaded[k]=nil
Expand Down Expand Up @@ -865,12 +870,12 @@ local function LoadMacros (unload, paths)

far.RecursiveSearch (DirMacros.."internal", "*.lua", LoadRecordedFile, 0)

export.ExitFAR = Events.exitfar[1] and export_ExitFAR
export.ProcessDialogEvent = Events.dialogevent[1] and export_ProcessDialogEvent
export.ProcessEditorInput = Events.editorinput[1] and export_ProcessEditorInput
export.ProcessViewerEvent = Events.viewerevent[1] and export_ProcessViewerEvent
export.ProcessConsoleInput = Events.consoleinput[1] and export_ProcessConsoleInput
export.ProcessSynchroEvent = Events.folderchanged[1] and export_ProcessSynchroEvent
export.ExitFAR = Events.exitfar and export_ExitFAR
export.ProcessDialogEvent = Events.dialogevent and export_ProcessDialogEvent
export.ProcessEditorInput = Events.editorinput and export_ProcessEditorInput
export.ProcessViewerEvent = Events.viewerevent and export_ProcessViewerEvent
export.ProcessConsoleInput = Events.consoleinput and export_ProcessConsoleInput
export.ProcessSynchroEvent = Events.folderchanged and export_ProcessSynchroEvent
if ContentColumns[1] then
export.GetContentFields = export_GetContentFields
export.GetContentData = export_GetContentData
Expand Down Expand Up @@ -1309,6 +1314,7 @@ return {
InitMacroSystem = InitMacroSystem,
LoadingInProgress = function() return LoadingInProgress end,
LoadMacros = LoadMacros,
ProcessEvent = ProcessEvent,
ProcessRecordedMacro = ProcessRecordedMacro,
RunStartMacro = RunStartMacro,
UnloadMacros = InitMacroSystem,
Expand Down