Release1. Added TeamMember, Team, Friend, Comment. Updated README.md

mangalib_parser/__init__.py

@@ -0,0 +1,2 @@
+from mangalib_parser.objects import *
+from mangalib_parser.data import *

mangalib_parser/data/__init__.py

@@ -0,0 +1 @@
+from mangalib_parser.data import level, sites, statuses, models

mangalib_parser/data/models.py

@@ -1,13 +1,24 @@
 class Model:
-    def __init__(self, model: str):
+    def __init__(self, model: str, name: str):
         self.model = model
+        self.name = name
+
+    def __str__(self):
+        return self.name
 
-MANGA = Model('manga')
-USER = Model('user')
+POST = Model('post', 'Пост')
+CHAPTER = Model('chapter', 'Глава')
+EPISODES = Model('episodes', 'Эпизод')
+MANGA = Model('manga', 'Манга/Ранобе')
+ANIME = Model('anime', 'Аниме')
+USER = Model('user', 'Пользователь')
+TEAM = Model('team', 'Команда')
+COLLECTION = Model('collection', 'Коллекция')
+REVIEW = Model('review', 'Отзыв')
 
 
-MODELS_LIST = [MANGA, USER]
-MODELS = ['manga', 'user']
+MODELS_LIST = [MANGA, USER, TEAM, CHAPTER, POST, ANIME, EPISODES, COLLECTION, REVIEW]
 def get_tmodel_by_model(model:str) -> Model:
-    index = MODELS.index(model)
-    return MODELS_LIST[index]
+    for tmodel in MODELS_LIST:
+        if tmodel.model == model:
+            return tmodel

mangalib_parser/data/sites.py

@@ -11,6 +11,8 @@ def __init__(
             'referer': 'https://' + self.domain + '/',
             'site-id': str(self.id),
         }
+    def __str__(self):
+        return self.domain
 
 
 MANGALIB = Site(1, 'mangalib.me')
@@ -21,8 +23,7 @@ def __init__(
 
 
 SITES_LIST = [MANGALIB, SLASHLIB, RANOBELIB, HENTAILIB, ANIMELIB]
-IDS = [1,2,3,4, 5]
-
 def get_site_by_id(id:int) -> Site:
-    index = IDS.index(id)
-    return SITES_LIST[index]
+    for site in SITES_LIST:
+        if site.id == id:
+            return site

mangalib_parser/data/statuses.py

@@ -2,6 +2,9 @@ class Status:
     def __init__(self, id: int, name: str):
         self.id = id
         self.name = name
+
+    def __str__(self):
+        return self.name
 
 # manga
 ALL = Status(0, 'Все')
@@ -25,10 +28,7 @@ def __init__(self, id: int, name: str):
     ALL, READING, IN_PLANS, ABADONED, READ, FAVORITES, 
     WATCHING, PLANNED, ANI_ABADONED, VIEWED, ANI_FAVORITES, REWATCHING, POSTPONED,
 ]
-IDS = [
-    0,1,2,3,4,5,
-    21,22,23,24,25,26,27,
-]
 def get_status_by_id(id:int) -> Status:
-    index = IDS.index(id)
-    return STATUSES_LIST[index]
+    for status in STATUSES_LIST:
+        if status.id == id:
+            return status

mangalib_parser/objects/__init__.py

@@ -0,0 +1,6 @@
+from mangalib_parser.objects.user import User
+from mangalib_parser.objects.comment import Comment
+from mangalib_parser.objects.bookmark import Bookmark
+from mangalib_parser.objects.friend import Friend
+from mangalib_parser.objects.team_member import TeamMember
+from mangalib_parser.objects.team import Team

mangalib_parser/objects/bookmark.py

@@ -1,7 +1,24 @@
+from datetime import datetime
+from mangalib_parser.data import models, sites, statuses
 from mangalib_parser.objects.main_object import MainObject
 
 
 class Bookmark(MainObject):
     def __init__(self, **kwargs):
-        self.__dict__ = kwargs
-        self.url = self.get_url()
+
+        self.chapter: int = None
+        self.page: int = None
+        self.status: statuses.Status = None
+        self.created_at: datetime = None
+        self.updated_at: datetime = None
+        self.name: str = None
+        self.rus_name: str = None
+        self.slug_url: str = None
+        self.site: sites.Site = None
+        self.model: models.Model = None
+
+        self.__dict__.update(kwargs)
+        self.url: str = self.get_url()
+
+    def __str__(self):
+        return f'Bookmark({self.name})'

mangalib_parser/objects/comment.py

@@ -0,0 +1,20 @@
+from datetime import datetime
+from mangalib_parser.data import models, sites
+from mangalib_parser.objects.main_object import MainObject
+
+
+class Comment(MainObject):
+    def __init__(self, comment: str, id: int, created_at: datetime, user_id: int, votes: list[int, int], relation_type: models.Model, **kwargs):
+        self.comment = comment
+        self.id = id
+        self.created_at = created_at
+        self.user_id = user_id
+        self.votes = votes   #list[down, up]
+        self.relation_type = relation_type
+        self.slug_url: str|int = ''
+        self.url: str = ''
+
+        self.__dict__.update(kwargs)
+
+    def __str__(self):
+        return f'Comment({self.comment})'

mangalib_parser/objects/friend.py

@@ -0,0 +1,16 @@
+from datetime import datetime
+from mangalib_parser.objects.main_object import MainObject
+from mangalib_parser.settings.logging import do_log
+
+
+class Friend(MainObject):
+    def __init__(self, user_id: int, **kwargs):
+        self.user_id: int = user_id
+
+        self.comment: str = None
+        self.created_at: datetime = None
+        self.status: dict = None
+        self.__dict__.update(kwargs)
+
+    def __str__(self):
+        return f'Friend({self.user_id})'

mangalib_parser/objects/main_object.py

@@ -1,6 +1,6 @@
 from mangalib_parser.data import sites
 from mangalib_parser.data.sites import Site
-from mangalib_parser.utils import get_pages
+from mangalib_parser.utils.parser import get_pages
 
 class MainObject: