Software `/` code `/` prosody

Annotate

plugins/mod_storage_internal.lua @ 9830:d935a0f0de24

MUC: Factor out role change permission check into its own method I would like to invert this logic so that it checks if the role change is allowed instead of checking if it is not allowed as it does now, in order to make it easier to understand.

author	Kim Alvefur <zash@zash.se>
date	Sun, 24 Feb 2019 16:18:30 +0100
parent	9105:e735c9865f42
child	9883:f76bd399267c
child	10843:8fcd46ee9bf5

rev	line source
4085 7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: diff changeset	1 local datamanager = require "core.storagemanager".olddm;
8021 83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	2 local array = require "util.array";
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	3 local datetime = require "util.datetime";
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	4 local st = require "util.stanza";
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	5 local now = require "util.time".now;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	6 local id = require "util.id".medium;
4085 7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: diff changeset	7
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: diff changeset	8 local host = module.host;
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: diff changeset	9
5122 b41c33dc7c36 mod_storage_: Don't explicitly set driver name, to ease copying/renaming modules. Waqas Hussain <waqas20@gmail.com>* parents: 5121 diff changeset	10 local driver = {};
4085 7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: diff changeset	11
5153 688aeac0012a mod_storage_internal, datamanager: Add support for iterating over users with data in a store Kim Alvefur <zash@zash.se> parents: 5133 diff changeset	12 function driver:open(store, typ)
8018 9545d0a9401f mod_storage_internal: Separate driver from keyval implementation Kim Alvefur <zash@zash.se> parents: 6283 diff changeset	13 local mt = self[typ or "keyval"]
9545d0a9401f mod_storage_internal: Separate driver from keyval implementation Kim Alvefur <zash@zash.se> parents: 6283 diff changeset	14 if not mt then
6283 7cf6d3a2c855 mod_storage_{none,internal,sql}: Return error for unsupported (everything but keyval) store types Kim Alvefur <zash@zash.se> parents: 5153 diff changeset	15 return nil, "unsupported-store";
7cf6d3a2c855 mod_storage_{none,internal,sql}: Return error for unsupported (everything but keyval) store types Kim Alvefur <zash@zash.se> parents: 5153 diff changeset	16 end
8018 9545d0a9401f mod_storage_internal: Separate driver from keyval implementation Kim Alvefur <zash@zash.se> parents: 6283 diff changeset	17 return setmetatable({ store = store, type = typ }, mt);
4085 7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: diff changeset	18 end
8018 9545d0a9401f mod_storage_internal: Separate driver from keyval implementation Kim Alvefur <zash@zash.se> parents: 6283 diff changeset	19
8020 342ce07836de mod_storage_internal: Ignore unused 'self' argument [luacheck] Kim Alvefur <zash@zash.se> parents: 8019 diff changeset	20 function driver:stores(username) -- luacheck: ignore 212/self
8019 925098aad268 mod_storage_internal: Reorder methods Kim Alvefur <zash@zash.se> parents: 8018 diff changeset	21 return datamanager.stores(username, host);
925098aad268 mod_storage_internal: Reorder methods Kim Alvefur <zash@zash.se> parents: 8018 diff changeset	22 end
925098aad268 mod_storage_internal: Reorder methods Kim Alvefur <zash@zash.se> parents: 8018 diff changeset	23
8020 342ce07836de mod_storage_internal: Ignore unused 'self' argument [luacheck] Kim Alvefur <zash@zash.se> parents: 8019 diff changeset	24 function driver:purge(user) -- luacheck: ignore 212/self
8019 925098aad268 mod_storage_internal: Reorder methods Kim Alvefur <zash@zash.se> parents: 8018 diff changeset	25 return datamanager.purge(user, host);
925098aad268 mod_storage_internal: Reorder methods Kim Alvefur <zash@zash.se> parents: 8018 diff changeset	26 end
925098aad268 mod_storage_internal: Reorder methods Kim Alvefur <zash@zash.se> parents: 8018 diff changeset	27
8018 9545d0a9401f mod_storage_internal: Separate driver from keyval implementation Kim Alvefur <zash@zash.se> parents: 6283 diff changeset	28 local keyval = { };
9545d0a9401f mod_storage_internal: Separate driver from keyval implementation Kim Alvefur <zash@zash.se> parents: 6283 diff changeset	29 driver.keyval = { __index = keyval };
9545d0a9401f mod_storage_internal: Separate driver from keyval implementation Kim Alvefur <zash@zash.se> parents: 6283 diff changeset	30
9545d0a9401f mod_storage_internal: Separate driver from keyval implementation Kim Alvefur <zash@zash.se> parents: 6283 diff changeset	31 function keyval:get(user)
4085 7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: diff changeset	32 return datamanager.load(user, host, self.store);
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: diff changeset	33 end
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: diff changeset	34
8018 9545d0a9401f mod_storage_internal: Separate driver from keyval implementation Kim Alvefur <zash@zash.se> parents: 6283 diff changeset	35 function keyval:set(user, data)
4085 7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: diff changeset	36 return datamanager.store(user, host, self.store, data);
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: diff changeset	37 end
7699cef04740 storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code Matthew Wild <mwild1@gmail.com> parents: diff changeset	38
8018 9545d0a9401f mod_storage_internal: Separate driver from keyval implementation Kim Alvefur <zash@zash.se> parents: 6283 diff changeset	39 function keyval:users()
5153 688aeac0012a mod_storage_internal, datamanager: Add support for iterating over users with data in a store Kim Alvefur <zash@zash.se> parents: 5133 diff changeset	40 return datamanager.users(host, self.store, self.type);
688aeac0012a mod_storage_internal, datamanager: Add support for iterating over users with data in a store Kim Alvefur <zash@zash.se> parents: 5133 diff changeset	41 end
688aeac0012a mod_storage_internal, datamanager: Add support for iterating over users with data in a store Kim Alvefur <zash@zash.se> parents: 5133 diff changeset	42
8021 83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	43 local archive = {};
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	44 driver.archive = { __index = archive };
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	45
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	46 function archive:append(username, key, value, when, with)
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	47 when = when or now();
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	48 if not st.is_stanza(value) then
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	49 return nil, "unsupported-datatype";
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	50 end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	51 value = st.preserialize(st.clone(value));
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	52 value.when = when;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	53 value.with = with;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	54 value.attr.stamp = datetime.datetime(when);
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	55 value.attr.stamp_legacy = datetime.legacy(when);
8309 5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	56
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	57 if key then
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	58 local items, err = datamanager.list_load(username, host, self.store);
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	59 if not items and err then return items, err; end
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	60 if items then
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	61 items = array(items);
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	62 items:filter(function (item)
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	63 return item.key ~= key;
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	64 end);
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	65 value.key = key;
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	66 items:push(value);
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	67 local ok, err = datamanager.list_store(username, host, self.store, items);
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	68 if not ok then return ok, err; end
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	69 return key;
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	70 end
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	71 else
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	72 key = id();
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	73 end
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	74
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	75 value.key = key;
5281c479955a mod_storage_internal: Add support for archive key deduplication (like mod_storage_sql) Kim Alvefur <zash@zash.se> parents: 8173 diff changeset	76
8021 83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	77 local ok, err = datamanager.list_append(username, host, self.store, value);
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	78 if not ok then return ok, err; end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	79 return key;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	80 end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	81
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	82 function archive:find(username, query)
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	83 local items, err = datamanager.list_load(username, host, self.store);
8173 3ff99d49082f mod_storage_internal: Return a noop iterator if archive is empty (fixes #920) Kim Alvefur <zash@zash.se> parents: 8143 diff changeset	84 if not items then
3ff99d49082f mod_storage_internal: Return a noop iterator if archive is empty (fixes #920) Kim Alvefur <zash@zash.se> parents: 8143 diff changeset	85 if err then
3ff99d49082f mod_storage_internal: Return a noop iterator if archive is empty (fixes #920) Kim Alvefur <zash@zash.se> parents: 8143 diff changeset	86 return items, err;
3ff99d49082f mod_storage_internal: Return a noop iterator if archive is empty (fixes #920) Kim Alvefur <zash@zash.se> parents: 8143 diff changeset	87 else
3ff99d49082f mod_storage_internal: Return a noop iterator if archive is empty (fixes #920) Kim Alvefur <zash@zash.se> parents: 8143 diff changeset	88 return function () end, 0;
3ff99d49082f mod_storage_internal: Return a noop iterator if archive is empty (fixes #920) Kim Alvefur <zash@zash.se> parents: 8143 diff changeset	89 end
3ff99d49082f mod_storage_internal: Return a noop iterator if archive is empty (fixes #920) Kim Alvefur <zash@zash.se> parents: 8143 diff changeset	90 end
8021 83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	91 local count = #items;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	92 local i = 0;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	93 if query then
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	94 items = array(items);
8089 4ba8cb75d925 mod_storage_internal: Support the 'key' archive query field Kim Alvefur <zash@zash.se> parents: 8023 diff changeset	95 if query.key then
4ba8cb75d925 mod_storage_internal: Support the 'key' archive query field Kim Alvefur <zash@zash.se> parents: 8023 diff changeset	96 items:filter(function (item)
4ba8cb75d925 mod_storage_internal: Support the 'key' archive query field Kim Alvefur <zash@zash.se> parents: 8023 diff changeset	97 return item.key == query.key;
4ba8cb75d925 mod_storage_internal: Support the 'key' archive query field Kim Alvefur <zash@zash.se> parents: 8023 diff changeset	98 end);
4ba8cb75d925 mod_storage_internal: Support the 'key' archive query field Kim Alvefur <zash@zash.se> parents: 8023 diff changeset	99 end
8021 83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	100 if query.with then
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	101 items:filter(function (item)
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	102 return item.with == query.with;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	103 end);
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	104 end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	105 if query.start then
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	106 items:filter(function (item)
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	107 return item.when >= query.start;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	108 end);
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	109 end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	110 if query["end"] then
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	111 items:filter(function (item)
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	112 return item.when <= query["end"];
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	113 end);
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	114 end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	115 count = #items;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	116 if query.reverse then
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	117 items:reverse();
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	118 if query.before then
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	119 for j = 1, count do
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	120 if (items[j].key or tostring(j)) == query.before then
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	121 i = j;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	122 break;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	123 end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	124 end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	125 end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	126 elseif query.after then
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	127 for j = 1, count do
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	128 if (items[j].key or tostring(j)) == query.after then
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	129 i = j;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	130 break;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	131 end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	132 end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	133 end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	134 if query.limit and #items - i > query.limit then
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	135 items[i+query.limit+1] = nil;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	136 end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	137 end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	138 return function ()
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	139 i = i + 1;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	140 local item = items[i];
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	141 if not item then return; end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	142 local key = item.key or tostring(i);
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	143 local when = item.when or datetime.parse(item.attr.stamp);
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	144 local with = item.with;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	145 item.key, item.when, item.with = nil, nil, nil;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	146 item.attr.stamp = nil;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	147 item.attr.stamp_legacy = nil;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	148 item = st.deserialize(item);
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	149 return key, item, when, with;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	150 end, count;
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	151 end
83f18982bcfd mod_storage_internal: Add basic archive store implementation Kim Alvefur <zash@zash.se> parents: 8020 diff changeset	152
8023 5a9d491cc714 mod_storage_internal: Add the dates method Kim Alvefur <zash@zash.se> parents: 8022 diff changeset	153 function archive:dates(username)
5a9d491cc714 mod_storage_internal: Add the dates method Kim Alvefur <zash@zash.se> parents: 8022 diff changeset	154 local items, err = datamanager.list_load(username, host, self.store);
5a9d491cc714 mod_storage_internal: Add the dates method Kim Alvefur <zash@zash.se> parents: 8022 diff changeset	155 if not items then return items, err; end
5a9d491cc714 mod_storage_internal: Add the dates method Kim Alvefur <zash@zash.se> parents: 8022 diff changeset	156 return array(items):pluck("when"):map(datetime.date):unique();
5a9d491cc714 mod_storage_internal: Add the dates method Kim Alvefur <zash@zash.se> parents: 8022 diff changeset	157 end
5a9d491cc714 mod_storage_internal: Add the dates method Kim Alvefur <zash@zash.se> parents: 8022 diff changeset	158
8022 05e201468f27 mod_storage_internal: Add support for removing archived items Kim Alvefur <zash@zash.se> parents: 8021 diff changeset	159 function archive:delete(username, query)
05e201468f27 mod_storage_internal: Add support for removing archived items Kim Alvefur <zash@zash.se> parents: 8021 diff changeset	160 if not query or next(query) == nil then
05e201468f27 mod_storage_internal: Add support for removing archived items Kim Alvefur <zash@zash.se> parents: 8021 diff changeset	161 return datamanager.list_store(username, host, self.store, nil);
05e201468f27 mod_storage_internal: Add support for removing archived items Kim Alvefur <zash@zash.se> parents: 8021 diff changeset	162 end
05e201468f27 mod_storage_internal: Add support for removing archived items Kim Alvefur <zash@zash.se> parents: 8021 diff changeset	163 local items, err = datamanager.list_load(username, host, self.store);
8143 c4c159953c72 mod_storage_internal: Handle case of empty item store when deleting (fixes #910) Kim Alvefur <zash@zash.se> parents: 8142 diff changeset	164 if not items then
c4c159953c72 mod_storage_internal: Handle case of empty item store when deleting (fixes #910) Kim Alvefur <zash@zash.se> parents: 8142 diff changeset	165 if err then
c4c159953c72 mod_storage_internal: Handle case of empty item store when deleting (fixes #910) Kim Alvefur <zash@zash.se> parents: 8142 diff changeset	166 return items, err;
c4c159953c72 mod_storage_internal: Handle case of empty item store when deleting (fixes #910) Kim Alvefur <zash@zash.se> parents: 8142 diff changeset	167 end
c4c159953c72 mod_storage_internal: Handle case of empty item store when deleting (fixes #910) Kim Alvefur <zash@zash.se> parents: 8142 diff changeset	168 -- Store is empty
c4c159953c72 mod_storage_internal: Handle case of empty item store when deleting (fixes #910) Kim Alvefur <zash@zash.se> parents: 8142 diff changeset	169 return 0;
c4c159953c72 mod_storage_internal: Handle case of empty item store when deleting (fixes #910) Kim Alvefur <zash@zash.se> parents: 8142 diff changeset	170 end
8022 05e201468f27 mod_storage_internal: Add support for removing archived items Kim Alvefur <zash@zash.se> parents: 8021 diff changeset	171 items = array(items);
8142 13e075549cb3 mod_storage_internal: Correctly calculate number of deleted items (fixes #912) Kim Alvefur <zash@zash.se> parents: 8089 diff changeset	172 local count_before = #items;
8310 1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	173 if query then
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	174 if query.key then
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	175 items:filter(function (item)
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	176 return item.key ~= query.key;
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	177 end);
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	178 end
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	179 if query.with then
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	180 items:filter(function (item)
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	181 return item.with ~= query.with;
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	182 end);
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	183 end
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	184 if query.start then
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	185 items:filter(function (item)
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	186 return item.when < query.start;
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	187 end);
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	188 end
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	189 if query["end"] then
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	190 items:filter(function (item)
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	191 return item.when > query["end"];
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	192 end);
1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	193 end
9105 e735c9865f42 mod_storage_internal: Only apply truncate if there are more items than requested Kim Alvefur <zash@zash.se> parents: 8402 diff changeset	194 if query.truncate and #items > query.truncate then
8393 b6a7b83f8d87 mod_storage_internal: Allow truncating deletion at the beginning or end of an archive store Kim Alvefur <zash@zash.se> parents: 8310 diff changeset	195 if query.reverse then
b6a7b83f8d87 mod_storage_internal: Allow truncating deletion at the beginning or end of an archive store Kim Alvefur <zash@zash.se> parents: 8310 diff changeset	196 -- Before: { 1, 2, 3, 4, 5, }
b6a7b83f8d87 mod_storage_internal: Allow truncating deletion at the beginning or end of an archive store Kim Alvefur <zash@zash.se> parents: 8310 diff changeset	197 -- After: { 1, 2, 3 }
8394 4892c22403d5 mod_storage_internal: Optimize truncation Kim Alvefur <zash@zash.se> parents: 8393 diff changeset	198 for i = #items, query.truncate + 1, -1 do
4892c22403d5 mod_storage_internal: Optimize truncation Kim Alvefur <zash@zash.se> parents: 8393 diff changeset	199 items[i] = nil;
8393 b6a7b83f8d87 mod_storage_internal: Allow truncating deletion at the beginning or end of an archive store Kim Alvefur <zash@zash.se> parents: 8310 diff changeset	200 end
b6a7b83f8d87 mod_storage_internal: Allow truncating deletion at the beginning or end of an archive store Kim Alvefur <zash@zash.se> parents: 8310 diff changeset	201 else
b6a7b83f8d87 mod_storage_internal: Allow truncating deletion at the beginning or end of an archive store Kim Alvefur <zash@zash.se> parents: 8310 diff changeset	202 -- Before: { 1, 2, 3, 4, 5, }
b6a7b83f8d87 mod_storage_internal: Allow truncating deletion at the beginning or end of an archive store Kim Alvefur <zash@zash.se> parents: 8310 diff changeset	203 -- After: { 3, 4, 5 }
8394 4892c22403d5 mod_storage_internal: Optimize truncation Kim Alvefur <zash@zash.se> parents: 8393 diff changeset	204 local offset = #items - query.truncate;
4892c22403d5 mod_storage_internal: Optimize truncation Kim Alvefur <zash@zash.se> parents: 8393 diff changeset	205 for i = 1, #items do
4892c22403d5 mod_storage_internal: Optimize truncation Kim Alvefur <zash@zash.se> parents: 8393 diff changeset	206 items[i] = items[i+offset];
8393 b6a7b83f8d87 mod_storage_internal: Allow truncating deletion at the beginning or end of an archive store Kim Alvefur <zash@zash.se> parents: 8310 diff changeset	207 end
b6a7b83f8d87 mod_storage_internal: Allow truncating deletion at the beginning or end of an archive store Kim Alvefur <zash@zash.se> parents: 8310 diff changeset	208 end
b6a7b83f8d87 mod_storage_internal: Allow truncating deletion at the beginning or end of an archive store Kim Alvefur <zash@zash.se> parents: 8310 diff changeset	209 end
8310 1759491b53db mod_storage_internal: Add more extensive query support to archive:delete method Kim Alvefur <zash@zash.se> parents: 8309 diff changeset	210 end
8142 13e075549cb3 mod_storage_internal: Correctly calculate number of deleted items (fixes #912) Kim Alvefur <zash@zash.se> parents: 8089 diff changeset	211 local count = count_before - #items;
8402 469afa02947b mod_storage_internal: Skip write if no items matched a deletion query Kim Alvefur <zash@zash.se> parents: 8394 diff changeset	212 if count == 0 then
469afa02947b mod_storage_internal: Skip write if no items matched a deletion query Kim Alvefur <zash@zash.se> parents: 8394 diff changeset	213 return 0; -- No changes, skip write
469afa02947b mod_storage_internal: Skip write if no items matched a deletion query Kim Alvefur <zash@zash.se> parents: 8394 diff changeset	214 end
8022 05e201468f27 mod_storage_internal: Add support for removing archived items Kim Alvefur <zash@zash.se> parents: 8021 diff changeset	215 local ok, err = datamanager.list_store(username, host, self.store, items);
05e201468f27 mod_storage_internal: Add support for removing archived items Kim Alvefur <zash@zash.se> parents: 8021 diff changeset	216 if not ok then return ok, err; end
05e201468f27 mod_storage_internal: Add support for removing archived items Kim Alvefur <zash@zash.se> parents: 8021 diff changeset	217 return count;
05e201468f27 mod_storage_internal: Add support for removing archived items Kim Alvefur <zash@zash.se> parents: 8021 diff changeset	218 end
05e201468f27 mod_storage_internal: Add support for removing archived items Kim Alvefur <zash@zash.se> parents: 8021 diff changeset	219
5121 b5a5643f8572 core.storagemanager, mod_storage_: "data-driver" -> "storage-provider", to allow using module:provides(). Waqas Hussain <waqas20@gmail.com>* parents: 5039 diff changeset	220 module:provides("storage", driver);

prosody

d935a0f0de24

plugins/mod_storage_internal.lua

Software / code / prosody

Annotate

plugins/mod_storage_internal.lua @ 9830:d935a0f0de24

Software `/` code `/` prosody