nsarchive 1.2.3__py3-none-any.whl → 1.2.5__py3-none-any.whl

nsarchive/__init__.py

@@ -166,7 +166,7 @@ class EntityInstance:
         query: `dict`
             La requête pour filtrer les entités.
         listquery: `dict | None`
-            Requête secondaire pour n'afficher que les listes contenant un certain élément.
+            OBSOLÈTE
 
         ## Renvoie
         - `list[Entity | User | Organization]`
@@ -174,11 +174,8 @@ class EntityInstance:
 
         _res = self.base.fetch(query).items
 
-        if listquery is not None:
-            for item in _res:
-                for target, value in listquery.items():
-                    if value not in item[target]:
-                        _res.remove(item)
+        if listquery:
+            print("\033[1;33mAvertissement\033[0m Listquery n'est plus pris en charge et sera retiré en version 1.3.0")
 
         return [ self.get_entity(NSID(entity['key'])) for entity in _res ]
 
@@ -195,9 +192,16 @@ class EntityInstance:
         """
 
         id = NSID(id)
-        groups = self.fetch_entities({'_type': 'organization'}, {'members': id})
+        groups = self.fetch_entities({'_type': 'organization'})
         groups.extend(self.fetch_entities({'_type': 'organization', 'owner_id': id}))
-        
+
+        for group in groups:
+            for member in group.members:
+                if member.id == id:
+                    break
+            else:
+                groups.remove(group)
+
         return [ group for group in groups if group is not None ]
 
     def get_position(self, id: str) -> Position:

nsarchive/cls/entities.py

@@ -140,7 +140,7 @@ class Organization(Entity):
     def add_member(self, member: GroupMember) -> None:
         if not isinstance(member, GroupMember):
             raise TypeError("Le membre doit être de type GroupMember")
-        
+
         self.members.append(member)
 
     def remove_member(self, member: GroupMember) -> None:
@@ -148,6 +148,12 @@ class Organization(Entity):
             if _member.id == member.id:
                 self.members.remove(_member)
 
+    def append(self, member: GroupMember) -> None:
+        self.add_member(member)
+
+    def remove(self, member: GroupMember) -> None:
+        self.remove_member(member)
+
     def set_owner(self, member: User) -> None:
         self.owner = member
 

{nsarchive-1.2.3.dist-info → nsarchive-1.2.5.dist-info}/METADATA

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

{nsarchive-1.2.3.dist-info → nsarchive-1.2.5.dist-info}/RECORD

@@ -1,13 +1,13 @@
-nsarchive/__init__.py,sha256=-T1L5s3ywp4x8BdE1f_hfcm-hXX7olTDeI5YJgajiGY,25217
+nsarchive/__init__.py,sha256=k1-bS7GjHggQ1nacx_fv9qZnqt365p5WCMzQ9rnoljA,25242
 nsarchive/assets/default_avatar.png,sha256=n-4vG_WPke8LvbY3ZU6oA-H-OtRoIu7woKnRq9DCIlI,51764
 nsarchive/cls/archives.py,sha256=Nmt3C0Zq9oGQdCXSzm_wo70VbNq89SY3dx9KKqEpoCg,2182
 nsarchive/cls/base.py,sha256=DGDm0uD96M00-qvdKsltU9kAfAOBr85Ov0b18gTnoIM,714
 nsarchive/cls/economy.py,sha256=RjFu3VzNunazslbd4Ia5p1Jr-jJP5CvIcbVOzkDTwTU,549
-nsarchive/cls/entities.py,sha256=LcL0Ky19lqYQdnYqtF_84-CdlVS1sie05l8vV2yJLyw,6010
+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.3.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
-nsarchive-1.2.3.dist-info/METADATA,sha256=zlaSlxaa7Fo5aUvjpDTxZUZDaNoYmemcWppr8O2AhpA,5629
-nsarchive-1.2.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nsarchive-1.2.3.dist-info/RECORD,,
+nsarchive-1.2.5.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
+nsarchive-1.2.5.dist-info/METADATA,sha256=usI1BWLbz6w23NjDDUj0ZXb1ThZmHPhPkxQ6NkduRQQ,5629
+nsarchive-1.2.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nsarchive-1.2.5.dist-info/RECORD,,