nsarchive 2.0.0a4__py3-none-any.whl → 2.0.0a6__py3-none-any.whl

nsarchive/__init__.py

@@ -18,6 +18,7 @@ from .cls.base import NSID
 from .cls.archives import *
 from .cls.entities import *
 from .cls.republic import *
+from .cls.economy import *
 
 from .cls.exceptions import *
 

nsarchive/cls/base.py

@@ -113,12 +113,13 @@ class Instance:
 
         for key, value in query.items():
             entity = self._select_from_db(table, key, value)
-            if entity is not None: matches.append(entity[0])
 
-        _res = []
+            if entity is not None:
+                matches.append(entity)
 
-        for item in matches:
-            if all(item in sublist for sublist in matches[1:]):
-                _res.append(item)
+        if not matches or len(matches) != len(query):
+            return []
 
-        return _res
+        _res = [ item for item in matches[0] if all(item in match for match in matches[1:]) ]
+
+        return _res

nsarchive/cls/economy.py

@@ -19,17 +19,20 @@ class Item:
 class Inventory:
     def __init__(self, owner_id: NSID) -> None:
         self.owner_id: NSID = NSID(owner_id)
-        self.objects: list[Item] = []
+        self.objects: dict[str, NSID] = {}
 
     def append(self, item: Item, quantity: int = 1):
-        self.objects.extend(quantity * [ item ])
+        if item.id in self.objects.keys():
+            self.objects[item.id] += quantity
+        else:
+            self.objects[item.id] = quantity
 
     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)
+        if item.id in self.objects.keys():
+            if self.objects[item.id] > quantity:
+                self.objects[item.id] -= quantity
+            else:
+                self.objects[item.id] = 0
 
 class Sale:
     def __init__(self, id: NSID, item: Item) -> None:

nsarchive/cls/entities.py

@@ -43,7 +43,7 @@ class Entity:
         self.id: NSID = NSID(id) # ID hexadécimal de l'entité (ou nom dans le cas de l'entreprise)
         self.name: str = "Entité Inconnue"
         self.registerDate: int = 0
-        self.legalPosition: Position = Position()
+        self.position: Position = Position()
         self.additional: dict = {}
 
     def set_name(self, new_name: str) -> None:
@@ -53,7 +53,7 @@ class Entity:
         self.name = new_name
 
     def set_position(self, position: str) -> None:
-        self.legalPosition = position
+        self.position = position
 
     def add_link(self, key: str, value: str | int) -> None:
         if isinstance(value, str) or isinstance(value, int):

nsarchive/cls/republic.py

@@ -11,7 +11,7 @@ class Vote:
         self.startDate: int = 0
         self.endDate: int = 0
 
-class ClosedVote(Vote): # Meilleur nom pour cette classe en v2
+class Referendum(Vote):
     def __init__(self, id: str | NSID, title: str) -> None:
         super().__init__(id, title, ('yes', 'no', 'blank'))
 

nsarchive/instances/_economy.py

@@ -39,8 +39,9 @@ class EconomyInstance(Instance):
         account = BankAccount(id)
         account.amount = _data['amount']
         account.frozen = _data['frozen']
-        account.owner = _data['owner_id']
+        account.owner = NSID(_data['owner_id'])
         account.bank = _data['bank']
+        account.income = _data['income']
 
         return account
 
@@ -52,7 +53,8 @@ class EconomyInstance(Instance):
             'amount': account.amount,
             'frozen': account.frozen, 
             'owner_id': account.owner, 
-            'bank': account.bank
+            'bank': account.bank,
+            'income': account.income
         }
 
         self._put_in_db('accounts', _data)
@@ -66,19 +68,66 @@ class EconomyInstance(Instance):
         self.save_account(account)
 
     """
-    ---- VENTES ----
+    ---- OBJETS & VENTES ----
     """
 
-    def get_sale(self, id: str | NSID) -> Sale | None:
+    def save_item(self, item: Item) -> None:
+        """
+        Sauvegarde des infos à propos d'un item.
+
+        ## Paramètres
+        item: `.Item`\n
+            Article à sauvegarder
+        """
+
+        _item = item.__dict__
+        self._put_in_db('items', _item)
+
+    def get_item(self, id: NSID) -> Item | None:
+        """
+        Récupère des informations à propos d'un item.
+
+        ## Paramètres
+        id: `NSID`\n
+            ID de l'item
+
+        ## Retourne
+        - `.Item` si quelque chose est trouvé, sinon
+        - `None`
+        """
+
+        _item = self._get_by_ID('items', id)
+
+        if _item is None:
+            return
+
+        item = Item(id)
+        item.title = _item['title']
+        item.emoji = _item['emoji']
+
+        return item
+
+    def delete_item(self, item: Item) -> None:
+        """
+        Annule le référencement d'un item.
+
+        ## Paramètres
+        item: `.Item`\n
+            Item à vendre
+        """
+
+        self._delete_by_ID('items', item.id)
+
+    def get_sale(self, id: NSID) -> Sale | None:
         """
         Récupère une vente disponible sur le marketplace.
 
         ## Paramètres
-        id: `str | NSID`\n
-            ID de l'item.
+        id: `NSID`\n
+            ID de la vente.
 
         ## Renvoie
-        - `.Item | None`
+        - `.Sale | None`
         """
 
         id = NSID(id)
