diff --git a/auto_pt/admin.py b/auto_pt/admin.py index a8aa9d5..bd1852b 100644 --- a/auto_pt/admin.py +++ b/auto_pt/admin.py @@ -4,8 +4,6 @@ from datetime import datetime 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,8 +16,7 @@ from ptools.base import Trigger @admin.register(Task) -class TaskAdmin(ImportExportModelAdmin): # instead of ModelAdmin - formats = (base_formats.XLS, base_formats.CSV, base_formats.JSON) +class TaskAdmin(admin.ModelAdmin): # instead of ModelAdmin # 显示字段 list_display = ( 'desc', @@ -50,8 +47,7 @@ class TaskAdmin(ImportExportModelAdmin): # instead of ModelAdmin @admin.register(TaskJob) -class TaskJobAdmin(ImportExportModelAdmin): # instead of ModelAdmin - formats = (base_formats.XLS, base_formats.CSV, base_formats.JSON) +class TaskJobAdmin(admin.ModelAdmin): # instead of ModelAdmin # 显示字段 list_display = ( 'job_id', @@ -135,8 +131,7 @@ class TaskJobAdmin(ImportExportModelAdmin): # instead of ModelAdmin @admin.register(Notify) -class NotifyAdmin(ImportExportModelAdmin, AjaxAdmin): - formats = (base_formats.XLS, base_formats.CSV, base_formats.JSON) +class NotifyAdmin(AjaxAdmin): list_display = [ 'name', 'enable', @@ -204,9 +199,7 @@ class NotifyAdmin(ImportExportModelAdmin, AjaxAdmin): @admin.register(OCR) -class OCRAdmin(ImportExportModelAdmin): - formats = (base_formats.XLS, base_formats.CSV, base_formats.JSON) - +class OCRAdmin(admin.ModelAdmin): list_display = [ 'name', 'enable', diff --git a/pt_site/admin.py b/pt_site/admin.py index 0bf2468..b74b3da 100644 --- a/pt_site/admin.py +++ b/pt_site/admin.py @@ -7,8 +7,6 @@ from django.contrib import admin, messages from django.http import JsonResponse from django.utils.html import format_html from django_admin_inline_paginator.admin import TabularInlinePaginated -from import_export.admin import ImportExportModelAdmin -from import_export.formats import base_formats from simpleui.admin import AjaxAdmin from transmission_rpc import Torrent @@ -25,8 +23,7 @@ admin.site.index_title = '我在后台首页' @admin.register(Site) -class SiteAdmin(ImportExportModelAdmin): # instead of ModelAdmin - formats = (base_formats.XLS, base_formats.CSV, base_formats.JSON) +class SiteAdmin(admin.ModelAdmin): # instead of ModelAdmin # 显示字段 list_display = ( 'name', @@ -249,8 +246,7 @@ class SignInInlines(TabularInlinePaginated): @admin.register(MySite) -class MySiteAdmin(ImportExportModelAdmin): # instead of ModelAdmin - formats = (base_formats.XLS, base_formats.CSV, base_formats.JSON) +class MySiteAdmin(admin.ModelAdmin): # instead of ModelAdmin # 显示字段 list_display = ( 'sort_id', @@ -607,8 +603,7 @@ class SiteStatusAdmin(ImportExportModelAdmin): @admin.register(Downloader) -class DownloaderAdmin(ImportExportModelAdmin, AjaxAdmin): # instead of ModelAdmin - formats = (base_formats.XLS, base_formats.CSV, base_formats.JSON) +class DownloaderAdmin(AjaxAdmin): # instead of ModelAdmin # 显示字段 list_display = ('name', 'category', 'reserved_space', 'created_at', 'updated_at') # 过滤字段 @@ -689,8 +684,7 @@ def get_downloader(): @admin.register(TorrentInfo) -class TorrentInfoAdmin(ImportExportModelAdmin, AjaxAdmin): # instead of ModelAdmin - formats = (base_formats.XLS, base_formats.CSV, base_formats.JSON) +class TorrentInfoAdmin(AjaxAdmin): # instead of ModelAdmin # 显示字段 list_display = ( 'name_href', diff --git a/ptools/settings.py b/ptools/settings.py index 1107180..6a64287 100644 --- a/ptools/settings.py +++ b/ptools/settings.py @@ -50,7 +50,6 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'corsheaders', - 'import_export', 'django_apscheduler', 'django_admin_inline_paginator', 'util', @@ -80,8 +79,7 @@ ROOT_URLCONF = 'ptools.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [BASE_DIR / 'templates'] - , + 'DIRS': [BASE_DIR / 'templates'], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -125,7 +123,7 @@ DATABASES = { # 'PORT': '3306', # mysql服务端口 # } } - +""" CACHES = { 'default': { 'BACKEND': 'django_redis.cache.RedisCache', @@ -143,7 +141,7 @@ CACHES = { # "KEY_PREFIX ":"test",#前缀 } } - +""" # Password validation # https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators diff --git a/requirements.txt b/requirements.txt index df70a73..d5fed67 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,6 @@ appnope==0.1.3 APScheduler==3.9.1 asgiref==3.5.2 asttokens==2.0.8 -async-timeout==4.0.2 attrs==22.1.0 autobahn==22.7.1 Automat==20.2.0 @@ -21,14 +20,10 @@ daphne==3.0.2 decorator==5.1.1 defusedxml==0.7.1 deluge-client==1.9.0 -Deprecated==1.2.13 -diff-match-patch==20200713 Django==4.1 django-admin-inline-paginator==0.3.0 django-apscheduler==0.6.2 django-cors-headers==3.13.0 -django-import-export==2.8.0 -django-redis==5.2.0 django-simpleui==2022.7.29 docker==6.0.0 et-xmlfile==1.1.0 @@ -75,7 +70,6 @@ pytz==2022.2.1 pytz-deprecation-shim==0.1.0.post0 PyYAML==6.0 qbittorrent-api==2022.8.37 -redis==4.3.4 requests==2.28.1 requests-oauthlib==1.3.1 requests-toolbelt==0.9.1 @@ -85,7 +79,6 @@ six==1.16.0 smmap==5.0.0 sqlparse==0.4.2 stack-data==0.5.0 -tablib==3.2.1 traitlets==5.3.0 transmission-rpc==3.3.2 Twisted==22.8.0