diff --git a/app/Article.py b/app/Article.py index e0f006a..aac2c81 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"]])) + 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() random.shuffle(result) @@ -53,25 +53,33 @@ def get_today_article(user_word_list, existing_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 existing_articles["index"] > len(existing_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): # 新的文章之前没有出现过且符合一定范围的水平 - d = reading - existing_articles["article_ids"].append(d['article_id']) # 列表添加新的文章id;下面进行 - flag_get_article = True - break - if not flag_get_article: - existing_articles["index"] -= 1 - else: # 上一篇 + 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: + 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): # 新的文章之前没有出现过且符合一定范围的水平 + 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 + 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: @@ -86,7 +94,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, result_of_generate_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/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 b5e16aa..098674d 100644 --- a/app/templates/userpage_get.html +++ b/app/templates/userpage_get.html @@ -37,24 +37,28 @@
English Pal for {{ username }} + {% if username == admin_name %} 管理 {% endif %} - 退出 + 退出 重设密码 +
{# {% for message in flashed_messages %}#} {# 根据user_service.userpage,取消了参数flashed_messages,因此注释了这段代码 #} {#阅读文章并回答问题
Article added on: {{ today_article["date"] }}
Notes:
No article is currently available for you. You can try again a few times or mark new words in the passage to improve your level.
Notes:
You've read all the articles.
收集生词吧 (可以在正文中划词,也可以复制黏贴)
-