From 3a6c27904b641e81d36a6a625de3daf9833b6a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 13:50:25 +0200 Subject: [PATCH 01/27] Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..ec02458a --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# fxserver-esx_datastore +FXServer ESX DataStore From 21a38402a278fd7bcaf05c751546c5bd7e1487d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 13:56:33 +0200 Subject: [PATCH 02/27] Update README.md --- README.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/README.md b/README.md index ec02458a..94257ea7 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,53 @@ # fxserver-esx_datastore FXServer ESX DataStore + +[INSTALLATION] + +1) CD in your resources folder +2) Clone the repository +``` +git clone https://github.com/FXServer-ESX/fxserver-esx_datastore esx_datastore +``` +3) Import esx_datastore.sql in your database +1) Add this in your server.cfg : + +``` +start esx_datastore +``` + +[USAGE] + +There is two types of datastores : shared and not shared. + +- Shared datastores dont belong to a specific user. Example : property (weapons, dressing). +- Not shared datastores are created for every user in the server. They are created in db when player is loaded, Example : police armory + +You must create the datastore in the database (datastore) before using it : + +name = name of the datastore, label = label of the datastore, shared (0 or 1) = Is datastore shared + +``` +TriggerEvent('esx_datastore:getSharedDataStore', 'police', function(store) + + local weapons = store.get('weapons') + + if weapons == nil then + weapons = {} + end + + table.insert(weapons, {name = 'WEAPON_PUMPSHOTGUN', ammo = 50}) + + store.set('weapons', weapons) + +end) + +TriggerEvent('esx_datastore:getDataStore', 'property', 'steam:0123456789', function(store) + + local dressing = store.get('dressing') + + if dressing == nil then + dressing = {} + end + +end) +``` From 4dacb8eef133f85f6be3ac8e4db871def960391d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 13:58:37 +0200 Subject: [PATCH 03/27] Add files --- __resource.lua | 9 +++ esx_datastore.sql | 15 +++++ server/classes/datastore.lua | 44 ++++++++++++++ server/main.lua | 112 +++++++++++++++++++++++++++++++++++ 4 files changed, 180 insertions(+) create mode 100644 __resource.lua create mode 100644 esx_datastore.sql create mode 100644 server/classes/datastore.lua create mode 100644 server/main.lua diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..41f5b73e --- /dev/null +++ b/__resource.lua @@ -0,0 +1,9 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX DataStore' + +server_scripts { + '@mysql-async/lib/MySQL.lua', + 'server/classes/datastore.lua', + 'server/main.lua' +} \ No newline at end of file diff --git a/esx_datastore.sql b/esx_datastore.sql new file mode 100644 index 00000000..d9bc4fd5 --- /dev/null +++ b/esx_datastore.sql @@ -0,0 +1,15 @@ +CREATE TABLE `datastore` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `label` varchar(255) NOT NULL, + `shared` int(11) NOT NULL, + PRIMARY KEY (`id`) +); + +CREATE TABLE `datastore_data` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `owner` varchar(255) NOT NULL, + `data` longtext, + PRIMARY KEY (`id`) +); \ No newline at end of file diff --git a/server/classes/datastore.lua b/server/classes/datastore.lua new file mode 100644 index 00000000..482c493c --- /dev/null +++ b/server/classes/datastore.lua @@ -0,0 +1,44 @@ +function CreateDataStore(name, owner, data) + + local self = {} + + self.name = name + self.owner = owner + self.data = data + + self.set = function(key, val) + data[key] = val + self.save() + end + + self.get = function(key) + return data[key] + end + + self.save = function() + + if self.owner == nil then + MySQL.Async.execute( + 'UPDATE datastore_data SET data = @data WHERE name = @name', + { + ['@data'] = json.encode(self.data), + ['@name'] = self.name, + } + ) + else + MySQL.Async.execute( + 'UPDATE datastore_data SET data = @data WHERE name = @name and owner = @owner', + { + ['@data'] = json.encode(self.data), + ['@name'] = self.name, + ['@owner'] = self.owner, + } + ) + end + + end + + return self + +end + diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..f5f1e7d3 --- /dev/null +++ b/server/main.lua @@ -0,0 +1,112 @@ +ESX = nil +Items = {} +local DataStoresIndex = {} +local DataStores = {} +local SharedDatastores = {} + + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +AddEventHandler('onMySQLReady', function() + + local result = MySQL.Sync.fetchAll('SELECT * FROM datastore') + + for i=1, #result, 1 do + + local name = result[i].name + local label = result[i].label + local shared = result[i].shared + + local result2 = MySQL.Sync.fetchAll( + 'SELECT * FROM datastore_data WHERE name = @name', + { + ['@name'] = name + } + ) + + if shared == 0 then + + table.insert(DataStoresIndex, name) + + DataStores[name] = {} + + for j=1, #result2, 1 do + + local storeName = result2[j].name + local storeOwner = result2[j].owner + local storeData = (result2[j].data == nil and {} or json.decode(result2[j].data)) + + local dataStore = CreateDataStore(storeName, storeOwner, storeData) + + table.insert(DataStores[name], dataStore) + + end + + else + + local items = {} + + local storeName = result2[1].name + local storeData = (result2[1].data == nil and {} or json.decode(result2[1].data)) + + local dataStore = CreateDataStore(storeName, nil, storeData) + SharedDatastores[name] = dataStore + + end + + end + +end) + +function GetDataStore(name, owner) + for i=1, #DataStores[name], 1 do + if DataStores[name][i].owner == owner then + return DataStores[name][i] + end + end +end + +function GetSharedDataStore(name) + return SharedDataStores[name] +end + +AddEventHandler('esx_datastore:getDataStore', function(name, owner, cb) + cb(GetDataStore(name, owner)) +end) + +AddEventHandler('esx_datastore:getSharedDataStore', function(name, cb) + cb(GetSharedDataStore(name)) +end) + +AddEventHandler('esx:playerLoaded', function(source) + + local xPlayer = ESX.GetPlayerFromId(source) + local dataStores = {} + + for i=1, #DataStoresIndex, 1 do + + local name = DataStoresIndex[i] + local dataStore = GetDataStore(name, xPlayer.identifier) + + if dataStore == nil then + + MySQL.Async.execute( + 'INSERT INTO datastore_data (name, owner, data) VALUES (@name, @owner, @data)', + { + ['@name'] = name, + ['@owner'] = xPlayer.identifier, + ['@data'] = '{}' + } + ) + + dataStore = CreateDataStore(name, xPlayer.identifier, {}) + table.insert(DataStores[name], dataStore) + end + + table.insert(dataStores, dataStore) + + end + + xPlayer.set('dataStores', dataStores) + +end) From 14b8c27bb6a293af26b5cd5d60f939d1375fe430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 14:07:20 +0200 Subject: [PATCH 04/27] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94257ea7..9757fde1 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ FXServer ESX DataStore [INSTALLATION] -1) CD in your resources folder +1) CD in your resources/[ESX] folder 2) Clone the repository ``` git clone https://github.com/FXServer-ESX/fxserver-esx_datastore esx_datastore From 8a2715535aa9841c205e256b494697c80cd2451c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 14:09:34 +0200 Subject: [PATCH 05/27] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9757fde1..46ad022a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ FXServer ESX DataStore [INSTALLATION] -1) CD in your resources/[ESX] folder +1) CD in your resources/[esx] folder 2) Clone the repository ``` git clone https://github.com/FXServer-ESX/fxserver-esx_datastore esx_datastore From 0d2f61a3a6f7d0a655d4461896132ade9194a355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Mon, 7 Aug 2017 12:21:06 +0200 Subject: [PATCH 06/27] Update esx_datastore.sql --- esx_datastore.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/esx_datastore.sql b/esx_datastore.sql index d9bc4fd5..a8d46654 100644 --- a/esx_datastore.sql +++ b/esx_datastore.sql @@ -1,3 +1,5 @@ +USE `essentialmode`; + CREATE TABLE `datastore` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL, @@ -12,4 +14,4 @@ CREATE TABLE `datastore_data` ( `owner` varchar(255) NOT NULL, `data` longtext, PRIMARY KEY (`id`) -); \ No newline at end of file +); From 4e9b529b4c748085542797bb23ee72a280150a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 8 Aug 2017 19:13:58 +0200 Subject: [PATCH 07/27] Fix shared DataStore bug --- esx_datastore.sql | 2 +- server/main.lua | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/esx_datastore.sql b/esx_datastore.sql index d9bc4fd5..9a0632a9 100644 --- a/esx_datastore.sql +++ b/esx_datastore.sql @@ -9,7 +9,7 @@ CREATE TABLE `datastore` ( CREATE TABLE `datastore_data` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL, - `owner` varchar(255) NOT NULL, + `owner` varchar(255), `data` longtext, PRIMARY KEY (`id`) ); \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index f5f1e7d3..a89d8b21 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,7 +2,7 @@ ESX = nil Items = {} local DataStoresIndex = {} local DataStores = {} -local SharedDatastores = {} +local SharedDataStores = {} TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) @@ -44,13 +44,25 @@ AddEventHandler('onMySQLReady', function() else - local items = {} + local data = nil - local storeName = result2[1].name - local storeData = (result2[1].data == nil and {} or json.decode(result2[1].data)) + if #result2 == 0 then - local dataStore = CreateDataStore(storeName, nil, storeData) - SharedDatastores[name] = dataStore + MySQL.Sync.execute( + 'INSERT INTO datastore_data (name, owner, data) VALUES (@name, NULL, \'{}\')', + { + ['@name'] = name, + } + ) + + data = {} + + else + data = json.decode(result2[1].data) + end + + local dataStore = CreateDataStore(name, nil, data) + SharedDataStores[name] = dataStore end From 109034e5762853b91c69a55b5607d47a1c4f2c48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 9 Aug 2017 14:11:27 +0200 Subject: [PATCH 08/27] Add LICENSE.txt --- LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..30ace6a8 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file From 2fa1b2b4c3ae8f2a51fed97fb20542f1c42270b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 30 Aug 2017 17:22:57 +0200 Subject: [PATCH 09/27] Add timeouts to save data --- server/classes/datastore.lua | 47 +++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/server/classes/datastore.lua b/server/classes/datastore.lua index 482c493c..cfab64d6 100644 --- a/server/classes/datastore.lua +++ b/server/classes/datastore.lua @@ -6,6 +6,8 @@ function CreateDataStore(name, owner, data) self.owner = owner self.data = data + local timeoutCallbacks = {} + self.set = function(key, val) data[key] = val self.save() @@ -17,25 +19,36 @@ function CreateDataStore(name, owner, data) self.save = function() - if self.owner == nil then - MySQL.Async.execute( - 'UPDATE datastore_data SET data = @data WHERE name = @name', - { - ['@data'] = json.encode(self.data), - ['@name'] = self.name, - } - ) - else - MySQL.Async.execute( - 'UPDATE datastore_data SET data = @data WHERE name = @name and owner = @owner', - { - ['@data'] = json.encode(self.data), - ['@name'] = self.name, - ['@owner'] = self.owner, - } - ) + for i=1, #timeoutCallbacks, 1 do + ESX.ClearTimeout(timeoutCallbacks[i]) + timeoutCallbacks[i] = nil end + local timeoutCallback = ESX.SetTimeout(10000, function() + + if self.owner == nil then + MySQL.Async.execute( + 'UPDATE datastore_data SET data = @data WHERE name = @name', + { + ['@data'] = json.encode(self.data), + ['@name'] = self.name, + } + ) + else + MySQL.Async.execute( + 'UPDATE datastore_data SET data = @data WHERE name = @name and owner = @owner', + { + ['@data'] = json.encode(self.data), + ['@name'] = self.name, + ['@owner'] = self.owner, + } + ) + end + + end) + + table.insert(timeoutCallbacks, timeoutCallback) + end return self From 600e0d5a1f76294defe2914b2bb27b9b30bbcef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 13 Sep 2017 14:49:27 +0200 Subject: [PATCH 10/27] Add GetDataStoreOwners --- server/main.lua | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/server/main.lua b/server/main.lua index a89d8b21..4bb0b031 100644 --- a/server/main.lua +++ b/server/main.lua @@ -78,6 +78,18 @@ function GetDataStore(name, owner) end end +function GetDataStoreOwners(name) + + local identifiers = {} + + for i=1, #DataStores[name], 1 do + table.insert(identifiers, DataStores[name][i].owner) + end + + return identifiers + +end + function GetSharedDataStore(name) return SharedDataStores[name] end @@ -86,6 +98,10 @@ AddEventHandler('esx_datastore:getDataStore', function(name, owner, cb) cb(GetDataStore(name, owner)) end) +AddEventHandler('esx_datastore:getDataStoreOwners', function(name, cb) + cb(GetDataStoreOwners(name)) +end) + AddEventHandler('esx_datastore:getSharedDataStore', function(name, cb) cb(GetSharedDataStore(name)) end) From 40e0d72491d1d5ca8044a355c17f185f1c5a0603 Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Thu, 14 Sep 2017 16:51:17 +0200 Subject: [PATCH 11/27] chore(coding-style): correct indentation --- .editorconfig | 9 +++ __resource.lua | 8 +- server/classes/datastore.lua | 80 +++++++++---------- server/main.lua | 150 +++++++++++++++++------------------ 4 files changed, 128 insertions(+), 119 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..41c2aaf2 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 2 +indent_style = space +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true \ No newline at end of file diff --git a/__resource.lua b/__resource.lua index 41f5b73e..178a2cf1 100644 --- a/__resource.lua +++ b/__resource.lua @@ -3,7 +3,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX DataStore' server_scripts { - '@mysql-async/lib/MySQL.lua', - 'server/classes/datastore.lua', - 'server/main.lua' -} \ No newline at end of file + '@mysql-async/lib/MySQL.lua', + 'server/classes/datastore.lua', + 'server/main.lua' +} diff --git a/server/classes/datastore.lua b/server/classes/datastore.lua index cfab64d6..acef8514 100644 --- a/server/classes/datastore.lua +++ b/server/classes/datastore.lua @@ -1,57 +1,57 @@ function CreateDataStore(name, owner, data) - local self = {} + local self = {} - self.name = name - self.owner = owner - self.data = data + self.name = name + self.owner = owner + self.data = data - local timeoutCallbacks = {} + local timeoutCallbacks = {} - self.set = function(key, val) - data[key] = val - self.save() - end + self.set = function(key, val) + data[key] = val + self.save() + end - self.get = function(key) - return data[key] - end + self.get = function(key) + return data[key] + end - self.save = function() + self.save = function() - for i=1, #timeoutCallbacks, 1 do - ESX.ClearTimeout(timeoutCallbacks[i]) - timeoutCallbacks[i] = nil - end + for i=1, #timeoutCallbacks, 1 do + ESX.ClearTimeout(timeoutCallbacks[i]) + timeoutCallbacks[i] = nil + end - local timeoutCallback = ESX.SetTimeout(10000, function() + local timeoutCallback = ESX.SetTimeout(10000, function() - if self.owner == nil then - MySQL.Async.execute( - 'UPDATE datastore_data SET data = @data WHERE name = @name', - { - ['@data'] = json.encode(self.data), - ['@name'] = self.name, - } - ) - else - MySQL.Async.execute( - 'UPDATE datastore_data SET data = @data WHERE name = @name and owner = @owner', - { - ['@data'] = json.encode(self.data), - ['@name'] = self.name, - ['@owner'] = self.owner, - } - ) - end + if self.owner == nil then + MySQL.Async.execute( + 'UPDATE datastore_data SET data = @data WHERE name = @name', + { + ['@data'] = json.encode(self.data), + ['@name'] = self.name, + } + ) + else + MySQL.Async.execute( + 'UPDATE datastore_data SET data = @data WHERE name = @name and owner = @owner', + { + ['@data'] = json.encode(self.data), + ['@name'] = self.name, + ['@owner'] = self.owner, + } + ) + end - end) + end) - table.insert(timeoutCallbacks, timeoutCallback) + table.insert(timeoutCallbacks, timeoutCallback) - end + end - return self + return self end diff --git a/server/main.lua b/server/main.lua index 4bb0b031..e4df6157 100644 --- a/server/main.lua +++ b/server/main.lua @@ -9,132 +9,132 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) AddEventHandler('onMySQLReady', function() - local result = MySQL.Sync.fetchAll('SELECT * FROM datastore') + local result = MySQL.Sync.fetchAll('SELECT * FROM datastore') - for i=1, #result, 1 do + for i=1, #result, 1 do - local name = result[i].name - local label = result[i].label - local shared = result[i].shared + local name = result[i].name + local label = result[i].label + local shared = result[i].shared - local result2 = MySQL.Sync.fetchAll( - 'SELECT * FROM datastore_data WHERE name = @name', - { - ['@name'] = name - } - ) + local result2 = MySQL.Sync.fetchAll( + 'SELECT * FROM datastore_data WHERE name = @name', + { + ['@name'] = name + } + ) - if shared == 0 then + if shared == 0 then - table.insert(DataStoresIndex, name) + table.insert(DataStoresIndex, name) - DataStores[name] = {} + DataStores[name] = {} - for j=1, #result2, 1 do + for j=1, #result2, 1 do - local storeName = result2[j].name - local storeOwner = result2[j].owner - local storeData = (result2[j].data == nil and {} or json.decode(result2[j].data)) + local storeName = result2[j].name + local storeOwner = result2[j].owner + local storeData = (result2[j].data == nil and {} or json.decode(result2[j].data)) - local dataStore = CreateDataStore(storeName, storeOwner, storeData) - - table.insert(DataStores[name], dataStore) + local dataStore = CreateDataStore(storeName, storeOwner, storeData) - end + table.insert(DataStores[name], dataStore) - else + end - local data = nil + else - if #result2 == 0 then + local data = nil - MySQL.Sync.execute( - 'INSERT INTO datastore_data (name, owner, data) VALUES (@name, NULL, \'{}\')', - { - ['@name'] = name, - } - ) + if #result2 == 0 then - data = {} + MySQL.Sync.execute( + 'INSERT INTO datastore_data (name, owner, data) VALUES (@name, NULL, \'{}\')', + { + ['@name'] = name, + } + ) - else - data = json.decode(result2[1].data) - end + data = {} - local dataStore = CreateDataStore(name, nil, data) - SharedDataStores[name] = dataStore + else + data = json.decode(result2[1].data) + end - end + local dataStore = CreateDataStore(name, nil, data) + SharedDataStores[name] = dataStore - end + end + + end end) function GetDataStore(name, owner) - for i=1, #DataStores[name], 1 do - if DataStores[name][i].owner == owner then - return DataStores[name][i] - end - end + for i=1, #DataStores[name], 1 do + if DataStores[name][i].owner == owner then + return DataStores[name][i] + end + end end function GetDataStoreOwners(name) - - local identifiers = {} - for i=1, #DataStores[name], 1 do - table.insert(identifiers, DataStores[name][i].owner) - end + local identifiers = {} - return identifiers + for i=1, #DataStores[name], 1 do + table.insert(identifiers, DataStores[name][i].owner) + end + + return identifiers end function GetSharedDataStore(name) - return SharedDataStores[name] + return SharedDataStores[name] end AddEventHandler('esx_datastore:getDataStore', function(name, owner, cb) - cb(GetDataStore(name, owner)) + cb(GetDataStore(name, owner)) end) AddEventHandler('esx_datastore:getDataStoreOwners', function(name, cb) - cb(GetDataStoreOwners(name)) + cb(GetDataStoreOwners(name)) end) AddEventHandler('esx_datastore:getSharedDataStore', function(name, cb) - cb(GetSharedDataStore(name)) + cb(GetSharedDataStore(name)) end) AddEventHandler('esx:playerLoaded', function(source) - local xPlayer = ESX.GetPlayerFromId(source) - local dataStores = {} + local xPlayer = ESX.GetPlayerFromId(source) + local dataStores = {} - for i=1, #DataStoresIndex, 1 do + for i=1, #DataStoresIndex, 1 do - local name = DataStoresIndex[i] - local dataStore = GetDataStore(name, xPlayer.identifier) - - if dataStore == nil then + local name = DataStoresIndex[i] + local dataStore = GetDataStore(name, xPlayer.identifier) - MySQL.Async.execute( - 'INSERT INTO datastore_data (name, owner, data) VALUES (@name, @owner, @data)', - { - ['@name'] = name, - ['@owner'] = xPlayer.identifier, - ['@data'] = '{}' - } - ) + if dataStore == nil then - dataStore = CreateDataStore(name, xPlayer.identifier, {}) - table.insert(DataStores[name], dataStore) - end + MySQL.Async.execute( + 'INSERT INTO datastore_data (name, owner, data) VALUES (@name, @owner, @data)', + { + ['@name'] = name, + ['@owner'] = xPlayer.identifier, + ['@data'] = '{}' + } + ) - table.insert(dataStores, dataStore) + dataStore = CreateDataStore(name, xPlayer.identifier, {}) + table.insert(DataStores[name], dataStore) + end - end + table.insert(dataStores, dataStore) - xPlayer.set('dataStores', dataStores) + end + + xPlayer.set('dataStores', dataStores) end) From bb2e31154c09b3da63eb3a5b085b93d2f25d118d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 14 Sep 2017 23:17:12 +0200 Subject: [PATCH 12/27] Update LICENSE.txt --- LICENSE.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 30ace6a8..dae281b8 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + fxserver-esx_datastore + Copyright (C) 2015 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - {project} Copyright (C) {year} {fullname} + fxserver-esx_datastore Copyright (C) 2015 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. From 3702c8752f217e8013deda8e221becccbac5b391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 15 Sep 2017 15:23:38 +0200 Subject: [PATCH 13/27] chore(resource): Add version --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index 178a2cf1..cee2cc89 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,6 +2,8 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX DataStore' +version '1.0.0' + server_scripts { '@mysql-async/lib/MySQL.lua', 'server/classes/datastore.lua', From 635e18b655f4d1303bfb2a301b731d73b689cdeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Mon, 16 Oct 2017 13:13:40 +0200 Subject: [PATCH 14/27] feat(Add dot selectors + count function): --- server/classes/datastore.lua | 50 ++++++++++++++++++++++++++++++++++-- server/main.lua | 1 + 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/server/classes/datastore.lua b/server/classes/datastore.lua index acef8514..de95b2cf 100644 --- a/server/classes/datastore.lua +++ b/server/classes/datastore.lua @@ -1,3 +1,15 @@ +function stringsplit(inputstr, sep) + if sep == nil then + sep = "%s" + end + local t={} ; i=1 + for str in string.gmatch(inputstr, "([^"..sep.."]+)") do + t[i] = str + i = i + 1 + end + return t +end + function CreateDataStore(name, owner, data) local self = {} @@ -13,8 +25,42 @@ function CreateDataStore(name, owner, data) self.save() end - self.get = function(key) - return data[key] + self.get = function(key, i) + + local path = stringsplit(key, '.') + local obj = self.data + + for i=1, #path, 1 do + obj = obj[path[i]] + end + + if i == nil then + return obj + else + return obj[i] + end + + end + + self.count = function(key, i) + + local path = stringsplit(key, '.') + local obj = self.data + + for i=1, #path, 1 do + obj = obj[path[i]] + end + + if i ~= nil then + obj = obj[i] + end + + if obj == nil then + return 0 + else + return #obj + end + end self.save = function() diff --git a/server/main.lua b/server/main.lua index e4df6157..83644fae 100644 --- a/server/main.lua +++ b/server/main.lua @@ -138,3 +138,4 @@ AddEventHandler('esx:playerLoaded', function(source) xPlayer.set('dataStores', dataStores) end) + From 59bee822b8cfd583c7c1252078fec0013d532fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Mon, 16 Oct 2017 13:14:04 +0200 Subject: [PATCH 15/27] chore(Increment version): --- __resource.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index cee2cc89..defcc2aa 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX DataStore' -version '1.0.0' +version '1.0.1' server_scripts { '@mysql-async/lib/MySQL.lua', From d711a444bd4f0bf1c64bab8906401e9a105fd39e Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 22 Feb 2018 01:55:33 +0100 Subject: [PATCH 16/27] Fix message pack Error --- server/main.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/main.lua b/server/main.lua index 83644fae..d5994f98 100644 --- a/server/main.lua +++ b/server/main.lua @@ -108,7 +108,8 @@ end) AddEventHandler('esx:playerLoaded', function(source) - local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) local dataStores = {} for i=1, #DataStoresIndex, 1 do From 69d90eb5aca7b89120b57ddf7a6ce2176f7fbeb2 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:53:18 -0400 Subject: [PATCH 17/27] Repo Update --- .editorconfig | 6 +++--- LICENSE.txt => LICENSE | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename LICENSE.txt => LICENSE (100%) diff --git a/.editorconfig b/.editorconfig index 41c2aaf2..9b425256 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,9 +1,9 @@ root = true [*] -indent_size = 2 -indent_style = space -end_of_line = lf +indent_size = 4 +indent_style = tab +end_of_line = crlf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE From 22e877aef8d9e395096eaf5e9cd7ca4d164bc2e7 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 24 Sep 2018 17:25:49 +0200 Subject: [PATCH 18/27] mysql-async v3.0.1 support --- README.md | 79 +++++++++-------- __resource.lua | 10 +-- esx_datastore.sql | 22 ++--- server/classes/datastore.lua | 155 ++++++++++++++++----------------- server/main.lua | 160 +++++++++++++++-------------------- 5 files changed, 199 insertions(+), 227 deletions(-) diff --git a/README.md b/README.md index 46ad022a..c7da533d 100644 --- a/README.md +++ b/README.md @@ -1,53 +1,64 @@ -# fxserver-esx_datastore -FXServer ESX DataStore +# esx_datastore -[INSTALLATION] +## Download & Installation -1) CD in your resources/[esx] folder -2) Clone the repository +### Using [fvm](https://github.com/qlaffont/fvm-installer) ``` -git clone https://github.com/FXServer-ESX/fxserver-esx_datastore esx_datastore +fvm install --save --folder=esx esx-org/esx_datastore ``` -3) Import esx_datastore.sql in your database -1) Add this in your server.cfg : + +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/esx_datastore [esx]/esx_datastore +``` + +### Manually +- Download https://github.com/ESX-Org/esx_datastore/archive/master.zip +- Put it in the `[esx]` directory + +## Installation +- Import `esx_datastore.sql` in your database +- Add this in your `server.cfg`: ``` start esx_datastore ``` -[USAGE] +## Usage +There are two types of datastores: shared and not shared. -There is two types of datastores : shared and not shared. +- Shared datastores does not belong to a specific user, Example: police armory +- None-shared datastores are created for every user in the server. They are created in db when player is loaded, Example: property (weapons, dressing). -- Shared datastores dont belong to a specific user. Example : property (weapons, dressing). -- Not shared datastores are created for every user in the server. They are created in db when player is loaded, Example : police armory +### `datastore` database information +An datastore must be configured in the database before using it. Don't forget to run a server restart afterwards (you can alternative restart the script and relog all clients) -You must create the datastore in the database (datastore) before using it : +| `name` | `label` | `shared` | +| -------- | ------- | -------- | +| name of the datastore | label of the datastore (not used) | is the datastore shared with others? (boolean either `0` or `1`) | -name = name of the datastore, label = label of the datastore, shared (0 or 1) = Is datastore shared - -``` +```lua TriggerEvent('esx_datastore:getSharedDataStore', 'police', function(store) - - local weapons = store.get('weapons') - - if weapons == nil then - weapons = {} - end - - table.insert(weapons, {name = 'WEAPON_PUMPSHOTGUN', ammo = 50}) - - store.set('weapons', weapons) - + local weapons = store.get('weapons') or {} + + table.insert(weapons, {name = 'WEAPON_PUMPSHOTGUN', ammo = 50}) + store.set('weapons', weapons) end) TriggerEvent('esx_datastore:getDataStore', 'property', 'steam:0123456789', function(store) - - local dressing = store.get('dressing') - - if dressing == nil then - dressing = {} - end - + local dressing = store.get('dressing') or {} end) ``` + +# Legal +### License +esx_datastore - datastore inventory for ESX + +Copyright (C) 2015-2018 Jérémie N'gadi + +This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. + +This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. + +You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. diff --git a/__resource.lua b/__resource.lua index defcc2aa..f9f6fe26 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,11 +1,11 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' -description 'ESX DataStore' +description 'ESX Data Store' -version '1.0.1' +version '1.0.2' server_scripts { - '@mysql-async/lib/MySQL.lua', - 'server/classes/datastore.lua', - 'server/main.lua' + '@mysql-async/lib/MySQL.lua', + 'server/classes/datastore.lua', + 'server/main.lua' } diff --git a/esx_datastore.sql b/esx_datastore.sql index 9aae7b54..c8d8debf 100644 --- a/esx_datastore.sql +++ b/esx_datastore.sql @@ -1,17 +1,19 @@ USE `essentialmode`; CREATE TABLE `datastore` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(255) NOT NULL, - `label` varchar(255) NOT NULL, - `shared` int(11) NOT NULL, - PRIMARY KEY (`id`) + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `label` varchar(255) NOT NULL, + `shared` int(11) NOT NULL, + + PRIMARY KEY (`id`) ); CREATE TABLE `datastore_data` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(255) NOT NULL, - `owner` varchar(255), - `data` longtext, - PRIMARY KEY (`id`) + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `owner` varchar(255), + `data` longtext, + + PRIMARY KEY (`id`) ); diff --git a/server/classes/datastore.lua b/server/classes/datastore.lua index de95b2cf..2c31e541 100644 --- a/server/classes/datastore.lua +++ b/server/classes/datastore.lua @@ -1,103 +1,90 @@ function stringsplit(inputstr, sep) - if sep == nil then - sep = "%s" - end - local t={} ; i=1 - for str in string.gmatch(inputstr, "([^"..sep.."]+)") do - t[i] = str - i = i + 1 - end - return t + if sep == nil then + sep = "%s" + end + + local t={} ; i=1 + for str in string.gmatch(inputstr, "([^"..sep.."]+)") do + t[i] = str + i = i + 1 + end + + return t end function CreateDataStore(name, owner, data) + local self = {} - local self = {} + self.name = name + self.owner = owner + self.data = data - self.name = name - self.owner = owner - self.data = data + local timeoutCallbacks = {} - local timeoutCallbacks = {} + self.set = function(key, val) + data[key] = val + self.save() + end - self.set = function(key, val) - data[key] = val - self.save() - end + self.get = function(key, i) + local path = stringsplit(key, '.') + local obj = self.data - self.get = function(key, i) + for i=1, #path, 1 do + obj = obj[path[i]] + end - local path = stringsplit(key, '.') - local obj = self.data + if i == nil then + return obj + else + return obj[i] + end + end - for i=1, #path, 1 do - obj = obj[path[i]] - end + self.count = function(key, i) + local path = stringsplit(key, '.') + local obj = self.data - if i == nil then - return obj - else - return obj[i] - end + for i=1, #path, 1 do + obj = obj[path[i]] + end - end + if i ~= nil then + obj = obj[i] + end - self.count = function(key, i) + if obj == nil then + return 0 + else + return #obj + end + end - local path = stringsplit(key, '.') - local obj = self.data + self.save = function() + for i=1, #timeoutCallbacks, 1 do + ESX.ClearTimeout(timeoutCallbacks[i]) + timeoutCallbacks[i] = nil + end - for i=1, #path, 1 do - obj = obj[path[i]] - end + local timeoutCallback = ESX.SetTimeout(10000, function() + if self.owner == nil then + MySQL.Async.execute('UPDATE datastore_data SET data = @data WHERE name = @name', + { + ['@data'] = json.encode(self.data), + ['@name'] = self.name, + }) + else + MySQL.Async.execute('UPDATE datastore_data SET data = @data WHERE name = @name and owner = @owner', + { + ['@data'] = json.encode(self.data), + ['@name'] = self.name, + ['@owner'] = self.owner, + }) + end + end) - if i ~= nil then - obj = obj[i] - end - - if obj == nil then - return 0 - else - return #obj - end - - end - - self.save = function() - - for i=1, #timeoutCallbacks, 1 do - ESX.ClearTimeout(timeoutCallbacks[i]) - timeoutCallbacks[i] = nil - end - - local timeoutCallback = ESX.SetTimeout(10000, function() - - if self.owner == nil then - MySQL.Async.execute( - 'UPDATE datastore_data SET data = @data WHERE name = @name', - { - ['@data'] = json.encode(self.data), - ['@name'] = self.name, - } - ) - else - MySQL.Async.execute( - 'UPDATE datastore_data SET data = @data WHERE name = @name and owner = @owner', - { - ['@data'] = json.encode(self.data), - ['@name'] = self.name, - ['@owner'] = self.owner, - } - ) - end - - end) - - table.insert(timeoutCallbacks, timeoutCallback) - - end - - return self + table.insert(timeoutCallbacks, timeoutCallback) + end + return self end - diff --git a/server/main.lua b/server/main.lua index d5994f98..c80e3135 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,142 +1,114 @@ ESX = nil -Items = {} local DataStoresIndex = {} local DataStores = {} local SharedDataStores = {} - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -AddEventHandler('onMySQLReady', function() +MySQL.ready(function() + local result = MySQL.Sync.fetchAll('SELECT * FROM datastore') - local result = MySQL.Sync.fetchAll('SELECT * FROM datastore') + for i=1, #result, 1 do + local name = result[i].name + local label = result[i].label + local shared = result[i].shared - for i=1, #result, 1 do + local result2 = MySQL.Sync.fetchAll('SELECT * FROM datastore_data WHERE name = @name', { + ['@name'] = name + }) - local name = result[i].name - local label = result[i].label - local shared = result[i].shared + if shared == 0 then - local result2 = MySQL.Sync.fetchAll( - 'SELECT * FROM datastore_data WHERE name = @name', - { - ['@name'] = name - } - ) + table.insert(DataStoresIndex, name) + DataStores[name] = {} - if shared == 0 then + for j=1, #result2, 1 do + local storeName = result2[j].name + local storeOwner = result2[j].owner + local storeData = (result2[j].data == nil and {} or json.decode(result2[j].data)) + local dataStore = CreateDataStore(storeName, storeOwner, storeData) - table.insert(DataStoresIndex, name) + table.insert(DataStores[name], dataStore) + end - DataStores[name] = {} + else - for j=1, #result2, 1 do + local data = nil - local storeName = result2[j].name - local storeOwner = result2[j].owner - local storeData = (result2[j].data == nil and {} or json.decode(result2[j].data)) + if #result2 == 0 then + MySQL.Sync.execute('INSERT INTO datastore_data (name, owner, data) VALUES (@name, NULL, \'{}\')', { + ['@name'] = name + }) - local dataStore = CreateDataStore(storeName, storeOwner, storeData) + data = {} + else + data = json.decode(result2[1].data) + end - table.insert(DataStores[name], dataStore) - - end - - else - - local data = nil - - if #result2 == 0 then - - MySQL.Sync.execute( - 'INSERT INTO datastore_data (name, owner, data) VALUES (@name, NULL, \'{}\')', - { - ['@name'] = name, - } - ) - - data = {} - - else - data = json.decode(result2[1].data) - end - - local dataStore = CreateDataStore(name, nil, data) - SharedDataStores[name] = dataStore - - end - - end + local dataStore = CreateDataStore(name, nil, data) + SharedDataStores[name] = dataStore + end + end end) function GetDataStore(name, owner) - for i=1, #DataStores[name], 1 do - if DataStores[name][i].owner == owner then - return DataStores[name][i] - end - end + for i=1, #DataStores[name], 1 do + if DataStores[name][i].owner == owner then + return DataStores[name][i] + end + end end function GetDataStoreOwners(name) + local identifiers = {} - local identifiers = {} - - for i=1, #DataStores[name], 1 do - table.insert(identifiers, DataStores[name][i].owner) - end - - return identifiers + for i=1, #DataStores[name], 1 do + table.insert(identifiers, DataStores[name][i].owner) + end + return identifiers end function GetSharedDataStore(name) - return SharedDataStores[name] + return SharedDataStores[name] end AddEventHandler('esx_datastore:getDataStore', function(name, owner, cb) - cb(GetDataStore(name, owner)) + cb(GetDataStore(name, owner)) end) AddEventHandler('esx_datastore:getDataStoreOwners', function(name, cb) - cb(GetDataStoreOwners(name)) + cb(GetDataStoreOwners(name)) end) AddEventHandler('esx_datastore:getSharedDataStore', function(name, cb) - cb(GetSharedDataStore(name)) + cb(GetSharedDataStore(name)) end) AddEventHandler('esx:playerLoaded', function(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + local dataStores = {} - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) - local dataStores = {} + for i=1, #DataStoresIndex, 1 do + local name = DataStoresIndex[i] + local dataStore = GetDataStore(name, xPlayer.identifier) - for i=1, #DataStoresIndex, 1 do + if dataStore == nil then + MySQL.Async.execute('INSERT INTO datastore_data (name, owner, data) VALUES (@name, @owner, @data)', + { + ['@name'] = name, + ['@owner'] = xPlayer.identifier, + ['@data'] = '{}' + }) - local name = DataStoresIndex[i] - local dataStore = GetDataStore(name, xPlayer.identifier) + dataStore = CreateDataStore(name, xPlayer.identifier, {}) + table.insert(DataStores[name], dataStore) + end - if dataStore == nil then - - MySQL.Async.execute( - 'INSERT INTO datastore_data (name, owner, data) VALUES (@name, @owner, @data)', - { - ['@name'] = name, - ['@owner'] = xPlayer.identifier, - ['@data'] = '{}' - } - ) - - dataStore = CreateDataStore(name, xPlayer.identifier, {}) - table.insert(DataStores[name], dataStore) - end - - table.insert(dataStores, dataStore) - - end - - xPlayer.set('dataStores', dataStores) + table.insert(dataStores, dataStore) + end + xPlayer.set('dataStores', dataStores) end) - From ae1a7c8ca057195099463eccd96de6752d00ecfe Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 3 Nov 2018 23:08:23 +0100 Subject: [PATCH 19/27] Added index to datastore Co-Authored-By: GHMatti --- esx_datastore.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/esx_datastore.sql b/esx_datastore.sql index c8d8debf..345f76d9 100644 --- a/esx_datastore.sql +++ b/esx_datastore.sql @@ -15,5 +15,8 @@ CREATE TABLE `datastore_data` ( `owner` varchar(255), `data` longtext, + INDEX index_datastore_name (`name`), + CONSTRAINT unique_datastore_owner_name UNIQUE (`owner`, `name`), + PRIMARY KEY (`id`) ); From a5bebc8bec2fedb1d82c8c8f3b42b85e9292d497 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 4 Nov 2018 22:21:19 +0100 Subject: [PATCH 20/27] Fixed max key length error --- esx_datastore.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esx_datastore.sql b/esx_datastore.sql index 345f76d9..5b31b018 100644 --- a/esx_datastore.sql +++ b/esx_datastore.sql @@ -11,8 +11,8 @@ CREATE TABLE `datastore` ( CREATE TABLE `datastore_data` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(255) NOT NULL, - `owner` varchar(255), + `name` varchar(60) NOT NULL, + `owner` varchar(60), `data` longtext, INDEX index_datastore_name (`name`), From e06aa05b0e3619b50db2b6ce8fbafb337f8dd468 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 4 Nov 2018 22:31:56 +0100 Subject: [PATCH 21/27] name as primary key --- esx_datastore.sql | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/esx_datastore.sql b/esx_datastore.sql index 5b31b018..5b694f8a 100644 --- a/esx_datastore.sql +++ b/esx_datastore.sql @@ -1,12 +1,11 @@ USE `essentialmode`; CREATE TABLE `datastore` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(255) NOT NULL, + `name` varchar(60) NOT NULL, `label` varchar(255) NOT NULL, `shared` int(11) NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`name`) ); CREATE TABLE `datastore_data` ( From 58a5e8f0462c3eaa7b1d54943cf5fa6ddf0e39c7 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 1 Jun 2019 14:07:08 +0200 Subject: [PATCH 22/27] Added missing mysql keys --- README.md | 2 +- esx_datastore.sql | 21 ++++++++++----------- server/classes/datastore.lua | 6 ++---- server/main.lua | 17 ++++------------- 4 files changed, 17 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index c7da533d..7718912e 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ end) ### License esx_datastore - datastore inventory for ESX -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2019 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/esx_datastore.sql b/esx_datastore.sql index 5b694f8a..1fdd9049 100644 --- a/esx_datastore.sql +++ b/esx_datastore.sql @@ -1,21 +1,20 @@ USE `essentialmode`; CREATE TABLE `datastore` ( - `name` varchar(60) NOT NULL, - `label` varchar(255) NOT NULL, - `shared` int(11) NOT NULL, + `name` VARCHAR(60) NOT NULL, + `label` VARCHAR(100) NOT NULL, + `shared` INT(11) NOT NULL, PRIMARY KEY (`name`) ); CREATE TABLE `datastore_data` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(60) NOT NULL, - `owner` varchar(60), - `data` longtext, + `id` INT(11) NOT NULL AUTO_INCREMENT, + `name` VARCHAR(60) NOT NULL, + `owner` VARCHAR(60), + `data` LONGTEXT, - INDEX index_datastore_name (`name`), - CONSTRAINT unique_datastore_owner_name UNIQUE (`owner`, `name`), - - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + UNIQUE INDEX `index_datastore_data_name_owner` (`name`, `owner`), + INDEX `index_datastore_data_name` (`name`) ); diff --git a/server/classes/datastore.lua b/server/classes/datastore.lua index 2c31e541..382689d8 100644 --- a/server/classes/datastore.lua +++ b/server/classes/datastore.lua @@ -68,14 +68,12 @@ function CreateDataStore(name, owner, data) local timeoutCallback = ESX.SetTimeout(10000, function() if self.owner == nil then - MySQL.Async.execute('UPDATE datastore_data SET data = @data WHERE name = @name', - { + MySQL.Async.execute('UPDATE datastore_data SET data = @data WHERE name = @name', { ['@data'] = json.encode(self.data), ['@name'] = self.name, }) else - MySQL.Async.execute('UPDATE datastore_data SET data = @data WHERE name = @name and owner = @owner', - { + MySQL.Async.execute('UPDATE datastore_data SET data = @data WHERE name = @name and owner = @owner', { ['@data'] = json.encode(self.data), ['@name'] = self.name, ['@owner'] = self.owner, diff --git a/server/main.lua b/server/main.lua index c80e3135..37b4b8c2 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,7 +1,5 @@ -ESX = nil -local DataStoresIndex = {} -local DataStores = {} -local SharedDataStores = {} +local DataStores, DataStoresIndex, SharedDataStores = {}, {}, {} +ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) @@ -18,7 +16,6 @@ MySQL.ready(function() }) if shared == 0 then - table.insert(DataStoresIndex, name) DataStores[name] = {} @@ -30,9 +27,7 @@ MySQL.ready(function() table.insert(DataStores[name], dataStore) end - else - local data = nil if #result2 == 0 then @@ -47,7 +42,6 @@ MySQL.ready(function() local dataStore = CreateDataStore(name, nil, data) SharedDataStores[name] = dataStore - end end end) @@ -86,9 +80,7 @@ AddEventHandler('esx_datastore:getSharedDataStore', function(name, cb) cb(GetSharedDataStore(name)) end) -AddEventHandler('esx:playerLoaded', function(source) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) +AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) local dataStores = {} for i=1, #DataStoresIndex, 1 do @@ -96,8 +88,7 @@ AddEventHandler('esx:playerLoaded', function(source) local dataStore = GetDataStore(name, xPlayer.identifier) if dataStore == nil then - MySQL.Async.execute('INSERT INTO datastore_data (name, owner, data) VALUES (@name, @owner, @data)', - { + MySQL.Async.execute('INSERT INTO datastore_data (name, owner, data) VALUES (@name, @owner, @data)', { ['@name'] = name, ['@owner'] = xPlayer.identifier, ['@data'] = '{}' From fa268545cfb6576db9d3d0b6d2594b90edad54d5 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:25:44 +0100 Subject: [PATCH 23/27] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename __resource.lua => fxmanifest.lua (70%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 70% rename from __resource.lua rename to fxmanifest.lua index f9f6fe26..1b75cbf1 100644 --- a/__resource.lua +++ b/fxmanifest.lua @@ -1,4 +1,6 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' +fx_version 'adamant' + +game 'gta5' description 'ESX Data Store' From f0db3d57defcfd77fe0d0ef8737a10008dd990d8 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 17 Feb 2020 23:30:54 +0100 Subject: [PATCH 24/27] Update esx_datastore.sql --- esx_datastore.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esx_datastore.sql b/esx_datastore.sql index 1fdd9049..feb0f6f1 100644 --- a/esx_datastore.sql +++ b/esx_datastore.sql @@ -11,7 +11,7 @@ CREATE TABLE `datastore` ( CREATE TABLE `datastore_data` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `name` VARCHAR(60) NOT NULL, - `owner` VARCHAR(60), + `owner` VARCHAR(40), `data` LONGTEXT, PRIMARY KEY (`id`), From 027953b624c4b1923478914c90b39a9d59e58b8d Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 26 Mar 2020 21:55:41 +0100 Subject: [PATCH 25/27] Removed unused code --- README.md | 2 +- server/main.lua | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 7718912e..97236dcb 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ end) ### License esx_datastore - datastore inventory for ESX -Copyright (C) 2015-2019 Jérémie N'gadi +Copyright (C) 2015-2020 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/server/main.lua b/server/main.lua index 37b4b8c2..1317420c 100644 --- a/server/main.lua +++ b/server/main.lua @@ -7,10 +7,7 @@ MySQL.ready(function() local result = MySQL.Sync.fetchAll('SELECT * FROM datastore') for i=1, #result, 1 do - local name = result[i].name - local label = result[i].label - local shared = result[i].shared - + local name, label, shared = result[i].name, result[i].label, result[i].shared local result2 = MySQL.Sync.fetchAll('SELECT * FROM datastore_data WHERE name = @name', { ['@name'] = name }) @@ -28,7 +25,7 @@ MySQL.ready(function() table.insert(DataStores[name], dataStore) end else - local data = nil + local data if #result2 == 0 then MySQL.Sync.execute('INSERT INTO datastore_data (name, owner, data) VALUES (@name, NULL, \'{}\')', { @@ -81,13 +78,11 @@ AddEventHandler('esx_datastore:getSharedDataStore', function(name, cb) end) AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) - local dataStores = {} - for i=1, #DataStoresIndex, 1 do - local name = DataStoresIndex[i] + local name = DataStoresIndex[i] local dataStore = GetDataStore(name, xPlayer.identifier) - if dataStore == nil then + if not dataStore then MySQL.Async.execute('INSERT INTO datastore_data (name, owner, data) VALUES (@name, @owner, @data)', { ['@name'] = name, ['@owner'] = xPlayer.identifier, @@ -97,9 +92,5 @@ AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) dataStore = CreateDataStore(name, xPlayer.identifier, {}) table.insert(DataStores[name], dataStore) end - - table.insert(dataStores, dataStore) end - - xPlayer.set('dataStores', dataStores) end) From 88fd62fe7c566b998166a458df4abbbd67d5d538 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:48:59 +0200 Subject: [PATCH 26/27] Latest ESX code --- esx_datastore.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esx_datastore.sql b/esx_datastore.sql index feb0f6f1..30d3dfb0 100644 --- a/esx_datastore.sql +++ b/esx_datastore.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; CREATE TABLE `datastore` ( `name` VARCHAR(60) NOT NULL, From ed032cc9d1f54834bc0d4acf74b3ec77b8fb17bc Mon Sep 17 00:00:00 2001 From: shortybsd Date: Sat, 16 May 2020 22:27:00 -0500 Subject: [PATCH 27/27] Update esx_datastore.sql INT - Integer display width is deprecated and will be removed in a future release. --- esx_datastore.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esx_datastore.sql b/esx_datastore.sql index 30d3dfb0..162fb636 100644 --- a/esx_datastore.sql +++ b/esx_datastore.sql @@ -3,13 +3,13 @@ USE `es_extended`; CREATE TABLE `datastore` ( `name` VARCHAR(60) NOT NULL, `label` VARCHAR(100) NOT NULL, - `shared` INT(11) NOT NULL, + `shared` INT NOT NULL, PRIMARY KEY (`name`) ); CREATE TABLE `datastore_data` ( - `id` INT(11) NOT NULL AUTO_INCREMENT, + `id` INT NOT NULL AUTO_INCREMENT, `name` VARCHAR(60) NOT NULL, `owner` VARCHAR(40), `data` LONGTEXT,