From ebc62c33e11366530611d1d03f22a9b7ba461b95 Mon Sep 17 00:00:00 2001 From: shuaikangzhou <863909694@qq.com> Date: Thu, 21 Dec 2023 22:01:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B2=A1=E6=9C=89=E8=81=8A?= =?UTF-8?q?=E5=A4=A9=E7=9A=84=E5=A5=BD=E5=8F=8B=E5=B9=B4=E5=BA=A6=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/analysis/analysis.py | 17 ++++++++++------- app/components/scroll_bar.py | 2 +- app/util/emoji.py | 2 +- app/web_ui/web.py | 33 +++++++++++++++++---------------- 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/app/analysis/analysis.py b/app/analysis/analysis.py index 71e68ea..94b188e 100644 --- a/app/analysis/analysis.py +++ b/app/analysis/analysis.py @@ -117,13 +117,13 @@ def wordcloud_christmas(wxid, year='2023'): .add(series_name="聊天文字", data_pair=text_data, word_size_range=[5, 40]) ) # return w.render_embed() - dialogs = msg_db.get_messages_by_keyword(wxid, keyword, num=3, max_len=12,year_=year) + dialogs = msg_db.get_messages_by_keyword(wxid, keyword, num=3, max_len=12, year_=year) return { 'wordcloud_chart_data': w.dump_options_with_quotes(), 'keyword': keyword, 'keyword_max_num': str(max_num), - 'dialogs':dialogs , + 'dialogs': dialogs, 'total_num': total_msg_len, } @@ -133,11 +133,14 @@ def calendar_chart(wxid, is_Annual_report=False, year='2023'): calendar_data = msg_db.get_messages_by_days(wxid, is_Annual_report, year) except: return { - 'calendar_chart_data': None, - 'chat_days':0, - } + 'calendar_chart_data': None, + 'chat_days': 0, + } if not calendar_data: - return False + return { + 'calendar_chart_data': None, + 'chat_days': 0, + } min_ = min(map(lambda x: x[1], calendar_data)) max_ = max(map(lambda x: x[1], calendar_data)) start_date_ = calendar_data[0][0] @@ -169,7 +172,7 @@ def calendar_chart(wxid, is_Annual_report=False, year='2023'): ) return { 'calendar_chart_data': c.dump_options_with_quotes(), - 'chat_days':len(calendar_data), + 'chat_days': len(calendar_data), } diff --git a/app/components/scroll_bar.py b/app/components/scroll_bar.py index 2994999..b6c96aa 100644 --- a/app/components/scroll_bar.py +++ b/app/components/scroll_bar.py @@ -10,7 +10,7 @@ class ScrollBar(QScrollBar): border-width: 0px; border: none; background:rgba(133, 135, 138, 0); - width:2px; + width:4px; margin: 0px 0px 0px 0px; } QScrollBar::handle:vertical { diff --git a/app/util/emoji.py b/app/util/emoji.py index 4a6c5cb..31b63ba 100644 --- a/app/util/emoji.py +++ b/app/util/emoji.py @@ -178,7 +178,7 @@ def get_most_emoji(messages): md5_nums = [(num[0], key, num[1]) for key, num in dic.items()] md5_nums.sort(key=lambda x: x[0],reverse=True) if not md5_nums: - return '' + return '',0 md5 = md5_nums[0][1] num = md5_nums[0][0] emoji_info = md5_nums[0][2] diff --git a/app/web_ui/web.py b/app/web_ui/web.py index 9fe327f..6625315 100644 --- a/app/web_ui/web.py +++ b/app/web_ui/web.py @@ -42,7 +42,7 @@ def christmas(): '正常作息': {'06:00', "07:00", "08:00", "09:00", "10:00", "11:00", "12:00", "13:00", "14:00", "15:00", "16:00", "17:00", "18:00", "19:00", "20:00", "21:00"}, } - time_, num = msg_data[0] + time_, num = msg_data[0] if msg_data else '', 0 chat_time = f"凌晨{time_}" if time_ in {'00:00', '01:00', '02:00', '03:00', '04:00', '05:00'} else time_ label = '夜猫子' for key, item in desc.items(): @@ -63,28 +63,29 @@ def christmas(): month_data.sort(key=lambda x: x[1]) max_month, max_num = month_data[-1] min_month, min_num = month_data[0] - min_month = min_month[-2:].lstrip('0')+'月' - max_month = max_month[-2:].lstrip('0')+'月' + min_month = min_month[-2:].lstrip('0') + '月' + max_month = max_month[-2:].lstrip('0') + '月' else: max_month, max_num = '月份', 0 min_month, min_num = '月份', 0 month_data = { - 'year':'2023', - 'total_msg_num':msg_db.get_messages_number(contact.wxid,'2023'), - 'max_month':max_month, - 'min_month':min_month, - 'max_month_num':max_num, - 'min_month_num':min_num, + 'year': '2023', + 'total_msg_num': msg_db.get_messages_number(contact.wxid, '2023'), + 'max_month': max_month, + 'min_month': min_month, + 'max_month_num': max_num, + 'min_month_num': min_num, } - calendar_data = analysis.calendar_chart(contact.wxid,True,year='2023') - emoji_msgs = msg_db.get_messages_by_type(contact.wxid,47,year_='2023') - url,num = get_most_emoji(emoji_msgs) + calendar_data = analysis.calendar_chart(contact.wxid, True, year='2023') + emoji_msgs = msg_db.get_messages_by_type(contact.wxid, 47, year_='2023') + url, num = get_most_emoji(emoji_msgs) emoji_data = { - 'emoji_total_num':len(emoji_msgs), - 'emoji_url':url, - 'emoji_num':num, + 'emoji_total_num': len(emoji_msgs), + 'emoji_url': url, + 'emoji_num': num, } - return render_template("christmas.html", **data, **wordcloud_cloud_data, **time_data,**month_data,**calendar_data,**emoji_data) + return render_template("christmas.html", **data, **wordcloud_cloud_data, **time_data, **month_data, **calendar_data, + **emoji_data) # @app.route("/")