diff --git a/entity/RouMan.py b/entity/RouMan.py index 6a06967..1750dfc 100644 --- a/entity/RouMan.py +++ b/entity/RouMan.py @@ -39,5 +39,5 @@ class comicEntity: baseComic.oneComic(url=c_url,title=title,author=author, icon=icon,tags=tags,dep=dep,chapters=chapters,chapter_href=chapter_href, - alias=alias,genre="韩漫") + alias=alias,genre="韩漫",age_rating="R18+") comicInfo.updateComicDate(date=date) \ No newline at end of file diff --git a/utils/base/BaseComicEntity.py b/utils/base/BaseComicEntity.py index 3362b45..5c3f218 100644 --- a/utils/base/BaseComicEntity.py +++ b/utils/base/BaseComicEntity.py @@ -44,9 +44,9 @@ class baseComic: return None @classmethod - def oneComic(cls,url,title,author,icon,tags,dep,chapters,chapter_href,alias=None,genre=None,lang="zh",sleep=None): + def oneComic(cls,url,title,author,icon,tags,dep,chapters,chapter_href,alias=None,genre=None,lang="zh",age_rating=None,sleep=None): ci.setComicInfo(homepage=url,comicname=title,alias=ci.setComicNames(title+","+alias), - author=author,icon=icon,tags=tags,dep=dep,genre=genre,lang=lang,chapters=chapters) + author=author,icon=icon,tags=tags,dep=dep,genre=genre,lang=lang,age_rating=age_rating,chapters=chapters) cls.count_chapter = 0 for href in chapter_href: ci.setChapterName(chapters[cls.count_chapter]) diff --git a/utils/comic/ComicInfo.py b/utils/comic/ComicInfo.py index bc87c0e..d1147a4 100644 --- a/utils/comic/ComicInfo.py +++ b/utils/comic/ComicInfo.py @@ -35,6 +35,7 @@ class comicInfo(): page_count = "PageCount" pages = "Pages" web = "Web" + age_rating = "AgeRating" str_comic_name = None str_chapter = None @@ -70,6 +71,7 @@ class comicInfo(): page_count_node = None pages_node = None web_node = None + age_rating_node = None @classmethod def setNodeAndValue(cls,node,value): @@ -120,6 +122,8 @@ class comicInfo(): @classmethod def setLang(cls,value): cls.lang_node = cls.setNodeAndValue(cls.lang, value) @classmethod + def setAgeRating(cls,value): cls.age_rating_node = cls.setNodeAndValue(cls.age_rating, value) + @classmethod def setGenre(cls,value): cls.genre_node = cls.setNodeAndValue(cls.genre, cls.getListToString(value)) @classmethod def setTags(cls,value): cls.tags_node = cls.setNodeAndValue(cls.tags,cls.getListToString(value)) @@ -336,6 +340,7 @@ class comicInfo(): if cls.genre_node != None: root.appendChild(cls.genre_node) if cls.cbs_node != None: root.appendChild(cls.cbs_node) if cls.lang_node != None: root.appendChild(cls.lang_node) + if cls.age_rating_node != None: root.appendChild(cls.age_rating_node) if cls.comic_names_node != None: root.appendChild(cls.comic_names_node) if cls.tags_node != None: root.appendChild(cls.tags_node) if cls.date_year_node != None: root.appendChild(cls.date_year_node) @@ -449,7 +454,7 @@ class comicInfo(): @classmethod def setComicInfo(cls,comicname=None,homepage=None,alias=None,author=None,icon=None,tags=None, - dep=None,genre=None,lang=None,chapters=None,update_at=None,current_chapter_img=None): + dep=None,genre=None,lang=None,age_rating=None,chapters=None,update_at=None,current_chapter_img=None): author = str(author).replace("&",",").replace(" ",",") cls.setHomePage(homepage) cls.setComicName(str(comicname)) @@ -461,6 +466,7 @@ class comicInfo(): #comicInfo.setCBS("韩漫") if genre != None: cls.setGenre(genre) cls.setLang(lang) + cls.setAgeRating(age_rating) cls.setListChapter(chapters) cls.setUpdateAt(update_at) cls.setCurrentChapterImg(current_chapter_img) \ No newline at end of file