From 25628d18a51f5a6a4d10d09f18eda8b94ccdae15 Mon Sep 17 00:00:00 2001
From: EstrellaXD <estrellaxd05@gmail.com>
Date: Wed, 15 Mar 2023 10:50:26 +0800
Subject: [PATCH] Update models

---
 src/module/models/api.py                 |  3 ++-
 src/module/models/bangumi.py             | 14 ++++++++++++++
 src/module/parser/analyser/raw_parser.py | 15 ++-------------
 src/module/parser/fuzz_match.py          | 14 ++------------
 src/module/parser/title_parser.py        |  2 ++
 5 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/module/models/api.py b/src/module/models/api.py
index 9843e7cb..6cad39aa 100644
--- a/src/module/models/api.py
+++ b/src/module/models/api.py
@@ -15,4 +15,5 @@ class ChangeConfig(BaseModel):
 
 
 class ChangeRule(BaseModel):
-    rule: dict
\ No newline at end of file
+    rule: dict
+
diff --git a/src/module/models/bangumi.py b/src/module/models/bangumi.py
index c175bc10..cb66fc45 100644
--- a/src/module/models/bangumi.py
+++ b/src/module/models/bangumi.py
@@ -8,7 +8,21 @@ class MatchRule:
     rss_link: str
 
 
+@dataclass
 class GroupFilter:
     name: str
     filter: list
 
+
+@dataclass
+class Episode:
+    title_en: str | None
+    title_zh: str | None
+    title_jp: str | None
+    season: int
+    season_raw: str
+    episode: int
+    sub: str
+    group: str
+    resolution: str
+    source: str
diff --git a/src/module/parser/analyser/raw_parser.py b/src/module/parser/analyser/raw_parser.py
index 72fb7713..e2c093c7 100644
--- a/src/module/parser/analyser/raw_parser.py
+++ b/src/module/parser/analyser/raw_parser.py
@@ -2,7 +2,7 @@ import logging
 import re
 from dataclasses import dataclass
 
-# from parser.episode import Episode
+from module.models import Episode
 
 logger = logging.getLogger(__name__)
 
@@ -30,18 +30,7 @@ CHINESE_NUMBER_MAP = {
 }
 
 
-@dataclass
-class Episode:
-    title_en: str or None
-    title_zh: str or None
-    title_jp: str or None
-    season: int
-    season_raw: str
-    episode: int
-    sub: str
-    group: str
-    resolution: str
-    source: str
+
 
 
 class RawParser:
diff --git a/src/module/parser/fuzz_match.py b/src/module/parser/fuzz_match.py
index 924bc890..15b761d6 100644
--- a/src/module/parser/fuzz_match.py
+++ b/src/module/parser/fuzz_match.py
@@ -1,7 +1,7 @@
 from thefuzz import fuzz
 import logging
-from utils import json_config
-from conf import settings
+from module.utils import json_config
+from module.conf import settings
 
 logger = logging.getLogger(__name__)
 
@@ -40,13 +40,3 @@ class FuzzMatch:
         return max_value, max_info["main"]
         # logger.debug(max(value))
 
-
-if __name__ == "__main__":
-    from conf.const_dev import DEV_SETTINGS
-    settings.init(DEV_SETTINGS)
-    f = FuzzMatch()
-    name = "勇者、辞职不干了"
-    value, title = f.find_max_name(name)
-    print(f"Raw    Name: {name} \n"
-          f"Match  Name: {title} \n"
-          f"Match Value: {value}")
diff --git a/src/module/parser/title_parser.py b/src/module/parser/title_parser.py
index e918d135..0cfdaad3 100644
--- a/src/module/parser/title_parser.py
+++ b/src/module/parser/title_parser.py
@@ -1,11 +1,13 @@
 import logging
 
 from .analyser import RawParser, DownloadParser, TMDBMatcher
+
 from module.conf import settings
 
 logger = logging.getLogger(__name__)
 LANGUAGE = settings.rss_parser.language
 
+
 class TitleParser:
     def __init__(self):
         self._raw_parser = RawParser()