@@ -87,8 +136,10 @@ class EconomyInstance(Instance):
 
         if _data is None:
             return None
+        
+        item = self.get_item(_data['id'])
 
-        sale = Sale(NSID(id))
+        sale = Sale(NSID(id), Item(_data['id']) if item is None else item)
         sale.__dict__ = _data
 
         return sale
@@ -147,8 +198,7 @@ class EconomyInstance(Instance):
         inventory = Inventory(id)
 
         for _item in _data['objects']:
-            item = Item(_item['id'])
-            item.__dict__ = _item
+            item = self.get_item(_item)
 
             inventory.objects.append(item)
 
@@ -163,10 +213,7 @@ class EconomyInstance(Instance):
             Inventaire à sauvegarder
         """
 
-        _data = {
-            "owner_id": inventory.owner_id,
-            "objects": [ object.__dict__ for object in inventory.objects ]
-        }
+        _data = inventory.__dict__
 
         self._put_in_db('inventories', _data)
 

nsarchive/instances/_entities.py

@@ -72,7 +72,7 @@ class EntityInstance(Instance):
                 _member_profile = self.get_entity(member.id)
 
                 member.set_name(_member_profile.name)
-                member.legalPosition = _member_profile.legalPosition
+                member.position = _member_profile.position
                 member.registerDate = _member_profile.registerDate
 
                 member.xp = _member_profile.xp
@@ -89,7 +89,7 @@ class EntityInstance(Instance):
             entity = Entity(id)
 
         entity.name = _data['name']
-        entity.legalPosition = _data['position'] # Métier si c'est un utilisateur, domaine professionnel si c'est un collectif
+        entity.position = _data['position'] # Métier si c'est un utilisateur, domaine professionnel si c'est un collectif
         entity.registerDate = _data['register_date']
 
         for  key, value in _data.get('additional', {}).items():
@@ -114,7 +114,7 @@ class EntityInstance(Instance):
         _data = {
             'id': entity.id,
             'name': entity.name,
-            'position': entity.legalPosition,
+            'position': entity.position,
             'register_date': entity.registerDate,
             'additional': {},
         }

nsarchive/instances/_republic.py

@@ -26,7 +26,7 @@ class RepublicInstance(Instance):
     ---- VOTES & REFERENDUMS ----
     """
 
