Implement "cart" module storage, #2381

eos/db/saveddata/cart.py

@@ -0,0 +1,41 @@
+# ===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+# ===============================================================================
+
+from sqlalchemy import Table, Column, Integer, ForeignKey, DateTime
+from sqlalchemy.orm import mapper, relation
+import datetime
+
+from eos.db import saveddata_meta
+from eos.saveddata.cargo import Cargo
+from eos.saveddata.fit import Fit
+
+cart_table = Table("cart", saveddata_meta,
+                    Column("ID", Integer, primary_key=True),
+                    Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True),
+                    Column("itemID", Integer, nullable=False),
+                    Column("amount", Integer, nullable=False),
+                    Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                    Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
+                    )
+
+mapper(Cargo, cart_table,
+   properties={
+       "owner": relation(Fit)
+   }
+)

eos/saveddata/cart.py

@@ -0,0 +1,101 @@
+# ===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+# ===============================================================================
+
+import sys
+from logbook import Logger
+
+from sqlalchemy.orm import validates, reconstructor
+
+import eos.db
+from eos.effectHandlerHelpers import HandledItem
+from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut
+
+pyfalog = Logger(__name__)
+
+
+class Cart(HandledItem, ItemAttrShortcut):
+    def __init__(self, item):
+        """Initialize cart from the program"""
+        self.__item = item
+        self.itemID = item.ID if item is not None else None
+        self.amount = 0
+        self.__itemModifiedAttributes = ModifiedAttributeDict()
+        self.__itemModifiedAttributes.original = item.attributes
+        self.__itemModifiedAttributes.overrides = item.overrides
+
+    @reconstructor
+    def init(self):
+        """Initialize cart from the database and validate"""
+        self.__item = None
+
+        if self.itemID:
+            self.__item = eos.db.getItem(self.itemID)
+            if self.__item is None:
+                pyfalog.error("Item (id: {0}) does not exist", self.itemID)
+                return
+
+        self.__itemModifiedAttributes = ModifiedAttributeDict()
+        self.__itemModifiedAttributes.original = self.__item.attributes
+        self.__itemModifiedAttributes.overrides = self.__item.overrides
+
+    @property
+    def itemModifiedAttributes(self):
+        return self.__itemModifiedAttributes
+
+    @property
+    def isInvalid(self):
+        return self.__item is None
+
+    @property
+    def item(self):
+        return self.__item
+
+    def clear(self):
+        self.itemModifiedAttributes.clear()
+
+    @validates("fitID", "itemID", "amount")
+    def validator(self, key, val):
+        map = {
+            "fitID" : lambda _val: isinstance(_val, int),
+            "itemID": lambda _val: isinstance(_val, int),
+            "amount": lambda _val: isinstance(_val, int)
+        }
+
+        if key == "amount" and val > sys.maxsize:
+            val = sys.maxsize
+
+        if not map[key](val):
+            raise ValueError(str(val) + " is not a valid value for " + key)
+        else:
+            return val
+
+    def __deepcopy__(self, memo):
+        copy = Cart(self.item)
+        copy.amount = self.amount
+        return copy
+
+    def rebase(self, item):
+        amount = self.amount
+        Cart.__init__(self, item)
+        self.amount = amount
+
+    def __repr__(self):
+        return "Cart(ID={}, name={}) at {}".format(
+            self.item.ID, self.item.name, hex(id(self))
+        )

eos/saveddata/damagePattern.py

@@ -59,38 +59,6 @@ def _c(x):
     (-20, (_c(_t('Exotic Plasma')) + _t('Baryon'), 0, 59737, 0, 40263)),
     (-21, (_c(_t('Exotic Plasma')) + _t('Tetryon'), 0, 69208, 0, 30792)),
     (-22, (_c(_t('Exotic Plasma')) + '|' + _t('[T2] Occult'), 0, 55863, 0, 44137)),
