mirror of
https://github.com/ngfchl/ptools
synced 2023-07-10 13:41:22 +08:00
1. 修复部分导入导出失败的错误
2. 修复带逗号的魔力值解析错误的bug
This commit is contained in:
@@ -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',
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user