-    def get_vote(self, id: str | NSID) -> Vote | ClosedVote | Lawsuit:
+    def get_vote(self, id: str | NSID) -> Vote | Referendum | Lawsuit:
         """
         Récupère un vote spécifique.
 
@@ -44,10 +44,10 @@ class RepublicInstance(Instance):
         if _data is None:
             return None
 
-        if _data['_type'] == 'open':
+        if _data['_type'] == 'vote':
             vote = Vote(id, _data['title'], tuple(_data['choices'].keys()))
-        elif _data['_type'] == 'closed':
-            vote = ClosedVote(id, _data['title'])
+        elif _data['_type'] == 'referendum':
+            vote = Referendum(id, _data['title'])
         elif _data['_type'] == 'lawsuit':
             vote = Lawsuit(id, _data['title'])
         else:
@@ -60,14 +60,14 @@ class RepublicInstance(Instance):
 
         return vote
 
-    def save_vote(self, vote: Vote | ClosedVote) -> None:
+    def save_vote(self, vote: Vote | Referendum) -> None:
         """Sauvegarde un vote dans la base de données."""
 
         vote.id = NSID(vote.id)
 
         _data = {
-            '_type':'open' if type(vote) == Vote else\
-                    'closed' if type(vote) == ClosedVote else\
+            '_type':'vote' if type(vote) == Vote else\
+                    'referendum' if type(vote) == Referendum else\
                     'lawsuit' if type(vote) == Lawsuit else\
                     'unknown',
             'title': vote.title,

{nsarchive-2.0.0a4.dist-info → nsarchive-2.0.0a6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nsarchive
-Version: 2.0.0a4
+Version: 2.0.0a6
 Summary: API-wrapper pour récupérer des données liées à Nation
 License: GPL-3.0
 Author: happex

nsarchive-2.0.0a6.dist-info/RECORD

@@ -0,0 +1,16 @@
+nsarchive/__init__.py,sha256=_hwIocDyD7R-4rS7ypca8jZex93H6mK-b9NpTpt-Rvo,724
+nsarchive/assets/default_avatar.png,sha256=n-4vG_WPke8LvbY3ZU6oA-H-OtRoIu7woKnRq9DCIlI,51764
+nsarchive/cls/archives.py,sha256=HHQhGKdnl7vD5zC8-bbXeQLhp8A98bBlneJTkztOmMg,2007
+nsarchive/cls/base.py,sha256=RWcpUDfo96BjsUR_G49c9mR80qZKGKD82RoZB2do1p8,3606
+nsarchive/cls/economy.py,sha256=fnzmliHsUBEdu5RrrSkimpcgou_HFnivP_lmzLKCaDI,1360
+nsarchive/cls/entities.py,sha256=hjqCtsQHQZrLFwR57d_n4FssJ53-jdniQMHUAJGuDPY,6612
+nsarchive/cls/exceptions.py,sha256=QN6Qn7cxTkGoC4lO50hBAq4gZCgo7scQvCkb-xKl6Xs,692
+nsarchive/cls/republic.py,sha256=4amjvCS5BnrvEgbjjDx_tOit3TbOSCMTsns6ifceL_8,2464
+nsarchive/instances/_economy.py,sha256=PjdqVJspZIuge5oqeJ_7fWrddfogH2yCEu0EgOhJv90,7445
+nsarchive/instances/_entities.py,sha256=VckXexRhsZRq4qLZuMWp74sB5gLeuR4sj8yXxijFI94,9814
+nsarchive/instances/_republic.py,sha256=sIaqz2lhmmjz3Y8l4iwY737JVCVt077OwP0-1dPsEaw,10071
+nsarchive/utils/assets.py,sha256=WGC03K1VZ5LwGzcVXbqphtGBZ_Vjso-1hmbIkpgL_X8,382
+nsarchive-2.0.0a6.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
+nsarchive-2.0.0a6.dist-info/METADATA,sha256=i4aiTtyC5fc5kr8PD7TOCtAfxJwfATw60Gim-t5xY9k,5697
+nsarchive-2.0.0a6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nsarchive-2.0.0a6.dist-info/RECORD,,

nsarchive-2.0.0a4.dist-info/RECORD

@@ -1,16 +0,0 @@
-nsarchive/__init__.py,sha256=-yXGGJBOkoQo-6Vg6hJVIqr-C7sQyL_LaYcQ3yx9aFs,696
-nsarchive/assets/default_avatar.png,sha256=n-4vG_WPke8LvbY3ZU6oA-H-OtRoIu7woKnRq9DCIlI,51764
-nsarchive/cls/archives.py,sha256=HHQhGKdnl7vD5zC8-bbXeQLhp8A98bBlneJTkztOmMg,2007
-nsarchive/cls/base.py,sha256=7DRehwuUETaelrVDCQiOx3lZC00XhX5iVIIjTqnlM4s,3564
-nsarchive/cls/economy.py,sha256=-eV8R5KMXSeXcKEu2G8OP1UgYgb0X6uks0aD2XhlbcU,1220
-nsarchive/cls/entities.py,sha256=-88-mfd58PjuTHuOLH9COoa447Dp0e7d70Naa9TS_Ow,6622
-nsarchive/cls/exceptions.py,sha256=QN6Qn7cxTkGoC4lO50hBAq4gZCgo7scQvCkb-xKl6Xs,692
-nsarchive/cls/republic.py,sha256=F6il2FrvCoutHxQlW3xM36GaFfIqdorg2jicMAlPdUo,2503
-nsarchive/instances/_economy.py,sha256=kaFRm6SpWCgvkv-PTVicGztL3e34gSy6WZQDiLZLaT4,6346
-nsarchive/instances/_entities.py,sha256=HX1yDqIC5gr0XOx9PpwHbZ42f3WI9P4z9NWhBxNUQFk,9834
-nsarchive/instances/_republic.py,sha256=TBfgILDJujbp5tiEgbHGnP_uuW1tdAzGUtkwJmuMogE,10063
-nsarchive/utils/assets.py,sha256=WGC03K1VZ5LwGzcVXbqphtGBZ_Vjso-1hmbIkpgL_X8,382
-nsarchive-2.0.0a4.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
-nsarchive-2.0.0a4.dist-info/METADATA,sha256=C3k5PaWIG3o1gMHFosXOUwGWHytHufq291hxEKqdVQo,5697
-nsarchive-2.0.0a4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nsarchive-2.0.0a4.dist-info/RECORD,,