From 0ebaa6fec00f6dd7a7145279153de6f9086b6fd0 Mon Sep 17 00:00:00 2001 From: ngfchl Date: Thu, 25 Aug 2022 12:19:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=9B=B4=E6=96=B0=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=202.=20=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=203.=20=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=93=E6=9E=84=204.=20=E6=B7=BB=E5=8A=A0=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- auto_pt/views.py | 13 ++++++------- static/abav6-1e67y-001.ico | Bin 0 -> 4286 bytes static/favicon.ico | Bin 0 -> 15406 bytes templates/admin/base.html | 1 + templates/admin/index.html | 17 +++++++++-------- templates/auto_pt/restart.html | 8 +------- update.md | 5 +++-- 7 files changed, 20 insertions(+), 24 deletions(-) create mode 100644 static/abav6-1e67y-001.ico create mode 100644 static/favicon.ico diff --git a/auto_pt/views.py b/auto_pt/views.py index 2e77471..93e8581 100644 --- a/auto_pt/views.py +++ b/auto_pt/views.py @@ -3,7 +3,6 @@ import os import subprocess from datetime import datetime -import markdown from django.http import JsonResponse from django.shortcuts import render @@ -127,10 +126,10 @@ def do_update(request): def restart_container(request): - scraper = pt_spider.get_scraper() - res = scraper.get('https://gitee.com/ngfchl/ptools/raw/master/update.md') - update_notes = markdown.markdown(res.text, extensions=['tables']) + # scraper = pt_spider.get_scraper() + # res = scraper.get('https://gitee.com/ngfchl/ptools/raw/master/update.md') + # update_notes = markdown.markdown(res.text, extensions=['tables']) # print(update_notes) - return render(request, 'auto_pt/restart.html', context={ - 'update_notes': update_notes - }) + return render(request, 'auto_pt/restart.html', + # context={'update_notes': update_notes} + ) diff --git a/static/abav6-1e67y-001.ico b/static/abav6-1e67y-001.ico new file mode 100644 index 0000000000000000000000000000000000000000..c9aa6e1ce9ce521183469208ce6c20ee9d8d28ed GIT binary patch literal 4286 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 a&e@C3HBg+XuZrI$c02z2{{jEs<9`Dd(&J75 literal 0 HcmV?d00001 diff --git a/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..04c8de270d0b1ab764e247df279c390dc39ead29 GIT binary patch literal 15406 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 E0k {% block title %}PT一下,你就知道{% endblock %} {% include 'admin/includes/css-part.html' %} + diff --git a/templates/admin/index.html b/templates/admin/index.html index 33860a7..59535ce 100755 --- a/templates/admin/index.html +++ b/templates/admin/index.html @@ -11,6 +11,7 @@ + {% block title %} @@ -116,14 +117,14 @@ {% endblock %} - - - - + + + + diff --git a/templates/auto_pt/restart.html b/templates/auto_pt/restart.html index 3fc2e1a..ad780f2 100644 --- a/templates/auto_pt/restart.html +++ b/templates/auto_pt/restart.html @@ -10,7 +10,7 @@
更新日志 - 拉取更新 + 更新 重启
@@ -21,9 +21,6 @@ {# {{ update_notes|safe }}#} - - - {# href='javascript:(confirm("确定重启?"))?location="/tasks/restart":location="/"'#} @@ -39,9 +36,6 @@ data: { update_note: ['请先拉取更新哦'] }, - created: function () { - {#this.data.update_note = converter.makeHtml({{ update_notes }});#} - }, methods: { do_restart() { this.$confirm('此操作将重启容器,并更新软件, 是否继续?', '提示', { diff --git a/update.md b/update.md index 292e90e..82b90d5 100644 --- a/update.md +++ b/update.md @@ -1,3 +1,4 @@ # M-Team 规则修改 -1. 由于页面链接填写错误,导致做种体积统计未0,修改站点信息->主要页面->当前下载信息:/发布种子信息:/当前做种信息:/完成种子信息:四项页面的链接地址 - 将四个条目中页面地址中的`getusertorrentlistajax`替换为`getusertorrentlist` \ No newline at end of file + +1. 由于页面链接填写错误,导致做种体积统计未0,修改站点信息->主要页面->当前下载信息:/发布种子信息:/当前做种信息:/完成种子信息:四项页面的链接地址 将四个条目中页面地址中的`getusertorrentlistajax` + 替换为`getusertorrentlist` \ No newline at end of file