From 95de1b81e7fc609266339af2f9f661ba7a818f64 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Tue, 25 Jul 2023 16:30:15 +0800
Subject: [PATCH] fix plugin

---
 .../sitestatistic/siteuserinfo/__init__.py      | 17 ++++++++++++++++-
 .../sitestatistic/siteuserinfo/discuz.py        |  3 +--
 .../sitestatistic/siteuserinfo/file_list.py     |  3 +--
 .../sitestatistic/siteuserinfo/gazelle.py       |  3 +--
 .../sitestatistic/siteuserinfo/ipt_project.py   |  3 +--
 .../sitestatistic/siteuserinfo/nexus_php.py     |  3 +--
 .../sitestatistic/siteuserinfo/nexus_project.py |  3 +--
 .../sitestatistic/siteuserinfo/nexus_rabbit.py  |  3 +--
 .../sitestatistic/siteuserinfo/small_horse.py   |  3 +--
 app/plugins/sitestatistic/siteuserinfo/tnode.py |  3 +--
 .../sitestatistic/siteuserinfo/torrent_leech.py |  3 +--
 .../sitestatistic/siteuserinfo/unit3d.py        |  3 +--
 app/schemas/types.py                            | 15 ---------------
 13 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/app/plugins/sitestatistic/siteuserinfo/__init__.py b/app/plugins/sitestatistic/siteuserinfo/__init__.py
index b6892eef..5a63b196 100644
--- a/app/plugins/sitestatistic/siteuserinfo/__init__.py
+++ b/app/plugins/sitestatistic/siteuserinfo/__init__.py
@@ -2,6 +2,7 @@
 import json
 import re
 from abc import ABCMeta, abstractmethod
+from enum import Enum
 from typing import Optional
 from urllib.parse import urljoin, urlsplit
 
@@ -13,11 +14,25 @@ from app.helper.cloudflare import under_challenge
 from app.log import logger
 from app.utils.http import RequestUtils
 from app.utils.site import SiteUtils
-from app.schemas.types import SiteSchema
 
 SITE_BASE_ORDER = 1000
 
 
+# 站点框架
+class SiteSchema(Enum):
+    DiscuzX = "Discuz!"
+    Gazelle = "Gazelle"
+    Ipt = "IPTorrents"
+    NexusPhp = "NexusPhp"
+    NexusProject = "NexusProject"
+    NexusRabbit = "NexusRabbit"
+    SmallHorse = "Small Horse"
+    Unit3d = "Unit3d"
+    TorrentLeech = "TorrentLeech"
+    FileList = "FileList"
+    TNode = "TNode"
+
+
 class ISiteUserInfo(metaclass=ABCMeta):
     # 站点模版
     schema = SiteSchema.NexusPhp
diff --git a/app/plugins/sitestatistic/siteuserinfo/discuz.py b/app/plugins/sitestatistic/siteuserinfo/discuz.py
index 4769b76a..03fbb81a 100644
--- a/app/plugins/sitestatistic/siteuserinfo/discuz.py
+++ b/app/plugins/sitestatistic/siteuserinfo/discuz.py
@@ -4,9 +4,8 @@ from typing import Optional
 
 from lxml import etree
 
-from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER
+from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER, SiteSchema
 from app.utils.string import StringUtils
-from app.schemas.types import SiteSchema
 
 
 class DiscuzUserInfo(ISiteUserInfo):
diff --git a/app/plugins/sitestatistic/siteuserinfo/file_list.py b/app/plugins/sitestatistic/siteuserinfo/file_list.py
index b6aaf632..611a4dd0 100644
--- a/app/plugins/sitestatistic/siteuserinfo/file_list.py
+++ b/app/plugins/sitestatistic/siteuserinfo/file_list.py
@@ -4,9 +4,8 @@ from typing import Optional
 
 from lxml import etree
 
-from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER
+from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER, SiteSchema
 from app.utils.string import StringUtils
-from app.schemas.types import SiteSchema
 
 
 class FileListSiteUserInfo(ISiteUserInfo):
diff --git a/app/plugins/sitestatistic/siteuserinfo/gazelle.py b/app/plugins/sitestatistic/siteuserinfo/gazelle.py
index 4d50166b..ae2de5e5 100644
--- a/app/plugins/sitestatistic/siteuserinfo/gazelle.py
+++ b/app/plugins/sitestatistic/siteuserinfo/gazelle.py
@@ -4,9 +4,8 @@ from typing import Optional
 
 from lxml import etree
 
-from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER
+from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER, SiteSchema
 from app.utils.string import StringUtils
-from app.schemas.types import SiteSchema
 
 
 class GazelleSiteUserInfo(ISiteUserInfo):
diff --git a/app/plugins/sitestatistic/siteuserinfo/ipt_project.py b/app/plugins/sitestatistic/siteuserinfo/ipt_project.py
index 22f2e4e6..9eeb2178 100644
--- a/app/plugins/sitestatistic/siteuserinfo/ipt_project.py
+++ b/app/plugins/sitestatistic/siteuserinfo/ipt_project.py
@@ -4,9 +4,8 @@ from typing import Optional
 
 from lxml import etree
 
-from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER
+from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER, SiteSchema
 from app.utils.string import StringUtils
-from app.schemas.types import SiteSchema
 
 
 class IptSiteUserInfo(ISiteUserInfo):
diff --git a/app/plugins/sitestatistic/siteuserinfo/nexus_php.py b/app/plugins/sitestatistic/siteuserinfo/nexus_php.py
index 5982266d..38bbb10b 100644
--- a/app/plugins/sitestatistic/siteuserinfo/nexus_php.py
+++ b/app/plugins/sitestatistic/siteuserinfo/nexus_php.py
@@ -5,9 +5,8 @@ from typing import Optional
 from lxml import etree
 
 from app.log import logger
