nas/ptools
1
0
Fork 0
mirror of https://github.com/ngfchl/ptools synced 2023-07-10 13:41:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复推送到Tr后无法显示种子页面的bug，并优化进度显示，第一次未绑定任务的，可推送第二次即可绑定

Browse Source
This commit is contained in:
ngfchl
2022-12-09 23:11:13 +08:00
parent e95a13b616
commit b453cf9ba1
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pt_site/admin.py
View File

@@ -861,7 +861,7 @@ class TorrentInfoAdmin(AjaxAdmin): # instead of ModelAdmin
def d_progress(self, obj: TorrentInfo):
print(obj.hash_string)
if not obj.downloader or not obj.hash_string:
if not obj.downloader or not obj.hash_string or len(obj.hash_string) < 32:
return 0
tr_client = transmission_rpc.Client(
host=obj.downloader.host,
@@ -875,8 +875,8 @@ class TorrentInfoAdmin(AjaxAdmin): # instead of ModelAdmin
print(progress)
speed = round(torrent.rateDownload / 1024 / 1024, 2)
if progress < 100:
return format_html('<a href="#" target="_blank">{} MB/s</a>', speed)
return format_html('<a href="#" target="_blank">{}%</a>', torrent.progress)
return format_html('<a href="javascript:void(0)">{} MB/s</a>', speed)
return format_html('<a href="javascript:void(0)">{}%</a>', torrent.progress)
# name_href.short_description = '种子名称'
name_href.short_description = format_html(
@@ -962,12 +962,15 @@ class TorrentInfoAdmin(AjaxAdmin): # instead of ModelAdmin
print(torrent_info.magnet_url)
print(torrent_info.site.mysite.cookie)
# res = qb_client.torrents_add(torrent.magnet_url)
res = tr_client.add_torrent(torrent=torrent_info.magnet_url,
download_dir=torrent_info.save_path,
cookies=torrent_info.site.mysite.cookie)
res = tr_client.add_torrent(
torrent=torrent_info.magnet_url,
download_dir=torrent_info.save_path,
cookies=torrent_info.site.mysite.cookie
)
print(res)
if isinstance(res, Torrent):
torrent_info.hash = res.id
print(res.id)
torrent_info.hash_string = res.hashString
torrent_info.state = True
torrent_info.downloader = downloader
torrent_info.save()