Changes

m
Reverted edits by がか (talk) to last version by Ckwng
Line 1: Line 1: −
local U = require("Module:Utils")
   
local BaseData = require('Module:BaseData')
 
local BaseData = require('Module:BaseData')
    
local Ship = BaseData{
 
local Ship = BaseData{
  _ships = {},
+
_ships = {},
  _data_class = false,
+
_data_class = false,
 
}
 
}
    
function Ship:_prepareShipData()
 
function Ship:_prepareShipData()
  self._data_class = self._data_class or require('Module:ShipData')
+
self._data_class = self._data_class or require('Module:ShipData')
 
end
 
end
    
function Ship:get(stat, name, model)
 
function Ship:get(stat, name, model)
  return self:create(name, model)[stat]()
+
return self:create(name, model)[stat]()
 
end
 
end
    
function Ship:create(name, model)
 
function Ship:create(name, model)
  self:_prepareShipData()
+
self:_prepareShipData()
  if name == nil then
+
if name == nil then
    return self._data_class()
+
return self._data_class()
  end
+
end
  if model == nil then
+
if model == nil then
    name, model = self:process_ship_key(name)
+
name, model = self:process_ship_key(name)
  end
+
end
  if not model then
+
if not model then
    model = ""
+
model = ""
  end
+
end
  -- check if we already have it
+
--check if we already have it
  --if self._ships[name] and self._ships[name][model] then
+
if self._ships[name] and self._ships[name][model] then
    --return self._ships[name][model]
+
return self._ships[name][model]
  --else
+
else
    local ship = self._data_class(self:get_table(name, model))
+
local ship = self._data_class(self:get_table(name, model))
    if not self._ships[name] then
+
if not self._ships[name] then
      self._ships[name] = {}
+
self._ships[name] = {}
    end
+
end
    self._ships[name][model] = ship
+
self._ships[name][model] = ship
    return ship
+
return ship
  --end
+
end
 
end
 
end
    
function Ship:process_ship_key_as_reference(reference, base)
 
function Ship:process_ship_key_as_reference(reference, base)
  name, model = self:process_ship_key(reference)
+
name, model = self:process_ship_key(reference)
  if #name == 0 then
+
if #name == 0 then
    name = base
+
name = base
  end
+
end
  return name, model
+
return name, model
 
end
 
end
    
function Ship:create_from_reference(reference, base)
 
function Ship:create_from_reference(reference, base)
  name, model = self:process_ship_key(reference)
+
name, model = self:process_ship_key(reference)
  if #name == 0 then
+
if #name == 0 then
    name = base:base_name()
+
name = base:base_name()
  end
+
end
  return self(name, model)
+
return self(name, model)
 
end
 
end
    
function Ship:get_table(name, model)
 
function Ship:get_table(name, model)
  local success, ship_table = U.requireModule(name)
+
--Catch a failed require
  local ship_form_table
+
local success, ship_table = pcall(function () return require(mw.ustring.format('Module:%s', name)) end)
  if success then
+
--require succeeded
    ship_form_table = ship_table[model]
+
if success then
    if not ship_form_table and ship_table.seasonals then
+
ship_table = ship_table[model]
      ship_form_table = ship_table.seasonals[model] or U.ifindBy(
+
if not ship_table then
        ship_table.seasonals,
+
--create a ShipData with what we have
        function(data)
+
ship_table = {_name = name, _suffix = model}
          return data._suffix == model and (not data._name or data._name == name)
+
elseif type(ship_table) == "string" then
        end
+
ship_table = self:get_table(self:process_ship_key_as_reference(ship_table, name))
      )
+
end
      if ship_form_table and type(ship_form_table) ~= "string" then
+
--require failed
        ship_form_table._seasonal = true
+
else
      end
+
--create a ShipData with what we have
    end
+
ship_table = {_name = name, _suffix = model}
    if type(ship_form_table) == "string" then
+
end
      ship_form_table = self:get_table(self:process_ship_key_as_reference(ship_form_table, name))
+
return ship_table
    end
  −
  end
  −
  if not ship_form_table then
  −
    ship_form_table = { _name = name, _suffix = model }
  −
  end
  −
  if ship_form_table._name == nil then
  −
    ship_form_table._name = name
  −
  end
  −
  if ship_form_table._suffix == nil then
  −
    ship_form_table._suffix = model
  −
  end
  −
  ship_form_table._key = model
  −
  return ship_form_table
   
end
 
end
    
function Ship:process_ship_key(ship_key)
 
function Ship:process_ship_key(ship_key)
  local split = mw.ustring.find(ship_key, '/')
+
local split = mw.ustring.find(ship_key, '/')
  local ship_base_name, ship_suffix
+
local ship_base_name, ship_suffix
  if split == nil then
+
if split == nil then
    ship_base_name = ship_key
+
ship_base_name = ship_key
  else
+
else
    ship_base_name = split - 1 > 0 and mw.ustring.sub(ship_key, 1, split - 1) or ''
+
ship_base_name = split - 1 > 0 and mw.ustring.sub(ship_key, 1, split - 1) or ''
    ship_suffix = mw.ustring.sub(ship_key, split + 1, -1)
+
ship_suffix = mw.ustring.sub(ship_key, split + 1, -1)
  end
+
end
  return ship_base_name, ship_suffix
+
return ship_base_name, ship_suffix
 
end
 
end
    
function Ship:get_module(name)
 
function Ship:get_module(name)
  if name == nil then
+
if name == nil then
    return nil
+
return nil
  else
+
else
    name = self:process_ship_key(name)
+
name = self:process_ship_key(name)
  end
+
end
  return mw.ustring.format('Module:%s', name)
+
return mw.ustring.format('Module:%s', name)
 
end
 
end
    
function Ship:extend(data)
 
function Ship:extend(data)
  data = data or {}
+
data = data or {}
  setmetatable(data, data)
+
setmetatable(data, data)
  data.__index = self
+
data.__index = self
  data.__call = self.__call
+
data.__call = self.__call
  return data
+
return data
 
end
 
end
  
cssedit, gkautomate
6,928

edits