nsarchive 1.2.7__py3-none-any.whl → 1.3.0__py3-none-any.whl

nsarchive/__init__.py

@@ -200,6 +200,9 @@ class EntityInstance:
                 groups.remove(group)
                 continue
 
+            if group.owner.id == id:
+                continue
+
             for member in group.members:
                 if member.id == id:
                     break
@@ -252,7 +255,7 @@ class EntityInstance:
             _data['type'] = "report"
         else:
             _data['type'] = "unknown"
-        
+
         self.archives.put(key = archive.id, data = _data)
 
     def _get_archive(self, id: str | NSID) -> Action | Sanction | AdminAction:
@@ -272,7 +275,7 @@ class EntityInstance:
 
         if _data is None:
             return None
-        
+
         if _data['type'] == "sanction": # Mute, ban, GAV, kick, détention, prune (xp seulement)
             archive = Sanction(_data['author'], _data['target'])
 
@@ -585,6 +588,7 @@ class BankInstance:
         self.accounts = self.db.Base('accounts')
         self.registry = self.db.Base('banks')
         self.marketplace = self.db.Base('shop')
+        self.inventories = self.db.Base('inventories')
 
     def get_account(self, id: str | NSID) -> BankAccount:
         """
@@ -632,9 +636,9 @@ class BankInstance:
 
         self.save_account(account)
 
-    def get_item(self, id: str | NSID) -> Item | None:
+    def get_sale(self, id: str | NSID) -> Sale | None:
         """
-        Récupère un item du marché.
+        Récupère une vente disponible sur le marketplace.
 
         ## Paramètres
         id: `str | NSID`
@@ -651,28 +655,98 @@ class BankInstance:
         if _data is None:
             return None
 
-        item = Item(id)
-        item.title = _data['title']
-        item.emoji = _data['emoji']
-        item.seller_id = _data['seller']
-        item.price = _data['price']
+        sale = Sale(NSID(id))
+
+        del _data['key']
+        sale.__dict__ = _data
+
+        return sale
+
+    def sell_item(self, item: Item, quantity: int, price: int, seller: NSID) -> None:
+        """
+        Vend un item sur le marché.
+        
+        ## Paramètres
+        item: `.Item`
+            Item à vendre
+        quantity: `int`
+            Nombre d'items à vendre
+        price: `int`
+            Prix à l'unité de chaque objet
+        seller: `NSID`
+            ID de l'auteur de la vente
+        """
+
+        sale = Sale(NSID(round(time.time()) * 16 ** 3), item)
+        sale.quantity = quantity
+        sale.price = price
+        sale.seller_id = seller
 
-        return item
+        _data = sale.__dict__.copy()
+        del _data['id']
 
-    def save_item(self, item: Item) -> None:
-        """Sauvegarde un item dans la base de données du marché."""
+        self.marketplace.put(key = sale.id, data = _data)
 
-        item.id = NSID(item.id)
+    def delete_sale(self, sale: Sale) -> None:
+        """Annule une vente sur le marketplace."""
 
-        _data = item.__dict__.copy()
+        sale.id = NSID(sale.id)
+        self.marketplace.delete(sale.id)
 
-        self.marketplace.put(key = item.id, data = _data)
+    def get_inventory(self, id: NSID) -> Inventory | None:
+        """
+        Récupérer un inventaire dans la base des inventaires.
+
+        ## Paramètres
+        id: `NSID`
+            ID du propriétaire de l'inventaire
+
+        ## Retourne
+        - `.Inventory | None`
+        """
+        _data = self.inventories.get(id)
+
+        if _data is None:
+            return None
 
-    def delete_item(self, item: Item) -> None:
-        """Supprime un item du marché."""
+        inventory = Inventory(id)
 
-        item.id = NSID(item.id)
-        self.marketplace.delete(item.id)
+        del _data['key']
+
+        for _item in _data['objects']:
+            item = Item(_item['id'])
+            item.__dict__ = _item
+
+            inventory.objects.append(item)
+
+        return inventory
+
+    def save_inventory(self, inventory: Inventory) -> None:
+        """
+        Sauvegarder un inventaire
+
+        ## Paramètres
+        inventory: `.Inventory`
+            Inventaire à sauvegarder
+        """
+
+        _data = {
+            "owner_id": inventory.owner_id,
+            "objects": [ object.__dict__ for object in inventory.objects ]
+        }
+
+        self.inventories.put(key = inventory.owner_id, data = _data)
+
+    def delete_inventory(self, inventory: Inventory) -> None:
+        """
+        Supprime un inventaire
+
+        ## Paramètres
+        inventory: `.Inventory`
+            Inventaire à supprimer
+        """
+
+        self.inventories.delete(inventory.id)
 
     def _add_archive(self, archive: Action):
         """Ajoute une archive d'une transaction ou d'une vente dans la base de données."""
@@ -686,8 +760,6 @@ class BankInstance:
         if type(archive) == Transaction:
             _data['type'] = "transaction"
             archive.currency = archive.currency.upper()
