From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 17 Aug 2018 19:30:22 +0000 (+0100)
Subject: [Minor] Rework lists
X-Git-Tag: 1.8.0~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fdf4b3304a6101ceca3b53ae56307cb9d7147ae;p=thirdparty%2Frspamd.git

[Minor] Rework lists
---

diff --git a/lualib/lua_selectors.lua b/lualib/lua_selectors.lua
index d2723b6309..960d15a246 100644
--- a/lualib/lua_selectors.lua
+++ b/lualib/lua_selectors.lua
@@ -164,14 +164,14 @@ local selectors = {
   -- Get header with the name that is expected as an argument. Returns list of
   -- headers with this name
   ['header'] = {
-    ['type'] = 'header_list',
+    ['type'] = 'kv_list',
     ['get_value'] = function(task, args)
       return task:get_header_full(args[1])
     end,
   },
   -- Get list of received headers (returns list of tables)
   ['received'] = {
-    ['type'] = 'received_list',
+    ['type'] = 'kv_list',
     ['get_value'] = function(task)
       return task:get_received_headers()
     end,
@@ -245,7 +245,7 @@ local transform_function = {
   ['first'] = {
     ['types'] = {
       ['url_list'] = true,
-      ['header_list'] = true,
+      ['kv_list'] = true,
       ['received_list'] = true,
       ['string_list'] = true
     },
@@ -258,8 +258,7 @@ local transform_function = {
   ['last'] = {
     ['types'] = {
       ['url_list'] = true,
-      ['header_list'] = true,
-      ['received_list'] = true,
+      ['kv_list'] = true,
       ['string_list'] = true
     },
     ['process'] = function(inp, t)
@@ -271,8 +270,7 @@ local transform_function = {
   ['nth'] = {
     ['types'] = {
       ['url_list'] = true,
-      ['header_list'] = true,
-      ['received_list'] = true,
+      ['kv_list'] = true,
       ['string_list'] = true
     },
     ['process'] = function(inp, t, args)
@@ -331,38 +329,16 @@ local transform_function = {
       return inp:sub(start_pos, end_pos), 'string'
     end
   },
-  -- Get header value
-  ['hdr_value'] = {
-    ['types'] = {
-      ['header'] = true,
-    },
-    ['map_type'] = 'string',
-    ['process'] = function(inp, _)
-      return inp.value
-    end
-  },
-  -- Get header raw value
-  ['hdr_raw'] = {
-    ['types'] = {
-      ['header'] = true,
-    },
-    ['map_type'] = 'string',
-    ['process'] = function(inp, _)
-      return inp.raw
-    end
-  },
-  -- Extracts table value from table
+  -- Extracts table value from key-value list
   ['elt'] = {
     ['types'] = {
-      ['header'] = true,
-      ['received'] = true,
+      ['kv_list'] = true,
     },
-    ['map_type'] = 'string',
     ['process'] = function(inp, t, args)
       return inp[args[1]],'string'
     end
   },
-  -- Get address
+  -- Call specific userdata method
   ['method'] = {
     ['types'] = {
       ['email'] = true,