From b769824d249b432a4f4f6a659aa6dae1a09071a8 Mon Sep 17 00:00:00 2001 From: David Leal Date: Thu, 16 Jun 2022 05:06:35 -0500 Subject: [PATCH] Add Continuous Integration and LuaCheck (#71) All warnings have been fixed as well. --- .github/workflows/build.yml | 11 +++++++++++ .luacheckrc | 13 +++++++++++++ formspecs.lua | 4 ++-- skin_meta_api.lua | 4 ++-- skinlist.lua | 2 +- skins_updater.lua | 2 +- 6 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/build.yml create mode 100644 .luacheckrc diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..817e409 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,11 @@ +on: [push, pull_request] +name: build +jobs: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: lint + uses: Roang-zero1/factorio-mod-luacheck@master + with: + luacheckrc_url: "" diff --git a/.luacheckrc b/.luacheckrc new file mode 100644 index 0000000..f86a57a --- /dev/null +++ b/.luacheckrc @@ -0,0 +1,13 @@ +unused_args = false +allow_defined_top = true +max_line_length = 999 + +globals = { + "minetest", "unified_inventory", "core", + "player_api", "clothing", "armor", "sfinv", +} + +read_globals = { + string = {fields = {"split", "trim"}}, + table = {fields = {"copy", "getn"}}, +} diff --git a/formspecs.lua b/formspecs.lua index 19482e8..3241143 100644 --- a/formspecs.lua +++ b/formspecs.lua @@ -57,7 +57,7 @@ function skins.get_skin_selection_formspec(player, context, perplayer_formspec) local yspc = 2 local skinwidth = 1 local skinheight = 2 - local xscale = 1 + local xscale = 1 -- luacheck: ignore local btn_y = 8.15 local drop_y = 8 local btn_width = 1 @@ -104,7 +104,7 @@ function skins.get_skin_selection_formspec(player, context, perplayer_formspec) local page = context.skins_page local formspec = "" - + for i = (page-1)*maxdisp+1, page*maxdisp do local skin = context.skins_list[i] if not skin then diff --git a/skin_meta_api.lua b/skin_meta_api.lua index 7a5ad2e..cdeeb8f 100644 --- a/skin_meta_api.lua +++ b/skin_meta_api.lua @@ -221,6 +221,6 @@ end function skin_class:is_applicable_for_player(playername) local assigned_player = self:get_meta("playername") return assigned_player == nil or assigned_player == true or - playername and (minetest.check_player_privs(playername, {server=true}) or - assigned_player:lower() == playername:lower()) + playername and (minetest.check_player_privs(playername, {server=true}) or + assigned_player:lower() == playername:lower()) end diff --git a/skinlist.lua b/skinlist.lua index a40ed56..0c7c8ad 100644 --- a/skinlist.lua +++ b/skinlist.lua @@ -1,7 +1,7 @@ local skins_dir_list = minetest.get_dir_list(skins.modpath.."/textures") for _, fn in pairs(skins_dir_list) do - local name, sort_id, assignment, is_preview, playername + local name, sort_id, is_preview, playername local nameparts = string.gsub(fn, "[.]", "_"):split("_") -- check allowed prefix and file extension diff --git a/skins_updater.lua b/skins_updater.lua index 22f3486..1e461ed 100644 --- a/skins_updater.lua +++ b/skins_updater.lua @@ -115,7 +115,7 @@ internal.get_pages_count = function(callback, ...) callback(math.ceil(list.pages / 20), unpack(vars)) end) end - + -- Function to fetch a range of pages internal.fetch_function = function(pages_total, start_page, len) start_page = math.max(start_page, 1)