-        elif type(archive) == Sale:
-            _data['type'] = "sale"
         else:
             _data['type'] = "unknown"
 
@@ -716,10 +788,6 @@ class BankInstance:
 
             archive.reason = _data['reason']
             archive.currency = _data['currency']
-        elif _data['type'] == "sale":
-            archive = Sale(_data['author'], _data['target'])
-
-            archive.price = _data['price']
         else:
             archive = Action(_data['author'], _data['target'])
 
@@ -740,7 +808,7 @@ class BankInstance:
         ## Renvoie
         - `list[Action | Transaction]`
         """
-        
+
         _res = self.archives.fetch(query).items
 
         return [ self._get_archive(archive['key']) for archive in _res ]

nsarchive/cls/archives.py

@@ -67,10 +67,4 @@ class Transaction(Action):
 
         self.amount: int = amount
         self.currency: str = 'HC'
-        self.reason: str = None
-
-class Sale(Action):
-    def __init__(self, author: str | NSID = '0', target: str | NSID = '0') -> None:
-        super().__init__(author, target)
-
-        self.price: int = 0
+        self.reason: str = None

nsarchive/cls/economy.py

@@ -1,3 +1,4 @@
+from nsarchive.cls.base import NSID
 from .base import *
 
 class BankAccount:
@@ -16,5 +17,26 @@ class Item:
         self.title: str = "Unknown Object"
         self.emoji: str = ":light_bulb:"
 
-        self.seller_id: NSID = NSID(0)
-        self.price: int = 0
+class Inventory:
+    def __init__(self, owner_id: NSID) -> None:
+        self.owner_id: NSID = NSID(owner_id)
+        self.objects: list[Item] = []
+
+    def append(self, item: Item, quantity: int = 1):
+        self.objects.extend(quantity * [item])
+
+    def throw(self, item: Item, quantity: int = 1):
+        if quantity > self.objects.count(item):
+            quantity = self.objects.count(item)
+
+        for i in range(quantity):
+            self.objects.remove(item)
+
+class Sale:
+    def __init__(self, id: NSID, item: Item) -> None:
+        self.id: NSID = NSID(id)
+        self.item: NSID = NSID(item.id)
+        self.quantity: int = 1
+
+        self.price: int = 0
+        self.seller_id: NSID = NSID('0')

{nsarchive-1.2.7.dist-info → nsarchive-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nsarchive
-Version: 1.2.7
+Version: 1.3.0
 Summary: 
 License: GPL-3.0
 Author: happex

{nsarchive-1.2.7.dist-info → nsarchive-1.3.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
-nsarchive/__init__.py,sha256=em_ZUYYNq0FQ5ggy_ArfJm_PpnAVx3IebsFs7X-uwi8,25361
+nsarchive/__init__.py,sha256=idTG-9WiUJZ6rkkRXwjBvt_lC-lOKyz6eSS22vSMi3k,27011
 nsarchive/assets/default_avatar.png,sha256=n-4vG_WPke8LvbY3ZU6oA-H-OtRoIu7woKnRq9DCIlI,51764
-nsarchive/cls/archives.py,sha256=Nmt3C0Zq9oGQdCXSzm_wo70VbNq89SY3dx9KKqEpoCg,2182
+nsarchive/cls/archives.py,sha256=i4R7NPYXX_1oi0oLAvL_4SqyjqPutXSXKysUetE6hME,2001
 nsarchive/cls/base.py,sha256=DGDm0uD96M00-qvdKsltU9kAfAOBr85Ov0b18gTnoIM,714
-nsarchive/cls/economy.py,sha256=RjFu3VzNunazslbd4Ia5p1Jr-jJP5CvIcbVOzkDTwTU,549
+nsarchive/cls/economy.py,sha256=JpNB06JHek4uUapdk89-SR3DEoSyxXPn8OqZJkOZH_E,1252
 nsarchive/cls/entities.py,sha256=Rvu2Q1mTWqQ-z92j-OXhoXSWked7p4tOCJm0gIlnP9c,6179
 nsarchive/cls/exceptions.py,sha256=QN6Qn7cxTkGoC4lO50hBAq4gZCgo7scQvCkb-xKl6Xs,692
 nsarchive/cls/republic.py,sha256=6eut6OsFoOm9TVhA41fM3NlMEA3Uhg9TCuXgl46vFko,1985
 nsarchive/utils/assets.py,sha256=hd0STSpa0yT-OJlUyI_wCYXJqcBiUMQds2pZTXNNg9c,382
-nsarchive-1.2.7.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
-nsarchive-1.2.7.dist-info/METADATA,sha256=tleGPFqAzbaDj0MV1_15VEZm4j4hyHULz6InJS0XWSw,5629
-nsarchive-1.2.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nsarchive-1.2.7.dist-info/RECORD,,
+nsarchive-1.3.0.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
+nsarchive-1.3.0.dist-info/METADATA,sha256=kndn-qxF_P0cYEo92vaKArA1Vpgn35ao_y7poWqQFo8,5629
+nsarchive-1.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nsarchive-1.3.0.dist-info/RECORD,,