From e6af2c0f3444d1ada2c768e17b60a8ed4d12c70d Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Thu, 28 Sep 2023 16:14:52 +0800
Subject: [PATCH] fix

---
 README.md                           |  2 +-
 app/plugins/autoclean/__init__.py   |  6 +++---
 app/plugins/nastoolsync/__init__.py | 11 ++++++-----
 app/schemas/history.py              |  6 ++++++
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index a3dea24c..fe181684 100644
--- a/README.md
+++ b/README.md
@@ -190,7 +190,7 @@ docker pull jxxghp/moviepilot:latest
 > `year`： 年份  
 > `resourceType`：资源类型  
 > `effect`：特效  
-> `edition`： 版本（资源类型+特效）
+> `edition`： 版本（资源类型+特效）  
 > `videoFormat`： 分辨率  
 > `releaseGroup`： 制作组/字幕组  
 > `videoCodec`： 视频编码  
diff --git a/app/plugins/autoclean/__init__.py b/app/plugins/autoclean/__init__.py
index 9d9d5496..5e53f74c 100644
--- a/app/plugins/autoclean/__init__.py
+++ b/app/plugins/autoclean/__init__.py
@@ -146,15 +146,15 @@ class AutoClean(_PluginBase):
         history = self.get_data('history') or []
 
         # 创建一个字典来保存分组结果
-        downloadhis_grouped_dict = defaultdict(list)
+        downloadhis_grouped_dict: Dict[tuple, List[DownloadHistory]] = defaultdict(list)
         # 遍历DownloadHistory对象列表
         for downloadhis in downloadhis_list:
             # 获取type和tmdbid的值
-            type = downloadhis.type
+            dtype = downloadhis.type
             tmdbid = downloadhis.tmdbid
 
             # 将DownloadHistory对象添加到对应分组的列表中
-            downloadhis_grouped_dict[(type, tmdbid)].append(downloadhis)
+            downloadhis_grouped_dict[(dtype, tmdbid)].append(downloadhis)
 
         # 输出分组结果
         for key, downloadhis_list in downloadhis_grouped_dict.items():
diff --git a/app/plugins/nastoolsync/__init__.py b/app/plugins/nastoolsync/__init__.py
index c10eebe3..66fabddd 100644
--- a/app/plugins/nastoolsync/__init__.py
+++ b/app/plugins/nastoolsync/__init__.py
@@ -158,15 +158,16 @@ class NAStoolSync(_PluginBase):
 
                         # 替换value
                         if isinstance(plugin_value, str):
-                            plugin_value = json.loads(plugin_value)
-                        if str(plugin_value.get("to_download")).isdigit() and int(
-                                plugin_value.get("to_download")) == int(sub_downloaders[0]):
-                            plugin_value["to_download"] = sub_downloaders[1]
+                            _value: dict = json.loads(plugin_value)
+                        elif isinstance(plugin_value, dict):
+                            if str(plugin_value.get("to_download")).isdigit() and int(
+                                    plugin_value.get("to_download")) == int(sub_downloaders[0]):
+                                plugin_value["to_download"] = sub_downloaders[1]
 
                     # 替换辅种记录
                     if str(plugin_id) == "IYUUAutoSeed":
                         if isinstance(plugin_value, str):
-                            plugin_value = json.loads(plugin_value)
+                            plugin_value: list = json.loads(plugin_value)
                         if not isinstance(plugin_value, list):
                             plugin_value = [plugin_value]
                         for value in plugin_value:
diff --git a/app/schemas/history.py b/app/schemas/history.py
index 271dcb58..da8a9bbf 100644
--- a/app/schemas/history.py
+++ b/app/schemas/history.py
@@ -36,6 +36,12 @@ class DownloadHistory(BaseModel):
     torrent_description: Optional[str] = None
     # 站点
     torrent_site: Optional[str] = None
+    # 下载用户
+    userid: Optional[str] = None
+    # 下载渠道
+    channel: Optional[str] = None
+    # 创建时间
+    date: Optional[str] = None
     # 备注
     note: Optional[str] = None