mirrors/ctrl
mirrors/ctrl
1
0
Fork 0
mirror of https://github.com/postmannen/ctrl.git synced 2024-12-14 12:37:31 +00:00
Code Activity

REQToFile<x> now honor the directory path specified

Browse source
This commit is contained in:
postmannen 2022-06-22 11:03:59 +02:00
parent fc3d69a94b
commit 433541fcc1
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -665,6 +665,8 @@ If used as a **replyMethod** set the **replyMethodArgs** `"replyMethodArgs": ["s
Append the output of the reply message to a log file specified with the `directory` and `fileName` fields. Append the output of the reply message to a log file specified with the `directory` and `fileName` fields.
If the value of the **directory** field is not prefixed with `./` or `/` the directory structure file will be created within the **steward data folder** specified in the config file.
```json ```json
[ [
{ {
@ -682,6 +684,8 @@ Append the output of the reply message to a log file specified with the `directo
Write the output of the reply message to a file specified with the `directory` and `fileName` fields, where the writing will write over any existing content of that file. Write the output of the reply message to a file specified with the `directory` and `fileName` fields, where the writing will write over any existing content of that file.
If the value of the **directory** field is not prefixed with `./` or `/` the directory structure file will be created within the **steward data folder** specified in the config file.
```json ```json
[ [
{ {

25
requests.go
View file

@ -488,20 +488,37 @@ func newReplyMessage(proc process, message Message, outData []byte) {
// to create. // to create.
func selectFileNaming(message Message, proc process) (string, string) { func selectFileNaming(message Message, proc process) (string, string) {
var fileName string var fileName string
var folderTree string // As default we set the folder tree to what is specified in the
// message.Directory field. If we don't want that in the checks
// done later we then replace the value with what we want.
folderTree := message.Directory
checkPrefix := func(s string) bool {
if strings.HasPrefix(s, "./") || strings.HasPrefix(s, "/") {
return true
}
return false
}
switch { switch {
case message.PreviousMessage == nil: case message.PreviousMessage == nil:
// If this was a direct request there are no previous message to take // If this was a direct request there are no previous message to take
// information from, so we use the one that are in the current mesage. // information from, so we use the one that are in the current mesage.
fileName = message.FileName fileName = message.FileName
folderTree = filepath.Join(proc.configuration.SubscribersDataFolder, message.Directory, string(message.ToNode)) if !checkPrefix(message.Directory) {
folderTree = filepath.Join(proc.configuration.SubscribersDataFolder, message.Directory, string(message.ToNode))
}
case message.PreviousMessage.ToNode != "": case message.PreviousMessage.ToNode != "":
fileName = message.PreviousMessage.FileName fileName = message.PreviousMessage.FileName
folderTree = filepath.Join(proc.configuration.SubscribersDataFolder, message.PreviousMessage.Directory, string(message.PreviousMessage.ToNode)) if !checkPrefix(message.PreviousMessage.Directory) {
folderTree = filepath.Join(proc.configuration.SubscribersDataFolder, message.PreviousMessage.Directory, string(message.PreviousMessage.ToNode))
}
case message.PreviousMessage.ToNode == "": case message.PreviousMessage.ToNode == "":
fileName = message.PreviousMessage.FileName fileName = message.PreviousMessage.FileName
folderTree = filepath.Join(proc.configuration.SubscribersDataFolder, message.PreviousMessage.Directory, string(message.FromNode)) if !checkPrefix(message.PreviousMessage.Directory) {
folderTree = filepath.Join(proc.configuration.SubscribersDataFolder, message.PreviousMessage.Directory, string(message.FromNode))
}
} }
return fileName, folderTree return fileName, folderTree