From fa0e55752405420308648ef9788f460c809a5271 Mon Sep 17 00:00:00 2001
From: ngfchl <ngfchl@126.com>
Date: Sat, 27 Aug 2022 10:48:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=202.=20=E4=BF=AE=E5=A4=8D=E5=B8=A6=E9=80=97?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E9=AD=94=E5=8A=9B=E5=80=BC=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto_pt/admin.py       |  9 ++++++---
 pt_site/UtilityTool.py |  2 +-
 pt_site/admin.py       | 11 ++++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/auto_pt/admin.py b/auto_pt/admin.py
index 06b3191..ee7161d 100644
--- a/auto_pt/admin.py
+++ b/auto_pt/admin.py
@@ -5,6 +5,7 @@ from apscheduler.triggers.cron import CronTrigger
 from django.contrib import admin, messages
 from django.http import JsonResponse
 from import_export.admin import ImportExportModelAdmin
+from import_export.formats import base_formats
 from simpleui.admin import AjaxAdmin
 
 from auto_pt.models import Task, TaskJob, Notify, OCR
@@ -18,7 +19,7 @@ from ptools.base import Trigger
 
 @admin.register(Task)
 class TaskAdmin(ImportExportModelAdmin):  # instead of ModelAdmin
-    # formats = (base_formats.XLS, base_formats.CSV)
+    formats = (base_formats.XLS, base_formats.CSV, base_formats.JSON)
     # 显示字段
     list_display = (
         'desc',
@@ -50,7 +51,7 @@ class TaskAdmin(ImportExportModelAdmin):  # instead of ModelAdmin
 
 @admin.register(TaskJob)
 class TaskJobAdmin(ImportExportModelAdmin):  # instead of ModelAdmin
-    # formats = (base_formats.XLS, base_formats.CSV)
+    formats = (base_formats.XLS, base_formats.CSV, base_formats.JSON)
     # 显示字段
     list_display = (
         'job_id',
@@ -128,7 +129,7 @@ class TaskJobAdmin(ImportExportModelAdmin):  # instead of ModelAdmin
 
 @admin.register(Notify)
 class NotifyAdmin(ImportExportModelAdmin, AjaxAdmin):
-    # formats = (base_formats.XLS, base_formats.CSV)
+    formats = (base_formats.XLS, base_formats.CSV, base_formats.JSON)
     list_display = [
         'name',
         'enable',
@@ -197,6 +198,8 @@ class NotifyAdmin(ImportExportModelAdmin, AjaxAdmin):
 
 @admin.register(OCR)
 class OCRAdmin(ImportExportModelAdmin):
+    formats = (base_formats.XLS, base_formats.CSV, base_formats.JSON)
+
     list_display = [
         'name',
         'enable',
diff --git a/pt_site/UtilityTool.py b/pt_site/UtilityTool.py
index 4ded783..c97883f 100644
--- a/pt_site/UtilityTool.py
+++ b/pt_site/UtilityTool.py
@@ -834,7 +834,7 @@ class PtSpider:
             # 获取字符串中的魔力值
             my_sp = ''.join(
                 details_html.xpath(site.my_sp_rule)
-            )
+            ).replace(',', '').strip()
             print('魔力：', details_html.xpath(site.my_sp_rule))
 
             if my_sp:
diff --git a/pt_site/admin.py b/pt_site/admin.py
index fa14e7c..10e3604 100644
--- a/pt_site/admin.py
+++ b/pt_site/admin.py
@@ -8,6 +8,7 @@ from django.db import transaction
 from django.http import JsonResponse
 from django.utils.html import format_html
 from import_export.admin import ImportExportModelAdmin
+from import_export.formats import base_formats
 from simpleui.admin import AjaxAdmin
 from transmission_rpc import Torrent
 
@@ -25,7 +26,7 @@ admin.site.index_title = '我在后台首页'
 
 @admin.register(Site)
 class SiteAdmin(ImportExportModelAdmin):  # instead of ModelAdmin
-    # formats = (base_formats.XLS, base_formats.CSV)
+    formats = (base_formats.XLS, base_formats.CSV,base_formats.JSON)
     # 显示字段
     list_display = (
         'name',
@@ -215,7 +216,7 @@ class StatusInlines(admin.TabularInline):
 
 @admin.register(MySite)
 class MySiteAdmin(ImportExportModelAdmin):  # instead of ModelAdmin
-    # formats = (base_formats.XLS, base_formats.CSV)
+    formats = (base_formats.XLS, base_formats.CSV,base_formats.JSON)
     # 显示字段
     list_display = (
         'sort_id',
@@ -468,7 +469,7 @@ class MySiteAdmin(ImportExportModelAdmin):  # instead of ModelAdmin
 
 @admin.register(SiteStatus)
 class SiteStatusAdmin(ImportExportModelAdmin):
-    # formats = (base_formats.XLS, base_formats.CSV)
+    formats = (base_formats.XLS, base_formats.CSV,base_formats.JSON)
     list_display = ['site',
                     # 'sign_in', 'my_level', 'invitation', 'seed', 'leech',
                     'uploaded', 'downloaded', 'ratio',
@@ -525,7 +526,7 @@ class SiteStatusAdmin(ImportExportModelAdmin):
 
 @admin.register(Downloader)
 class DownloaderAdmin(ImportExportModelAdmin, AjaxAdmin):  # instead of ModelAdmin
-    # formats = (base_formats.XLS, base_formats.CSV)
+    formats = (base_formats.XLS, base_formats.CSV,base_formats.JSON)
     # 显示字段
     list_display = ('name', 'category', 'reserved_space', 'created_at', 'updated_at')
     # 过滤字段
@@ -598,7 +599,7 @@ class DownloaderAdmin(ImportExportModelAdmin, AjaxAdmin):  # instead of ModelAdm
 
 @admin.register(TorrentInfo)
 class TorrentInfoAdmin(ImportExportModelAdmin, AjaxAdmin):  # instead of ModelAdmin
-    # formats = (base_formats.XLS, base_formats.CSV)
+    formats = (base_formats.XLS, base_formats.CSV,base_formats.JSON)
     # 显示字段
     list_display = (
         'name_href',