From 12cf0013e2d7b65f66d014451a3c90272d9246bc Mon Sep 17 00:00:00 2001
From: James Read <contact@jread.com>
Date: Fri, 26 Apr 2024 00:32:58 +0100
Subject: [PATCH] feature: extra args for fileindir (#291)

---
 internal/executor/arguments.go    | 1 +
 internal/onfileindir/fileindir.go | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/internal/executor/arguments.go b/internal/executor/arguments.go
index 1ce7c16..491fd70 100644
--- a/internal/executor/arguments.go
+++ b/internal/executor/arguments.go
@@ -16,6 +16,7 @@ var (
 	typecheckRegex = map[string]string{
 		"very_dangerous_raw_string": "",
 		"int":                       "^[\\d]+$",
+		"unicode_identifier":        "^[\\w\\/\\\\.\\_ \\d]+$",
 		"ascii":                     "^[a-zA-Z0-9]+$",
 		"ascii_identifier":          "^[a-zA-Z0-9\\-\\.\\_]+$",
 		"ascii_sentence":            "^[a-zA-Z0-9 \\,\\.]+$",
diff --git a/internal/onfileindir/fileindir.go b/internal/onfileindir/fileindir.go
index fbcbcee..9435589 100644
--- a/internal/onfileindir/fileindir.go
+++ b/internal/onfileindir/fileindir.go
@@ -5,6 +5,7 @@ import (
 	"github.com/OliveTin/OliveTin/internal/config"
 	"github.com/OliveTin/OliveTin/internal/executor"
 	"github.com/OliveTin/OliveTin/internal/filehelper"
+	"path/filepath"
 )
 
 func WatchFilesInDirectory(cfg *config.Config, ex *executor.Executor) {
@@ -23,13 +24,17 @@ func WatchFilesInDirectory(cfg *config.Config, ex *executor.Executor) {
 	}
 }
 
-func scheduleExec(action *config.Action, cfg *config.Config, ex *executor.Executor, filename string) {
+func scheduleExec(action *config.Action, cfg *config.Config, ex *executor.Executor, path string) {
 	req := &executor.ExecutionRequest{
 		ActionTitle: action.Title,
 		Cfg:         cfg,
 		Tags:        []string{"fileindir"},
 		Arguments: map[string]string{
-			"filename": filename,
+			"filepath": filepath.Base(path),
+			"filename": filepath.Base(path),
+			"filedir": filepath.Dir(path),
+			"fileext": filepath.Ext(path),
+
 		},
 		AuthenticatedUser: &acl.AuthenticatedUser{
 			Username: "fileindir",