-from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER
+from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER, SiteSchema
 from app.utils.string import StringUtils
-from app.schemas.types import SiteSchema
 
 
 class NexusPhpSiteUserInfo(ISiteUserInfo):
diff --git a/app/plugins/sitestatistic/siteuserinfo/nexus_project.py b/app/plugins/sitestatistic/siteuserinfo/nexus_project.py
index a3ff89cf..d64c59d3 100644
--- a/app/plugins/sitestatistic/siteuserinfo/nexus_project.py
+++ b/app/plugins/sitestatistic/siteuserinfo/nexus_project.py
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 import re
 
-from app.plugins.sitestatistic.siteuserinfo import SITE_BASE_ORDER
+from app.plugins.sitestatistic.siteuserinfo import SITE_BASE_ORDER, SiteSchema
 from app.plugins.sitestatistic.siteuserinfo.nexus_php import NexusPhpSiteUserInfo
-from app.schemas.types import SiteSchema
 
 
 class NexusProjectSiteUserInfo(NexusPhpSiteUserInfo):
diff --git a/app/plugins/sitestatistic/siteuserinfo/nexus_rabbit.py b/app/plugins/sitestatistic/siteuserinfo/nexus_rabbit.py
index 72619a79..069aace8 100644
--- a/app/plugins/sitestatistic/siteuserinfo/nexus_rabbit.py
+++ b/app/plugins/sitestatistic/siteuserinfo/nexus_rabbit.py
@@ -5,9 +5,8 @@ from typing import Optional
 from lxml import etree
 
 from app.log import logger
-from app.plugins.sitestatistic.siteuserinfo import SITE_BASE_ORDER
+from app.plugins.sitestatistic.siteuserinfo import SITE_BASE_ORDER, SiteSchema
 from app.plugins.sitestatistic.siteuserinfo.nexus_php import NexusPhpSiteUserInfo
-from app.schemas.types import SiteSchema
 
 
 class NexusRabbitSiteUserInfo(NexusPhpSiteUserInfo):
diff --git a/app/plugins/sitestatistic/siteuserinfo/small_horse.py b/app/plugins/sitestatistic/siteuserinfo/small_horse.py
index 202c8aae..d704a288 100644
--- a/app/plugins/sitestatistic/siteuserinfo/small_horse.py
+++ b/app/plugins/sitestatistic/siteuserinfo/small_horse.py
@@ -4,9 +4,8 @@ from typing import Optional
 
 from lxml import etree
 
-from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER
+from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER, SiteSchema
 from app.utils.string import StringUtils
-from app.schemas.types import SiteSchema
 
 
 class SmallHorseSiteUserInfo(ISiteUserInfo):
diff --git a/app/plugins/sitestatistic/siteuserinfo/tnode.py b/app/plugins/sitestatistic/siteuserinfo/tnode.py
index ab65873a..8f7ce7f3 100644
--- a/app/plugins/sitestatistic/siteuserinfo/tnode.py
+++ b/app/plugins/sitestatistic/siteuserinfo/tnode.py
@@ -3,9 +3,8 @@ import json
 import re
 from typing import Optional
 
-from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER
+from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER, SiteSchema
 from app.utils.string import StringUtils
-from app.schemas.types import SiteSchema
 
 
 class TNodeSiteUserInfo(ISiteUserInfo):
diff --git a/app/plugins/sitestatistic/siteuserinfo/torrent_leech.py b/app/plugins/sitestatistic/siteuserinfo/torrent_leech.py
index 6a59086e..96f973ae 100644
--- a/app/plugins/sitestatistic/siteuserinfo/torrent_leech.py
+++ b/app/plugins/sitestatistic/siteuserinfo/torrent_leech.py
@@ -4,9 +4,8 @@ from typing import Optional
 
 from lxml import etree
 
-from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER
+from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER, SiteSchema
 from app.utils.string import StringUtils
-from app.schemas.types import SiteSchema
 
 
 class TorrentLeechSiteUserInfo(ISiteUserInfo):
diff --git a/app/plugins/sitestatistic/siteuserinfo/unit3d.py b/app/plugins/sitestatistic/siteuserinfo/unit3d.py
index ed904e28..a40483e4 100644
--- a/app/plugins/sitestatistic/siteuserinfo/unit3d.py
+++ b/app/plugins/sitestatistic/siteuserinfo/unit3d.py
@@ -4,9 +4,8 @@ from typing import Optional
 
 from lxml import etree
 
-from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER
+from app.plugins.sitestatistic.siteuserinfo import ISiteUserInfo, SITE_BASE_ORDER, SiteSchema
 from app.utils.string import StringUtils
-from app.schemas.types import SiteSchema
 
 
 class Unit3dSiteUserInfo(ISiteUserInfo):
diff --git a/app/schemas/types.py b/app/schemas/types.py
index 466be87f..33b09201 100644
--- a/app/schemas/types.py
+++ b/app/schemas/types.py
@@ -54,21 +54,6 @@ class SystemConfigKey(Enum):
     FilterRules2 = "FilterRules2"
 
 
-# 站点框架
-class SiteSchema(Enum):
-    DiscuzX = "Discuz!"
-    Gazelle = "Gazelle"
-    Ipt = "IPTorrents"
-    NexusPhp = "NexusPhp"
-    NexusProject = "NexusProject"
-    NexusRabbit = "NexusRabbit"
-    SmallHorse = "Small Horse"
-    Unit3d = "Unit3d"
-    TorrentLeech = "TorrentLeech"
-    FileList = "FileList"
-    TNode = "TNode"
-
-
 # 处理进度Key字典
 class ProgressKey(Enum):
     # 搜索