-    (-23, (_c(_t('Hybrid Charges')) + '|' + _t('[T2] Spike'), 0, 4, 4, 0)),
-    (-24, (_c(_t('Hybrid Charges')) + '|' + _t('[T2] Null'), 0, 6, 5, 0)),
-    (-25, (_c(_t('Hybrid Charges')) + _t('Iron'), 0, 2, 3, 0)),
-    (-26, (_c(_t('Hybrid Charges')) + _t('Tungsten'), 0, 2, 4, 0)),
-    (-27, (_c(_t('Hybrid Charges')) + _t('Iridium'), 0, 3, 4, 0)),
-    (-28, (_c(_t('Hybrid Charges')) + _t('Lead'), 0, 3, 5, 0)),
-    (-29, (_c(_t('Hybrid Charges')) + _t('Thorium'), 0, 4, 5, 0)),
-    (-30, (_c(_t('Hybrid Charges')) + _t('Uranium'), 0, 4, 6, 0)),
-    (-31, (_c(_t('Hybrid Charges')) + _t('Plutonium'), 0, 5, 6, 0)),
-    (-32, (_c(_t('Hybrid Charges')) + _t('Antimatter'), 0, 5, 7, 0)),
-    (-33, (_c(_t('Hybrid Charges')) + '|' + _t('[T2] Javelin'), 0, 8, 6, 0)),
-    (-34, (_c(_t('Hybrid Charges')) + '|' + _t('[T2] Void'), 0, 7.7, 7.7, 0)),
-    (-35, (_c(_t('Projectile Ammo')) + '|' + _t('[T2] Tremor'), 0, 0, 3, 5)),
-    (-36, (_c(_t('Projectile Ammo')) + '|' + _t('[T2] Barrage'), 0, 0, 5, 6)),
-    (-37, (_c(_t('Projectile Ammo')) + _t('Carbonized Lead'), 0, 0, 4, 1)),
-    (-38, (_c(_t('Projectile Ammo')) + _t('Nuclear'), 0, 0, 1, 4)),
-    (-39, (_c(_t('Projectile Ammo')) + _t('Proton'), 3, 0, 2, 0)),
-    (-40, (_c(_t('Projectile Ammo')) + _t('Depleted Uranium'), 0, 3, 2, 3)),
-    (-41, (_c(_t('Projectile Ammo')) + _t('Titanium Sabot'), 0, 0, 6, 2)),
-    (-42, (_c(_t('Projectile Ammo')) + _t('EMP'), 9, 0, 1, 2)),
-    (-43, (_c(_t('Projectile Ammo')) + _t('Phased Plasma'), 0, 10, 2, 0)),
-    (-44, (_c(_t('Projectile Ammo')) + _t('Fusion'), 0, 0, 2, 10)),
-    (-45, (_c(_t('Projectile Ammo')) + '|' + _t('[T2] Quake'), 0, 0, 5, 9)),
-    (-46, (_c(_t('Projectile Ammo')) + '|' + _t('[T2] Hail'), 0, 0, 3.3, 12.1)),
-    (-47, (_c(_t('Missiles')) + _t('Mjolnir'), 1, 0, 0, 0)),
-    (-48, (_c(_t('Missiles')) + _t('Inferno'), 0, 1, 0, 0)),
-    (-49, (_c(_t('Missiles')) + _t('Scourge'), 0, 0, 1, 0)),
-    (-50, (_c(_t('Missiles')) + _t('Nova'), 0, 0, 0, 1)),
-    (-51, (_c(_t('Bombs')) + _t('Electron Bomb'), 6400, 0, 0, 0)),
-    (-52, (_c(_t('Bombs')) + _t('Scorch Bomb'), 0, 6400, 0, 0)),
-    (-53, (_c(_t('Bombs')) + _t('Concussion Bomb'), 0, 0, 6400, 0)),
-    (-54, (_c(_t('Bombs')) + _t('Shrapnel Bomb'), 0, 0, 0, 6400)),
     # Source: ticket #2067 and #2265
     (-55, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('All'), 126, 427, 218, 230)),
     (-109, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Angel'), 450, 72, 80, 398)),

gui/additionsPane.py

@@ -29,6 +29,7 @@
 from gui.builtinAdditionPanes.fighterView import FighterView
 from gui.builtinAdditionPanes.implantView import ImplantView
 from gui.builtinAdditionPanes.notesView import NotesView
+from gui.builtinAdditionPanes.cartView import CartView
 from gui.builtinAdditionPanes.projectedView import ProjectedView
 from gui.chrome_tabs import ChromeNotebook
 from gui.toggle_panel import TogglePanel
@@ -61,6 +62,7 @@ def __init__(self, parent, mainFrame):
         gangImg = BitmapLoader.getImage("fleet_fc_small", "gui")
         cargoImg = BitmapLoader.getImage("cargo_small", "gui")
         notesImg = BitmapLoader.getImage("skill_small", "gui")
+        cartImg = BitmapLoader.getImage("cart_small", "gui")
 
         self.drone = DroneView(self.notebook)
         self.notebook.AddPage(self.drone, _t("Drones"), image=droneImg, closeable=False)
@@ -86,12 +88,16 @@ def __init__(self, parent, mainFrame):
         self.notes = NotesView(self.notebook)
         self.notebook.AddPage(self.notes, _t("Notes"), image=notesImg, closeable=False)
 
+
+        self.cart = CartView(self.notebook)
+        self.notebook.AddPage(self.cart, _t("Cart"), image=cartImg, closeable=False)
+
         self.mainFrame.Bind(GE.FIT_CHANGED, self.OnFitChanged)
         self.mainFrame.Bind(GE.FIT_NOTES_CHANGED, self.OnNotesChanged)
 
         self.notebook.SetSelection(0)
 
-    PANES = ["Drones", "Fighters", "Cargo", "Implants", "Boosters", "Projected", "Command", "Notes"]
+    PANES = ["Drones", "Fighters", "Cargo", "Implants", "Boosters", "Projected", "Command", "Notes", "Cart"]
 
     def select(self, name, focus=True):
         self.notebook.SetSelection(self.PANES.index(name), focus=focus)