From eea40df37cec0b304e0dac337c0b5ca505942a6e Mon Sep 17 00:00:00 2001 From: lifegpc Date: Tue, 19 Jan 2021 19:41:02 +0800 Subject: [PATCH] display error update time in brackets --- rsslist.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/rsslist.py b/rsslist.py index 8116285..43b278d 100644 --- a/rsslist.py +++ b/rsslist.py @@ -47,13 +47,11 @@ def getTextContentForRSSInList(rssEntry: RSSEntry, s: settings) -> str: text = textc() text.addtotext( f"""{rssEntry.title}""") - temp = '' + ttl = 0 if rssEntry.interval is None else rssEntry.interval + ttl = max(min(ttl, s._maxTTL), s._minTTL) + temp = f'更新间隔:{ttl}分' if rssEntry.lasterrortime is not None and rssEntry.lasterrortime >= rssEntry.lastupdatetime and rssEntry.errorcount > 0: - temp = f'更新间隔:{s._retryTTL[rssEntry.errorcount]}分' - else: - ttl = 0 if rssEntry.interval is None else rssEntry.interval - ttl = max(min(ttl, s._maxTTL), s._minTTL) - temp = f'更新间隔:{ttl}分' + temp = f'{temp}({s._retryTTL[rssEntry.errorcount]}分)' text.addtotext(temp) temp = '上次更新时间:未知' if rssEntry.lastupdatetime is None or rssEntry.lastupdatetime < 0 else f'上次更新时间:{timeToStr(rssEntry.lastupdatetime)}' text.addtotext(temp)