From 417dbc22f8fadde1d5abd36bdc827b4ba283b3b6 Mon Sep 17 00:00:00 2001 From: Hui Lan Date: Fri, 9 Dec 2022 13:19:36 +0800 Subject: [PATCH 01/25] highlight.js: fix Bug 522. --- app/static/js/highlight.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js index 1003918..1922c57 100644 --- a/app/static/js/highlight.js +++ b/app/static/js/highlight.js @@ -31,7 +31,17 @@ function highLight() { list[i] = list[i].replace(/(^\s*)|(\s*$)/g, ""); //消除单词两边的空字符 if (list[i] !== "" && "".indexOf(list[i]) === -1 && "".indexOf(list[i]) === -1) { //将文章中所有出现该单词word的地方改为：" " + word + " "。 正则表达式RegExp()中，"\\s"代表单词前后必须要有空格，以防止只对单词中的部分字符高亮的情况出现。 - articleContent = articleContent.replace(new RegExp("\\s"+list[i]+"\\s", "g"), " " + list[i] + " "); + let articleContent_fb = articleContent; //文章副本 + while(articleContent_fb.toLowerCase().indexOf(list[i]) !== -1){ + //针对同一篇文章中可能存在相同单词的不同大小写问题，采用while循环判断副本中是否还存在匹配单词。 + + //找到副本中和list[i]匹配的第一个单词(第一种匹配情况),并赋值给list[i]。 + list[i] = articleContent_fb.substr(articleContent_fb.toLowerCase().indexOf(list[i]),list[i].length); + + articleContent_fb = articleContent_fb.replace(new RegExp("\\s"+list[i]+"\\s","g"),""); //删除副本中和list[i]匹配的单词 + + articleContent = articleContent.replace(new RegExp("\\s"+list[i]+"\\s", "g"), " " + list[i] + " "); + } } } document.getElementById("article").innerHTML = articleContent; From 3bce4506203831ff5d8a0d494633798c6d227c12 Mon Sep 17 00:00:00 2001 From: Hui Lan Date: Thu, 15 Dec 2022 10:50:04 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E9=BB=84=E5=AD=90=E7=9D=BF:=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20'Otherwise,'=20=E8=BF=99=E7=A7=8D=E6=83=85=E5=86=B5?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=AB=98=E4=BA=AE=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E5=8D=B3=20Otherwise=20=E5=90=8E=E9=9D=A2=E8=B7=9F?= =?UTF-8?q?=E4=BA=86=E4=B8=AA=E9=80=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/static/js/highlight.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js index 1922c57..13b9865 100644 --- a/app/static/js/highlight.js +++ b/app/static/js/highlight.js @@ -30,17 +30,22 @@ function highLight() { for (let i = 0; i < list.length; ++i) { list[i] = list[i].replace(/(^\s*)|(\s*$)/g, ""); //消除单词两边的空字符 if (list[i] !== "" && "".indexOf(list[i]) === -1 && "".indexOf(list[i]) === -1) { - //将文章中所有出现该单词word的地方改为：" " + word + " "。 正则表达式RegExp()中，"\\s"代表单词前后必须要有空格，以防止只对单词中的部分字符高亮的情况出现。 + //将文章中所有出现该单词word的地方改为："" + word + ""。 正则表达式RegExp()中，"\\b"代表单词边界匹配。 + + //修改代码 let articleContent_fb = articleContent; //文章副本 - while(articleContent_fb.toLowerCase().indexOf(list[i]) !== -1){ + let count = 1000; //简单计数器，防止陷入死循环。 + while(articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase()) !== -1 && list[i]!=""){ //针对同一篇文章中可能存在相同单词的不同大小写问题，采用while循环判断副本中是否还存在匹配单词。 + count--; + if(count <= 0)break; //TimeOut! + //找到副本中和list[i]匹配的第一个单词(第一种匹配情况),并赋值给list[i]。 - list[i] = articleContent_fb.substr(articleContent_fb.toLowerCase().indexOf(list[i]),list[i].length); + list[i] = articleContent_fb.substr(articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase()),list[i].length); - articleContent_fb = articleContent_fb.replace(new RegExp("\\s"+list[i]+"\\s","g"),""); //删除副本中和list[i]匹配的单词 - - articleContent = articleContent.replace(new RegExp("\\s"+list[i]+"\\s", "g"), " " + list[i] + " "); + articleContent_fb = articleContent_fb.replace(list[i],""); //删除副本中和list[i]匹配的单词 + articleContent = articleContent.replace(new RegExp("\\b"+list[i]+"\\b","g"),"" + list[i] + ""); } } } From cc8ca47f8c96eedaf2ce7ec61f5480123663953f Mon Sep 17 00:00:00 2001 From: zzhaofisher <10839192+zzhaofisher@user.noreply.gitee.com> Date: Tue, 18 Apr 2023 21:50:54 +0800 Subject: [PATCH 03/25] refactor: remove sql sentences --- app/Login.py | 64 +++++++++++++++++------------------------------ app/model/user.py | 6 +++++ 2 files changed, 29 insertions(+), 41 deletions(-) diff --git a/app/Login.py b/app/Login.py index db4df18..cd750d1 100644 --- a/app/Login.py +++ b/app/Login.py @@ -3,6 +3,18 @@ import string from datetime import datetime, timedelta from UseSqlite import InsertQuery, RecordQuery +def md5(s): + ''' + MD5摘要 + :param str: 字符串 + :return: 经MD5以后的字符串 + ''' + h = hashlib.md5(s.encode(encoding='utf-8')) + return h.hexdigest() + +# import model.user after the defination of md5(s) to avoid circular import +from model.user import get_user_by_username, insert_user, update_password_by_username + path_prefix = '/var/www/wordfreq/wordfreq/' path_prefix = './' # comment this line in deployment @@ -12,13 +24,9 @@ def verify_pass(newpass,oldpass): def verify_user(username, password): - rq = RecordQuery(path_prefix + 'static/wordfreqapp.db') - password = md5(username + password) - rq.instructions_with_parameters("SELECT * FROM user WHERE name=:username AND password=:password", dict( - username=username, password=password)) # the named style https://docs.python.org/3/library/sqlite3.html - rq.do_with_parameters() - result = rq.get_results() - return result != [] + user = get_user_by_username(username) + encoded_password = md5(username + password) + return user is not None and user.password == encoded_password def add_user(username, password): @@ -26,19 +34,12 @@ def add_user(username, password): expiry_date = (datetime.now() + timedelta(days=30)).strftime('%Y%m%d') # will expire after 30 days # 将用户名和密码一起加密，以免暴露不同用户的相同密码 password = md5(username + password) - rq = InsertQuery(path_prefix + 'static/wordfreqapp.db') - rq.instructions_with_parameters("INSERT INTO user VALUES (:username, :password, :start_date, :expiry_date)", dict( - username=username, password=password, start_date=start_date, expiry_date=expiry_date)) - rq.do_with_parameters() + insert_user(username=username, password=password, start_date=start_date, expiry_date=expiry_date) def check_username_availability(username): - rq = RecordQuery(path_prefix + 'static/wordfreqapp.db') - rq.instructions_with_parameters( - "SELECT * FROM user WHERE name=:username", dict(username=username)) - rq.do_with_parameters() - result = rq.get_results() - return result == [] + existed_user = get_user_by_username(username) + return existed_user is None def change_password(username, old_password, new_password): @@ -54,35 +55,16 @@ def change_password(username, old_password, new_password): # 将用户名和密码一起加密，以免暴露不同用户的相同密码 if verify_pass(new_password,old_password): #新旧密码一致 return False - password = md5(username + new_password) - rq = InsertQuery(path_prefix + 'static/wordfreqapp.db') - rq.instructions_with_parameters("UPDATE user SET password=:password WHERE name=:username", dict( - password=password, username=username)) - rq.do_with_parameters() + update_password_by_username(username, new_password) return True def get_expiry_date(username): - rq = RecordQuery(path_prefix + 'static/wordfreqapp.db') - rq.instructions_with_parameters( - "SELECT expiry_date FROM user WHERE name=:username", dict(username=username)) - rq.do_with_parameters() - result = rq.get_results() - if len(result) > 0: - return result[0]['expiry_date'] - else: + user = get_user_by_username(username) + if user is None: return '20191024' - - -def md5(s): - ''' - MD5摘要 - :param str: 字符串 - :return: 经MD5以后的字符串 - ''' - h = hashlib.md5(s.encode(encoding='utf-8')) - return h.hexdigest() - + else: + return user.expiry_date class UserName: def __init__(self, username): diff --git a/app/model/user.py b/app/model/user.py index 28173b9..d684332 100644 --- a/app/model/user.py +++ b/app/model/user.py @@ -1,5 +1,6 @@ from model import * from Login import md5 +from pony import orm def get_users(): with db_session: @@ -11,6 +12,11 @@ def get_user_by_username(username): if user: return user.first() +def insert_user(username, password, start_date, expiry_date): + with db_session: + user = User(name=username, password=password, start_date=start_date, expiry_date=expiry_date) + orm.commit() + def update_password_by_username(username, password="123456"): with db_session: user = User.select(name=username) From 16de0a7fd99a26d331e23eac7c1fd22594b7c50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?= <178428409@qq.com> Date: Thu, 20 Apr 2023 15:40:11 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=91=BD=E5=90=8D=EF=BC=9Aexisting=5Farticles=20=E2=86=92=20ha?= =?UTF-8?q?d=5Fread=5Farticles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Article.py | 20 ++++++++++---------- app/account_service.py | 4 ++-- app/templates/userpage_get.html | 2 +- app/user_service.py | 16 ++++++++-------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/Article.py b/app/Article.py index e0f006a..b4df54c 100644 --- a/app/Article.py +++ b/app/Article.py @@ -32,17 +32,17 @@ def get_article_body(s): return '\n'.join(lst) -def get_today_article(user_word_list, existing_articles): +def get_today_article(user_word_list, had_read_articles): rq = RecordQuery(path_prefix + 'static/wordfreqapp.db') - if existing_articles is None: - existing_articles = { + if had_read_articles is None: + had_read_articles = { "index" : 0, # 为 article_ids 的索引 "article_ids": [] # 之前显示文章的id列表，越后越新 } - if existing_articles["index"] > len(existing_articles["article_ids"])-1: + if had_read_articles["index"] > len(had_read_articles["article_ids"])-1: rq.instructions("SELECT * FROM article") else: - rq.instructions('SELECT * FROM article WHERE article_id=%d' % (existing_articles["article_ids"][existing_articles["index"]])) + rq.instructions('SELECT * FROM article WHERE article_id=%d' % (had_read_articles["article_ids"][had_read_articles["index"]])) rq.do() result = rq.get_results() random.shuffle(result) @@ -56,19 +56,19 @@ def get_today_article(user_word_list, existing_articles): d_user = load_freq_history(user_word_list) user_level = user_difficulty_level(d_user, d3) # more consideration as user's behaviour is dynamic. Time factor should be considered. text_level = 0 - if existing_articles["index"] > len(existing_articles["article_ids"])-1: # 下一篇 + if had_read_articles["index"] > len(had_read_articles["article_ids"])-1: # 下一篇 flag_get_article = False for reading in result: text_level = text_difficulty_level(reading['text'], d3) factor = random.gauss(0.8, 0.1) # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1 - if reading['article_id'] not in existing_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor): # 新的文章之前没有出现过且符合一定范围的水平 + if reading['article_id'] not in had_read_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor): # 新的文章之前没有出现过且符合一定范围的水平 d = reading - existing_articles["article_ids"].append(d['article_id']) # 列表添加新的文章id；下面进行 + had_read_articles["article_ids"].append(d['article_id']) # 列表添加新的文章id；下面进行 flag_get_article = True break if not flag_get_article: - existing_articles["index"] -= 1 + had_read_articles["index"] -= 1 else: # 上一篇 d = random.choice(result) text_level = text_difficulty_level(d['text'], d3) @@ -86,7 +86,7 @@ def get_today_article(user_word_list, existing_articles): "answer": get_answer_part(d['question']) } - return existing_articles, today_article + return had_read_articles, today_article def load_freq_history(path): diff --git a/app/account_service.py b/app/account_service.py index c1bd64c..8de9a03 100644 --- a/app/account_service.py +++ b/app/account_service.py @@ -37,7 +37,7 @@ def signup(): session[username] = username session['username'] = username session['expiry_date'] = get_expiry_date(username) - session['existing_articles'] = None + session['had_read_articles'] = None return jsonify({'status': '2'}) else: return jsonify({'status': '1'}) @@ -66,7 +66,7 @@ def login(): session['username'] = username user_expiry_date = get_expiry_date(username) session['expiry_date'] = user_expiry_date - session['existing_articles'] = None + session['had_read_articles'] = None return jsonify({'status': '1'}) else: return jsonify({'status': '0'}) diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html index 298b559..428bb3b 100644 --- a/app/templates/userpage_get.html +++ b/app/templates/userpage_get.html @@ -45,7 +45,7 @@ {# {% endfor %}#} 下一篇 Next Article - {% if session.get('existing_articles') != None and session.get('existing_articles')["index"] !=0 %} + {% if session.get('had_read_articles') != None and session.get('had_read_articles')["index"] !=0 %} 上一篇 Previous Article {% endif %} diff --git a/app/user_service.py b/app/user_service.py index 8d1dbfc..61b129d 100644 --- a/app/user_service.py +++ b/app/user_service.py @@ -30,9 +30,9 @@ def user_reset(username): :return: 返回页面内容 ''' if request.method == 'GET': - existing_articles = session.get("existing_articles") - existing_articles["index"] += 1 - session["existing_articles"] = existing_articles + had_read_articles = session.get("had_read_articles") + had_read_articles["index"] += 1 + session["had_read_articles"] = had_read_articles return redirect(url_for('user_bp.userpage', username=username)) else: return 'Under construction' @@ -45,9 +45,9 @@ def user_back(username): :return: 返回页面内容 ''' if request.method == 'GET': - existing_articles = session.get("existing_articles") - existing_articles["index"] -= 1 - session["existing_articles"] = existing_articles + had_read_articles = session.get("had_read_articles") + had_read_articles["index"] -= 1 + session["had_read_articles"] = had_read_articles return redirect(url_for('user_bp.userpage', username=username)) @@ -134,8 +134,8 @@ def userpage(username): words = '' for x in lst3: words += x[0] + ' ' - existing_articles, today_article = get_today_article(user_freq_record, session.get('existing_articles')) - session['existing_articles'] = existing_articles + had_read_articles, today_article = get_today_article(user_freq_record, session.get('had_read_articles')) + session['had_read_articles'] = had_read_articles # 通过 today_article，加载前端的显示页面 return render_template('userpage_get.html', username=username, From 84affaeb69fdecb155cdf4daa4f57c4b29dbea55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?= <178428409@qq.com> Date: Thu, 20 Apr 2023 20:30:14 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20/=20?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=88=E6=AF=8F=E6=AC=A1=E8=B0=83=E7=94=A8=E5=88=AB=E7=9A=84?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=BB=96=E9=83=BD=E4=BC=9A=E8=A2=AB=E8=B0=83?= =?UTF-8?q?=E7=94=A8=EF=BC=89=EF=BC=8C=E6=96=B0=E8=B7=AF=E7=94=B1=E4=B8=BA?= =?UTF-8?q?=20//userpage;=E5=90=8C=E6=97=B6=E5=9B=A0=E4=B8=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=B7=AF=E7=94=B1=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E8=AE=BF=E9=97=AEuserpage=5Fget=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E4=BC=9A=E5=AF=BC=E8=87=B4=E9=9D=99=E6=80=81=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E7=94=9F=E6=88=90=E9=94=99=E8=AF=AF=EF=BC=8C?= =?UTF-8?q?=E8=BF=99=E9=87=8C=E4=BF=AE=E6=94=B9=E4=BA=86\static\config.yml?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=9D=99=E6=80=81=E8=B5=84=E6=BA=90=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=90=8E=E4=B9=9F=E9=83=BD?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E8=AE=BF=E9=97=AE=E5=88=B0?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/static/config.yml | 10 +++++----- app/templates/login.html | 2 +- app/templates/reset.html | 2 +- app/templates/signup.html | 2 +- app/templates/userpage_get.html | 2 +- app/user_service.py | 3 ++- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/static/config.yml b/app/static/config.yml index 20aa396..e6f7ef1 100644 --- a/app/static/config.yml +++ b/app/static/config.yml @@ -1,16 +1,16 @@ # 全局引入的css文件地址 css: item: - - static/css/bootstrap.css + - ../static/css/bootstrap.css # 全局引入的js文件地址 js: head: # 在页面加载之前加载 - - static/js/jquery.js - - static/js/word_operation.js + - ../static/js/jquery.js + - ../static/js/word_operation.js bottom: # 在页面加载完之后加载 - - static/js/fillword.js - - static/js/highlight.js + - ../static/js/fillword.js + - ../static/js/highlight.js # 高亮样式，目前仅支持修改颜色 highlight: diff --git a/app/templates/login.html b/app/templates/login.html index ccf6f34..2507f75 100644 --- a/app/templates/login.html +++ b/app/templates/login.html @@ -22,7 +22,7 @@ alert('无法通过验证。'); window.location.href = "/login"; } else if (response.status === '1') { - window.location.href = "/"+username; + window.location.href = "/"+username+"/userpage"; } } ) diff --git a/app/templates/reset.html b/app/templates/reset.html index d29855b..3425c97 100644 --- a/app/templates/reset.html +++ b/app/templates/reset.html @@ -45,7 +45,7 @@ - + {% endblock %} \ No newline at end of file diff --git a/app/templates/signup.html b/app/templates/signup.html index c70e4ba..9030d41 100644 --- a/app/templates/signup.html +++ b/app/templates/signup.html @@ -35,7 +35,7 @@ You're logged in already! Logout. } else if (response.status === '2') { let f = confirm("恭喜，你已成功注册，你的用户名是"+username+'.\n点击“确认”开始使用，或点击“取消”返回首页'); if (f) { - window.location.href = '/'+username; + window.location.href = '/'+username+'/userpage'; } else { window.location.href = '/'; } diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html index 428bb3b..8936ff7 100644 --- a/app/templates/userpage_get.html +++ b/app/templates/userpage_get.html @@ -90,7 +90,7 @@

收集生词吧 （可以在正文中划词，也可以复制黏贴）

-
+
diff --git a/app/user_service.py b/app/user_service.py index 61b129d..b9f8d26 100644 --- a/app/user_service.py +++ b/app/user_service.py @@ -97,7 +97,7 @@ def deleteword(username, word): return "success" -@userService.route("/", methods=['GET', 'POST']) +@userService.route("//userpage", methods=['GET', 'POST']) def userpage(username): ''' 用户界面 @@ -105,6 +105,7 @@ def userpage(username): :return: 返回用户界面 ''' # 未登录，跳转到未登录界面 + print("123123") if not session.get('logged_in'): return render_template('not_login.html') From da13e5bbd5da2a1ceb838c5a4836a0cabd8bdf69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?= <178428409@qq.com> Date: Thu, 20 Apr 2023 21:28:29 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBug=EF=BC=88=E6=B2=A1?= =?UTF-8?q?=E6=89=BE=E5=88=B0=E6=96=87=E7=AB=A0=E5=90=8E=E7=AB=8B=E5=8D=B3?= =?UTF-8?q?=E4=B8=8A=E4=B8=80=E7=AF=87=E4=BC=9A=E5=9B=9E=E5=88=B0=E4=B8=8A?= =?UTF-8?q?=E4=B8=8A=E7=AF=87=E6=96=87=E7=AB=A0=EF=BC=89=20&=20=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=B7=BB=E5=8A=A0id=E6=96=B9=E4=BE=BF=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/templates/userpage_get.html | 4 ++-- app/user_service.py | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html index 8936ff7..6264ef0 100644 --- a/app/templates/userpage_get.html +++ b/app/templates/userpage_get.html @@ -44,9 +44,9 @@ {# #} {# {% endfor %}#} - 下一篇 Next Article + 下一篇 Next Article {% if session.get('had_read_articles') != None and session.get('had_read_articles')["index"] !=0 %} - 上一篇 Previous Article + 上一篇 Previous Article {% endif %}

阅读文章并回答问题

diff --git a/app/user_service.py b/app/user_service.py index b9f8d26..712fd13 100644 --- a/app/user_service.py +++ b/app/user_service.py @@ -45,9 +45,10 @@ def user_back(username): :return: 返回页面内容 ''' if request.method == 'GET': - had_read_articles = session.get("had_read_articles") - had_read_articles["index"] -= 1 - session["had_read_articles"] = had_read_articles + if session.get("found_article"): + had_read_articles = session.get("had_read_articles") + had_read_articles["index"] -= 1 + session["had_read_articles"] = had_read_articles return redirect(url_for('user_bp.userpage', username=username)) @@ -105,7 +106,6 @@ def userpage(username): :return: 返回用户界面 ''' # 未登录，跳转到未登录界面 - print("123123") if not session.get('logged_in'): return render_template('not_login.html') @@ -137,6 +137,10 @@ def userpage(username): words += x[0] + ' ' had_read_articles, today_article = get_today_article(user_freq_record, session.get('had_read_articles')) session['had_read_articles'] = had_read_articles + if today_article is None: + session["found_article"] = False + else: + session["found_article"] = True # 通过 today_article，加载前端的显示页面 return render_template('userpage_get.html', username=username, From 8f132ed87bfc00e321214dd4a4d6ed2a3ff4a8cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?= <178428409@qq.com> Date: Thu, 20 Apr 2023 22:53:30 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E9=98=85?= =?UTF-8?q?=E8=AF=BB=E5=AE=8C=E6=89=80=E6=9C=89=E6=96=87=E7=AB=A0=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Article.py | 42 ++++++++++++++++++++------------- app/templates/userpage_get.html | 6 ++++- app/user_service.py | 3 ++- 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/app/Article.py b/app/Article.py index b4df54c..bfef595 100644 --- a/app/Article.py +++ b/app/Article.py @@ -39,9 +39,9 @@ def get_today_article(user_word_list, had_read_articles): "index" : 0, # 为 article_ids 的索引 "article_ids": [] # 之前显示文章的id列表，越后越新 } - if had_read_articles["index"] > len(had_read_articles["article_ids"])-1: + if had_read_articles["index"] > len(had_read_articles["article_ids"])-1: # 生成新的文章，因此查找所有的文章 rq.instructions("SELECT * FROM article") - else: + else: # 生成阅读过的文章，因此查询指定 article_id 的文章 rq.instructions('SELECT * FROM article WHERE article_id=%d' % (had_read_articles["article_ids"][had_read_articles["index"]])) rq.do() result = rq.get_results() @@ -53,23 +53,33 @@ def get_today_article(user_word_list, had_read_articles): d3 = get_difficulty_level(d1, d2) d = None + result_of_generate_article = "not found" d_user = load_freq_history(user_word_list) user_level = user_difficulty_level(d_user, d3) # more consideration as user's behaviour is dynamic. Time factor should be considered. text_level = 0 - if had_read_articles["index"] > len(had_read_articles["article_ids"])-1: # 下一篇 - flag_get_article = False - for reading in result: - text_level = text_difficulty_level(reading['text'], d3) - factor = random.gauss(0.8, - 0.1) # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1 - if reading['article_id'] not in had_read_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor): # 新的文章之前没有出现过且符合一定范围的水平 - d = reading - had_read_articles["article_ids"].append(d['article_id']) # 列表添加新的文章id；下面进行 - flag_get_article = True - break - if not flag_get_article: + if had_read_articles["index"] > len(had_read_articles["article_ids"])-1: # 生成新的文章 + amount_of_had_read_articles = len(had_read_articles["article_ids"]) + amount_of_existing_articles = result.__len__() + if amount_of_had_read_articles == amount_of_existing_articles: # 如果当前阅读过的文章的数量 == 存在的文章的数量，即所有的书本都阅读过了 + result_of_generate_article = "had read all articles" + else: + test_count = 0 + for k in range(3): # 最多尝试3次 + test_count += 1 + for reading in result: + text_level = text_difficulty_level(reading['text'], d3) + factor = random.gauss(0.8, 0.1) # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1 + if reading['article_id'] not in had_read_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor): # 新的文章之前没有出现过且符合一定范围的水平 + d = reading + had_read_articles["article_ids"].append(d['article_id']) # 列表添加新的文章id；下面进行 + result_of_generate_article = "found" + break + if result_of_generate_article == "found": # 用于成功找到文章后及时退出外层循环 + break + print(test_count) + if result_of_generate_article != "found": # 阅读完所有文章，或者循环3次没有找到适合的文章，则对 index+=1 进行回滚 had_read_articles["index"] -= 1 - else: # 上一篇 + else: # 生成已经阅读过的文章 d = random.choice(result) text_level = text_difficulty_level(d['text'], d3) @@ -86,7 +96,7 @@ def get_today_article(user_word_list, had_read_articles): "answer": get_answer_part(d['question']) } - return had_read_articles, today_article + return had_read_articles, today_article, result_of_generate_article def load_freq_history(path): diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html index 6264ef0..e2cb9d4 100644 --- a/app/templates/userpage_get.html +++ b/app/templates/userpage_get.html @@ -71,10 +71,14 @@
- {% else %} + {% elif result_of_generate_article == "not found" %} + {% elif result_of_generate_article == "had read all articles" %} + {% endif %} diff --git a/app/user_service.py b/app/user_service.py index 712fd13..a306724 100644 --- a/app/user_service.py +++ b/app/user_service.py @@ -135,7 +135,7 @@ def userpage(username): words = '' for x in lst3: words += x[0] + ' ' - had_read_articles, today_article = get_today_article(user_freq_record, session.get('had_read_articles')) + had_read_articles, today_article, result_of_generate_article = get_today_article(user_freq_record, session.get('had_read_articles')) session['had_read_articles'] = had_read_articles if today_article is None: session["found_article"] = False @@ -147,6 +147,7 @@ def userpage(username): session=session, # flashed_messages=get_flashed_messages(), 仅有删除单词的时候使用到flash，而删除单词是异步执行，这里的信息提示是同步执行，所以就没有存在的必要了 today_article=today_article, + result_of_generate_article=result_of_generate_article, d_len=len(d), lst3=lst3, yml=Yaml.yml, From 70917df47b91f7fbb16870b15f2a2ecdbdad6135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?= <178428409@qq.com> Date: Thu, 20 Apr 2023 23:15:12 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Article.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/Article.py b/app/Article.py index bfef595..9fc9c07 100644 --- a/app/Article.py +++ b/app/Article.py @@ -63,9 +63,7 @@ def get_today_article(user_word_list, had_read_articles): if amount_of_had_read_articles == amount_of_existing_articles: # 如果当前阅读过的文章的数量 == 存在的文章的数量，即所有的书本都阅读过了 result_of_generate_article = "had read all articles" else: - test_count = 0 for k in range(3): # 最多尝试3次 - test_count += 1 for reading in result: text_level = text_difficulty_level(reading['text'], d3) factor = random.gauss(0.8, 0.1) # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1 @@ -76,7 +74,6 @@ def get_today_article(user_word_list, had_read_articles): break if result_of_generate_article == "found": # 用于成功找到文章后及时退出外层循环 break - print(test_count) if result_of_generate_article != "found": # 阅读完所有文章，或者循环3次没有找到适合的文章，则对 index+=1 进行回滚 had_read_articles["index"] -= 1 else: # 生成已经阅读过的文章 From 03145b57d98c29ae04948281e8e4e67512e75829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?= <178428409@qq.com> Date: Fri, 21 Apr 2023 02:36:51 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BE=B9=E7=95=8C?= =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98=EF=BC=88=E5=BD=93=E5=88=9A=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E5=B0=B1=E6=B2=A1=E6=9C=89=E6=89=BE=E5=88=B0=E6=96=87?= =?UTF-8?q?=E7=AB=A0=E6=88=96=E8=80=85=E5=B0=B1=E6=A0=B9=E6=9C=AC=E8=A2=AB?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=96=87=E7=AB=A0=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E5=87=BA=E7=8E=B0=E4=B8=8A=E4=B8=80=E7=AF=87?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Article.py | 5 +++-- app/templates/userpage_get.html | 8 +++++--- app/user_service.py | 18 +++++++++--------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/app/Article.py b/app/Article.py index 9fc9c07..aac2c81 100644 --- a/app/Article.py +++ b/app/Article.py @@ -74,11 +74,12 @@ def get_today_article(user_word_list, had_read_articles): break if result_of_generate_article == "found": # 用于成功找到文章后及时退出外层循环 break - if result_of_generate_article != "found": # 阅读完所有文章，或者循环3次没有找到适合的文章，则对 index+=1 进行回滚 - had_read_articles["index"] -= 1 + if result_of_generate_article != "found": # 阅读完所有文章，或者循环3次没有找到适合的文章，则放入空（“null”） + had_read_articles["article_ids"].append('null') else: # 生成已经阅读过的文章 d = random.choice(result) text_level = text_difficulty_level(d['text'], d3) + result_of_generate_article = "found" today_article = None if d: diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html index e2cb9d4..68948df 100644 --- a/app/templates/userpage_get.html +++ b/app/templates/userpage_get.html @@ -44,14 +44,16 @@ {# #} {# {% endfor %}#} - 下一篇 Next Article - {% if session.get('had_read_articles') != None and session.get('had_read_articles')["index"] !=0 %} + {% if result_of_generate_article != "had read all articles" %} + 下一篇 Next Article + {% endif %} + {% if session.get('had_read_articles') and session.get('had_read_articles')['index']>0 %} 上一篇 Previous Article {% endif %}

阅读文章并回答问题

- {% if today_article %} + {% if result_of_generate_article == 'found' %}

Article added on: {{ today_article["date"] }}



diff --git a/app/user_service.py b/app/user_service.py index a306724..4f81c6e 100644 --- a/app/user_service.py +++ b/app/user_service.py @@ -31,7 +31,10 @@ def user_reset(username): ''' if request.method == 'GET': had_read_articles = session.get("had_read_articles") - had_read_articles["index"] += 1 + if had_read_articles['article_ids'][-1] == "null": # 如果当前还是“null”，则将“null”pop出来,无需index+=1 + had_read_articles['article_ids'].pop() + else: # 当前不为“null”，直接 index+=1 + had_read_articles["index"] += 1 session["had_read_articles"] = had_read_articles return redirect(url_for('user_bp.userpage', username=username)) else: @@ -45,10 +48,11 @@ def user_back(username): :return: 返回页面内容 ''' if request.method == 'GET': - if session.get("found_article"): - had_read_articles = session.get("had_read_articles") - had_read_articles["index"] -= 1 - session["had_read_articles"] = had_read_articles + had_read_articles = session.get("had_read_articles") + had_read_articles["index"] -= 1 # 上一篇，index-=1 + if had_read_articles['article_ids'][-1] == "null": # 如果当前还是“null”，则将“null”pop出来 + had_read_articles['article_ids'].pop() + session["had_read_articles"] = had_read_articles return redirect(url_for('user_bp.userpage', username=username)) @@ -137,10 +141,6 @@ def userpage(username): words += x[0] + ' ' had_read_articles, today_article, result_of_generate_article = get_today_article(user_freq_record, session.get('had_read_articles')) session['had_read_articles'] = had_read_articles - if today_article is None: - session["found_article"] = False - else: - session["found_article"] = True # 通过 today_article，加载前端的显示页面 return render_template('userpage_get.html', username=username, From fc3e27488b3b55c1013a970e6abb95b88caff9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?= <178428409@qq.com> Date: Fri, 21 Apr 2023 05:33:26 +0800 Subject: [PATCH 10/25] =?UTF-8?q?=E7=BB=99=E6=A0=87=E7=AD=BE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0id=EF=BC=8C=E6=96=B9=E4=BE=BF=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/templates/userpage_get.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html index 68948df..cb892db 100644 --- a/app/templates/userpage_get.html +++ b/app/templates/userpage_get.html @@ -37,7 +37,7 @@

English Pal for {{ username }} - 退出 + 退出 重设密码

{# {% for message in flashed_messages %}#} {# 根据user_service.userpage,取消了参数flashed_messages，因此注释了这段代码 #} From 58d7349afe69c5934754cb7a5145b33382326c37 Mon Sep 17 00:00:00 2001 From: Hui Lan Date: Tue, 25 Apr 2023 08:40:26 +0800 Subject: [PATCH 11/25] Change from bug359-zhangkeli --- app/pickle_idea2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/pickle_idea2.py b/app/pickle_idea2.py index 4055fc4..0da55bc 100644 --- a/app/pickle_idea2.py +++ b/app/pickle_idea2.py @@ -68,7 +68,7 @@ def save_frequency_to_pickle(d, pickle_fname): d2 = {} for k in d: if not k in exclusion_lst and not k.isnumeric() and not len(k) < 2: - d2[k] = list(sorted(set(d[k]))) + d2[k] = list(sorted(d[k])) # 原先这里是d2[k] = list(sorted(set(d[k]))) pickle.dump(d2, f) f.close() From 6be035f2828286b5cd59f15ec04336b86c3cb0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?= <178428409@qq.com> Date: Tue, 25 Apr 2023 11:38:01 +0800 Subject: [PATCH 12/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=89=BE=E5=88=B0=E6=96=87=E7=AB=A0=E6=88=96=E8=80=85?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E8=AF=BB=E5=AE=8C=E6=97=B6=EF=BC=8C=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2=E6=88=96=E8=80=85?= =?UTF-8?q?session=E4=B8=8D=E5=85=B3=E9=97=AD=E9=87=8D=E6=96=B0=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Article.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Article.py b/app/Article.py index aac2c81..35a06a4 100644 --- a/app/Article.py +++ b/app/Article.py @@ -42,6 +42,9 @@ def get_today_article(user_word_list, had_read_articles): if had_read_articles["index"] > len(had_read_articles["article_ids"])-1: # 生成新的文章，因此查找所有的文章 rq.instructions("SELECT * FROM article") else: # 生成阅读过的文章，因此查询指定 article_id 的文章 + if had_read_articles["article_ids"][had_read_articles["index"]] == 'null': # 可能因为直接刷新页面导致直接去查询了'null'，因此当刷新的页面的时候，需要直接进行“上一篇”操作 + had_read_articles["index"] -= 1 + had_read_articles["article_ids"].pop() rq.instructions('SELECT * FROM article WHERE article_id=%d' % (had_read_articles["article_ids"][had_read_articles["index"]])) rq.do() result = rq.get_results() From d30a434b2a0dce5247bb005c5c245529d5a542d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?= <178428409@qq.com> Date: Tue, 25 Apr 2023 17:47:51 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=90=8Dhad=5Fread=5Farticles->visited=5Farticles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Article.py | 30 +++++++++++++++--------------- app/account_service.py | 4 ++-- app/templates/userpage_get.html | 2 +- app/user_service.py | 24 ++++++++++++------------ 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/app/Article.py b/app/Article.py index 35a06a4..e40717f 100644 --- a/app/Article.py +++ b/app/Article.py @@ -32,20 +32,20 @@ def get_article_body(s): return '\n'.join(lst) -def get_today_article(user_word_list, had_read_articles): +def get_today_article(user_word_list, visited_articles): rq = RecordQuery(path_prefix + 'static/wordfreqapp.db') - if had_read_articles is None: - had_read_articles = { + if visited_articles is None: + visited_articles = { "index" : 0, # 为 article_ids 的索引 "article_ids": [] # 之前显示文章的id列表，越后越新 } - if had_read_articles["index"] > len(had_read_articles["article_ids"])-1: # 生成新的文章，因此查找所有的文章 + if visited_articles["index"] > len(visited_articles["article_ids"])-1: # 生成新的文章，因此查找所有的文章 rq.instructions("SELECT * FROM article") else: # 生成阅读过的文章，因此查询指定 article_id 的文章 - if had_read_articles["article_ids"][had_read_articles["index"]] == 'null': # 可能因为直接刷新页面导致直接去查询了'null'，因此当刷新的页面的时候，需要直接进行“上一篇”操作 - had_read_articles["index"] -= 1 - had_read_articles["article_ids"].pop() - rq.instructions('SELECT * FROM article WHERE article_id=%d' % (had_read_articles["article_ids"][had_read_articles["index"]])) + if visited_articles["article_ids"][visited_articles["index"]] == 'null': # 可能因为直接刷新页面导致直接去查询了'null'，因此当刷新的页面的时候，需要直接进行“上一篇”操作 + visited_articles["index"] -= 1 + visited_articles["article_ids"].pop() + rq.instructions('SELECT * FROM article WHERE article_id=%d' % (visited_articles["article_ids"][visited_articles["index"]])) rq.do() result = rq.get_results() random.shuffle(result) @@ -60,25 +60,25 @@ def get_today_article(user_word_list, had_read_articles): d_user = load_freq_history(user_word_list) user_level = user_difficulty_level(d_user, d3) # more consideration as user's behaviour is dynamic. Time factor should be considered. text_level = 0 - if had_read_articles["index"] > len(had_read_articles["article_ids"])-1: # 生成新的文章 - amount_of_had_read_articles = len(had_read_articles["article_ids"]) + if visited_articles["index"] > len(visited_articles["article_ids"])-1: # 生成新的文章 + amount_of_visited_articles = len(visited_articles["article_ids"]) amount_of_existing_articles = result.__len__() - if amount_of_had_read_articles == amount_of_existing_articles: # 如果当前阅读过的文章的数量 == 存在的文章的数量，即所有的书本都阅读过了 + if amount_of_visited_articles == amount_of_existing_articles: # 如果当前阅读过的文章的数量 == 存在的文章的数量，即所有的书本都阅读过了 result_of_generate_article = "had read all articles" else: for k in range(3): # 最多尝试3次 for reading in result: text_level = text_difficulty_level(reading['text'], d3) factor = random.gauss(0.8, 0.1) # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1 - if reading['article_id'] not in had_read_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor): # 新的文章之前没有出现过且符合一定范围的水平 + if reading['article_id'] not in visited_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor): # 新的文章之前没有出现过且符合一定范围的水平 d = reading - had_read_articles["article_ids"].append(d['article_id']) # 列表添加新的文章id；下面进行 + visited_articles["article_ids"].append(d['article_id']) # 列表添加新的文章id；下面进行 result_of_generate_article = "found" break if result_of_generate_article == "found": # 用于成功找到文章后及时退出外层循环 break if result_of_generate_article != "found": # 阅读完所有文章，或者循环3次没有找到适合的文章，则放入空（“null”） - had_read_articles["article_ids"].append('null') + visited_articles["article_ids"].append('null') else: # 生成已经阅读过的文章 d = random.choice(result) text_level = text_difficulty_level(d['text'], d3) @@ -97,7 +97,7 @@ def get_today_article(user_word_list, had_read_articles): "answer": get_answer_part(d['question']) } - return had_read_articles, today_article, result_of_generate_article + return visited_articles, today_article, result_of_generate_article def load_freq_history(path): diff --git a/app/account_service.py b/app/account_service.py index 8de9a03..a7ed0c4 100644 --- a/app/account_service.py +++ b/app/account_service.py @@ -37,7 +37,7 @@ def signup(): session[username] = username session['username'] = username session['expiry_date'] = get_expiry_date(username) - session['had_read_articles'] = None + session['visited_articles'] = None return jsonify({'status': '2'}) else: return jsonify({'status': '1'}) @@ -66,7 +66,7 @@ def login(): session['username'] = username user_expiry_date = get_expiry_date(username) session['expiry_date'] = user_expiry_date - session['had_read_articles'] = None + session['visited_articles'] = None return jsonify({'status': '1'}) else: return jsonify({'status': '0'}) diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html index cb892db..8620b19 100644 --- a/app/templates/userpage_get.html +++ b/app/templates/userpage_get.html @@ -47,7 +47,7 @@ {% if result_of_generate_article != "had read all articles" %} 下一篇 Next Article {% endif %} - {% if session.get('had_read_articles') and session.get('had_read_articles')['index']>0 %} + {% if session.get('visited_articles') and session.get('visited_articles')['index']>0 %} 上一篇 Previous Article {% endif %} diff --git a/app/user_service.py b/app/user_service.py index 4f81c6e..f514d45 100644 --- a/app/user_service.py +++ b/app/user_service.py @@ -30,12 +30,12 @@ def user_reset(username): :return: 返回页面内容 ''' if request.method == 'GET': - had_read_articles = session.get("had_read_articles") - if had_read_articles['article_ids'][-1] == "null": # 如果当前还是“null”，则将“null”pop出来,无需index+=1 - had_read_articles['article_ids'].pop() + visited_articles = session.get("visited_articles") + if visited_articles['article_ids'][-1] == "null": # 如果当前还是“null”，则将“null”pop出来,无需index+=1 + visited_articles['article_ids'].pop() else: # 当前不为“null”，直接 index+=1 - had_read_articles["index"] += 1 - session["had_read_articles"] = had_read_articles + visited_articles["index"] += 1 + session["visited_articles"] = visited_articles return redirect(url_for('user_bp.userpage', username=username)) else: return 'Under construction' @@ -48,11 +48,11 @@ def user_back(username): :return: 返回页面内容 ''' if request.method == 'GET': - had_read_articles = session.get("had_read_articles") - had_read_articles["index"] -= 1 # 上一篇，index-=1 - if had_read_articles['article_ids'][-1] == "null": # 如果当前还是“null”，则将“null”pop出来 - had_read_articles['article_ids'].pop() - session["had_read_articles"] = had_read_articles + visited_articles = session.get("visited_articles") + visited_articles["index"] -= 1 # 上一篇，index-=1 + if visited_articles['article_ids'][-1] == "null": # 如果当前还是“null”，则将“null”pop出来 + visited_articles['article_ids'].pop() + session["visited_articles"] = visited_articles return redirect(url_for('user_bp.userpage', username=username)) @@ -139,8 +139,8 @@ def userpage(username): words = '' for x in lst3: words += x[0] + ' ' - had_read_articles, today_article, result_of_generate_article = get_today_article(user_freq_record, session.get('had_read_articles')) - session['had_read_articles'] = had_read_articles + visited_articles, today_article, result_of_generate_article = get_today_article(user_freq_record, session.get('visited_articles')) + session['visited_articles'] = visited_articles # 通过 today_article，加载前端的显示页面 return render_template('userpage_get.html', username=username, From 5654fbf9bc3ae85eec621a4e6e2ecd1f6c6c3b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?= <178428409@qq.com> Date: Wed, 26 Apr 2023 18:49:59 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=96=B0=E7=9A=84//userpage=E8=B7=AF?= =?UTF-8?q?=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/templates/admin_index.html | 2 +- app/templates/mainpage_get.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/admin_index.html b/app/templates/admin_index.html index 68ee68f..f62a137 100644 --- a/app/templates/admin_index.html +++ b/app/templates/admin_index.html @@ -30,7 +30,7 @@ diff --git a/app/templates/mainpage_get.html b/app/templates/mainpage_get.html index 3594571..344943d 100644 --- a/app/templates/mainpage_get.html +++ b/app/templates/mainpage_get.html @@ -23,7 +23,7 @@

English Pal - Learn English smartly!

{% if session['logged_in'] %} - {{ session['username'] }} + {{ session['username'] }} {% if session['username'] == admin_name %} 管理

{% endif %} From a80b062b8707fb6a73554b8500b8c5ae17775ed3 Mon Sep 17 00:00:00 2001 From: ZhuZhihao <1287365321@qq.com> Date: Fri, 5 May 2023 17:20:58 +0800 Subject: [PATCH 15/25] refactor: remove variable 'count' --- app/static/js/highlight.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js index 13b9865..555f76b 100644 --- a/app/static/js/highlight.js +++ b/app/static/js/highlight.js @@ -34,17 +34,12 @@ function highLight() { //修改代码 let articleContent_fb = articleContent; //文章副本 - let count = 1000; //简单计数器，防止陷入死循环。 while(articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase()) !== -1 && list[i]!=""){ - //针对同一篇文章中可能存在相同单词的不同大小写问题，采用while循环判断副本中是否还存在匹配单词。 - - count--; - if(count <= 0)break; //TimeOut! - //找到副本中和list[i]匹配的第一个单词(第一种匹配情况),并赋值给list[i]。 - list[i] = articleContent_fb.substr(articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase()),list[i].length); + const index = articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase()); + list[i] = articleContent_fb.substring(index, index + list[i].length); - articleContent_fb = articleContent_fb.replace(list[i],""); //删除副本中和list[i]匹配的单词 + articleContent_fb = articleContent_fb.substring(index + list[i].length); // 使用副本中list[i]之后的子串替换掉副本 articleContent = articleContent.replace(new RegExp("\\b"+list[i]+"\\b","g"),"" + list[i] + ""); } } From f64d06fbbf00255fc21f141d852d8995e588785e Mon Sep 17 00:00:00 2001 From: Awoodwhale Date: Sat, 6 May 2023 17:24:51 +0800 Subject: [PATCH 16/25] fix: fix Bug 531 and use ES6 grammar --- app/templates/admin_manage_user.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/admin_manage_user.html b/app/templates/admin_manage_user.html index a3f0ca0..cee4667 100644 --- a/app/templates/admin_manage_user.html +++ b/app/templates/admin_manage_user.html @@ -68,9 +68,9 @@ {% endfor %} {% endif %} +